diff --git a/CMakeLists.txt b/CMakeLists.txt index e6594f39..125b5f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,10 +47,15 @@ endif () # Clang ------------------------------------------------------------------------ -if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake") + +if (UNIX) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake") + else() + find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake") + endif() else() - find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake") + find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake") endif() find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake") @@ -59,12 +64,12 @@ add_definitions(${CLANG_DEFINITIONS}) # Boost ------------------------------------------------------------------------ -set(BOOST_ROOT $ENV{BOOST_155_DIR}) +set(BOOST_ROOT $ENV{BOOST_159_DIR}) set(Boost_USE_MULTITHREAD ON) set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_STATIC_RUNTIME OFF) Set(Boost_NO_SYSTEM_PATHS ON) -set(BOOST_LIBRARYDIR $ENV{BOOST_155_DIR}) +set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR}) find_package(Boost 1.55 COMPONENTS system filesystem date_time REQUIRED) diff --git a/README.md b/README.md index 9a47e154..77348774 100644 --- a/README.md +++ b/README.md @@ -8,15 +8,15 @@ * CxxTest 4.3 * Valgrind 3.9.0 (linux) * Clang & LLVM (installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html) -* Boost 1.55 -* Eigen 3.2.3 +* Boost 1.59 +* Eigen 3.2.6 ##### Environment Variables * QT_DIR - ...\Qt\Qt5.2.1\5.2.1\\ * CXX_TEST_DIR - .../cxxtest-4.3/ * CLANG_DIR - .../clang-llvm/ -* BOOST_155_DIR - .../boost_1_55_0 +* BOOST_159_DIR - .../boost_1_59_0 * EIGEN_DIR - .../eigen For Win32: diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt index 60f96fc4..7cf937fe 100644 --- a/bin/test/data/log/test_log.txt +++ b/bin/test/data/log/test_log.txt @@ -1,191 +1,4 @@ ConfigManager.cpp WARNING: value path/to/nowhere is not present in config. -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cstddef -FileManager.cpp ERROR: No FileInfo found for file: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__config -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/stddef.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/clang-llvm/llvm/tools/clang/lib/Headers/__stddef_max_align_t.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: input.cc -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/code.cpp -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/code.cpp -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h -FileManager.cpp ERROR: No FileInfo found for file: /Users/ebsi/Documents/masterproject/bin/test/data/CxxParserTestSuite/header.h -FileManager.cpp ERROR: No FileInfo found for file: input.cc Token.cpp ERROR: Location Id was not referenced by this Token. Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class Edge.cpp ERROR: Nodes are not plain copies. diff --git a/cmake/CLANGConfig.cmake b/cmake/CLANGConfig.cmake index 7f6025ac..141dd1bd 100644 --- a/cmake/CLANGConfig.cmake +++ b/cmake/CLANGConfig.cmake @@ -1,23 +1,29 @@ +if (UNIX) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_release") + else() + set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_debug") + endif() +else() + set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build") +endif() + + execute_process( - COMMAND $ENV{CLANG_DIR}/build_debug/bin/llvm-config --cxxflags + COMMAND ${CLANG_BUILD_PATH}/bin/llvm-config --cxxflags OUTPUT_VARIABLE CLANG_DEFINITIONS ) # Remove unwanted flags -string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS}) -string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS}) +string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}") +string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS "${CLANG_DEFINITIONS}") set(CLANG_INCLUDE_DIRS "$ENV{CLANG_DIR}/llvm/tools/clang/include" - "$ENV{CLANG_DIR}/build_debug/tools/clang/include" + "${CLANG_BUILD_PATH}/tools/clang/include" ) -set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_debug/lib") -if (UNIX) - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_release/lib") - endif() -endif () +set(CLANG_LIBRARY_DIRS "${CLANG_BUILD_PATH}/lib") set(CLANG_LIBRARIES #clangApplyReplacements diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll index af541cbb..5b9e32bf 100644 Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll differ diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll index 5b6becb2..68d0d7cf 100644 Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll differ diff --git a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll index 4810e36b..bdb0872d 100644 Binary files a/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll and b/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc110-mt-gd-1_55.dll deleted file mode 100644 index 82e64554..00000000 Binary files a/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..f68f05eb Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Debug/boost_date_time-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc110-mt-gd-1_55.dll deleted file mode 100644 index 4a5fc426..00000000 Binary files a/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..85d77d9b Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_system-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/app/Debug/boost_system-vc110-mt-gd-1_55.dll deleted file mode 100644 index 8320a9a1..00000000 Binary files a/setup/dynamic_libraries/windows/app/Debug/boost_system-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Debug/boost_system-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/app/Debug/boost_system-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..36475765 Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Debug/boost_system-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll index bfab237e..df0d3c10 100644 Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll index d9f8aaf1..c2cfc689 100644 Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll index b4171506..a07c7e14 100644 Binary files a/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll and b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc110-mt-1_55.dll deleted file mode 100644 index 3380a0f3..00000000 Binary files a/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc120-mt-1_59.dll new file mode 100644 index 00000000..dea552b4 Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Release/boost_date_time-vc120-mt-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc110-mt-1_55.dll deleted file mode 100644 index 13da5e64..00000000 Binary files a/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc120-mt-1_59.dll new file mode 100644 index 00000000..ec4aad60 Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc120-mt-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_system-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/app/Release/boost_system-vc110-mt-1_55.dll deleted file mode 100644 index cab758b0..00000000 Binary files a/setup/dynamic_libraries/windows/app/Release/boost_system-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/app/Release/boost_system-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/app/Release/boost_system-vc120-mt-1_59.dll new file mode 100644 index 00000000..7c83cd45 Binary files /dev/null and b/setup/dynamic_libraries/windows/app/Release/boost_system-vc120-mt-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc110-mt-gd-1_55.dll deleted file mode 100644 index 82e64554..00000000 Binary files a/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..f68f05eb Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Debug/boost_date_time-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll deleted file mode 100644 index 4a5fc426..00000000 Binary files a/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..85d77d9b Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll deleted file mode 100644 index 8320a9a1..00000000 Binary files a/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_system-vc120-mt-gd-1_59.dll b/setup/dynamic_libraries/windows/test/Debug/boost_system-vc120-mt-gd-1_59.dll new file mode 100644 index 00000000..36475765 Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Debug/boost_system-vc120-mt-gd-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc110-mt-1_55.dll deleted file mode 100644 index 3380a0f3..00000000 Binary files a/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc120-mt-1_59.dll new file mode 100644 index 00000000..dea552b4 Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Release/boost_date_time-vc120-mt-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll deleted file mode 100644 index 13da5e64..00000000 Binary files a/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc120-mt-1_59.dll new file mode 100644 index 00000000..ec4aad60 Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc120-mt-1_59.dll differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll deleted file mode 100644 index cab758b0..00000000 Binary files a/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll and /dev/null differ diff --git a/setup/dynamic_libraries/windows/test/Release/boost_system-vc120-mt-1_59.dll b/setup/dynamic_libraries/windows/test/Release/boost_system-vc120-mt-1_59.dll new file mode 100644 index 00000000..7c83cd45 Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Release/boost_system-vc120-mt-1_59.dll differ diff --git a/src/lib/utility/file/FileManager.cpp b/src/lib/utility/file/FileManager.cpp index 7c0927ae..fb2e8b71 100644 --- a/src/lib/utility/file/FileManager.cpp +++ b/src/lib/utility/file/FileManager.cpp @@ -104,7 +104,7 @@ bool FileManager::hasIncludeExtension(const FilePath& filePath) const return filePath.hasExtension(m_includeExtensions); } -const FileInfo& FileManager::getFileInfo(const FilePath& filePath) const +const FileInfo FileManager::getFileInfo(const FilePath& filePath) const { std::map::const_iterator it = m_files.find(filePath); diff --git a/src/lib/utility/file/FileManager.h b/src/lib/utility/file/FileManager.h index 34a24ddf..09dd6cf7 100644 --- a/src/lib/utility/file/FileManager.h +++ b/src/lib/utility/file/FileManager.h @@ -32,7 +32,7 @@ public: virtual bool hasSourceExtension(const FilePath& filePath) const; virtual bool hasIncludeExtension(const FilePath& filePath) const; - const FileInfo& getFileInfo(const FilePath& filePath) const; + virtual const FileInfo getFileInfo(const FilePath& filePath) const; private: std::vector getFileInfosInProject() const; diff --git a/src/test/SearchIndexTestSuite.h b/src/test/SearchIndexTestSuite.h index 3f799d42..7f5d5e0e 100644 --- a/src/test/SearchIndexTestSuite.h +++ b/src/test/SearchIndexTestSuite.h @@ -149,16 +149,16 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("u"); TS_ASSERT_EQUALS(1, matches.size()); - TS_ASSERT_EQUALS("util", matches[0].fullName); + TS_ASSERT_EQUALS("util", matches[0].getFullName()); TS_ASSERT_EQUALS(1, matches[0].indices.size()); TS_ASSERT_EQUALS(0, matches[0].indices[0]); matches = index.runFuzzySearchAndGetMatches(""); TS_ASSERT_EQUALS(3, matches.size()); - TS_ASSERT_EQUALS("math", matches[0].fullName); - TS_ASSERT_EQUALS("string", matches[1].fullName); - TS_ASSERT_EQUALS("util", matches[2].fullName); + TS_ASSERT_EQUALS("math", matches[0].getFullName()); + TS_ASSERT_EQUALS("string", matches[1].getFullName()); + TS_ASSERT_EQUALS("util", matches[2].getFullName()); TS_ASSERT_EQUALS(0, matches[0].weight); TS_ASSERT_EQUALS(0, matches[1].weight); @@ -174,14 +174,14 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("t"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("util", matches[0].fullName); - TS_ASSERT_EQUALS("MATH", matches[1].fullName); + TS_ASSERT_EQUALS("util", matches[0].getFullName()); + TS_ASSERT_EQUALS("MATH", matches[1].getFullName()); matches = index.runFuzzySearchAndGetMatches("T"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("util", matches[0].fullName); - TS_ASSERT_EQUALS("MATH", matches[1].fullName); + TS_ASSERT_EQUALS("util", matches[0].getFullName()); + TS_ASSERT_EQUALS("MATH", matches[1].getFullName()); } void test_fuzzy_matching_wheighs_by_distance_and_alphabet() @@ -194,9 +194,9 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("t"); TS_ASSERT_EQUALS(3, matches.size()); - TS_ASSERT_EQUALS("string", matches[0].fullName); - TS_ASSERT_EQUALS("util", matches[1].fullName); - TS_ASSERT_EQUALS("math", matches[2].fullName); + TS_ASSERT_EQUALS("string", matches[0].getFullName()); + TS_ASSERT_EQUALS("util", matches[1].getFullName()); + TS_ASSERT_EQUALS("math", matches[2].getFullName()); TS_ASSERT_EQUALS(1, matches[0].indices.size()); TS_ASSERT_EQUALS(1, matches[0].indices[0]); @@ -217,8 +217,8 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("t"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("uTil", matches[0].fullName); - TS_ASSERT_EQUALS("string", matches[1].fullName); + TS_ASSERT_EQUALS("uTil", matches[0].getFullName()); + TS_ASSERT_EQUALS("string", matches[1].getFullName()); } void test_fuzzy_matching_wheighs_higher_on_consecutive_letters() @@ -230,8 +230,8 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("abc"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("ocbcabc", matches[0].fullName); - TS_ASSERT_EQUALS("oaabbcc", matches[1].fullName); + TS_ASSERT_EQUALS("ocbcabc", matches[0].getFullName()); + TS_ASSERT_EQUALS("oaabbcc", matches[1].getFullName()); } void test_fuzzy_matching_in_hierarchy() @@ -244,18 +244,18 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("t"); TS_ASSERT_EQUALS(6, matches.size()); - TS_ASSERT_EQUALS("util", matches[0].fullName); - TS_ASSERT_EQUALS("util::math", matches[1].fullName); - TS_ASSERT_EQUALS("util::math::ceil", matches[2].fullName); - TS_ASSERT_EQUALS("util::math::floor", matches[3].fullName); - TS_ASSERT_EQUALS("util::string", matches[4].fullName); - TS_ASSERT_EQUALS("util::string::concat", matches[5].fullName); + TS_ASSERT_EQUALS("util", matches[0].getFullName()); + TS_ASSERT_EQUALS("util::math", matches[1].getFullName()); + TS_ASSERT_EQUALS("util::math::ceil", matches[2].getFullName()); + TS_ASSERT_EQUALS("util::math::floor", matches[3].getFullName()); + TS_ASSERT_EQUALS("util::string", matches[4].getFullName()); + TS_ASSERT_EQUALS("util::string::concat", matches[5].getFullName()); matches = index.runFuzzySearchAndGetMatches("uml"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("util::math::ceil", matches[0].fullName); - TS_ASSERT_EQUALS("util::math::floor", matches[1].fullName); + TS_ASSERT_EQUALS("util::math::ceil", matches[0].getFullName()); + TS_ASSERT_EQUALS("util::math::floor", matches[1].getFullName()); } void test_fuzzy_matching_in_hierarchy_respects_collin() @@ -268,14 +268,14 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("u:i"); TS_ASSERT_EQUALS(3, matches.size()); - TS_ASSERT_EQUALS("util::string", matches[0].fullName); - TS_ASSERT_EQUALS("util::string::concat", matches[1].fullName); - TS_ASSERT_EQUALS("util::math::ceil", matches[2].fullName); + TS_ASSERT_EQUALS("util::string", matches[0].getFullName()); + TS_ASSERT_EQUALS("util::string::concat", matches[1].getFullName()); + TS_ASSERT_EQUALS("util::math::ceil", matches[2].getFullName()); matches = index.runFuzzySearchAndGetMatches("u:t:i"); TS_ASSERT_EQUALS(1, matches.size()); - TS_ASSERT_EQUALS("util::math::ceil", matches[0].fullName); + TS_ASSERT_EQUALS("util::math::ceil", matches[0].getFullName()); } void test_fuzzy_matching_in_hierarchy_weighs_front_letters_higher() @@ -287,8 +287,8 @@ public: std::vector matches = index.runFuzzySearchAndGetMatches("g"); TS_ASSERT_EQUALS(2, matches.size()); - TS_ASSERT_EQUALS("abc::dfe::ghi", matches[0].fullName); - TS_ASSERT_EQUALS("abc::hgi", matches[1].fullName); + TS_ASSERT_EQUALS("abc::dfe::ghi", matches[0].getFullName()); + TS_ASSERT_EQUALS("abc::hgi", matches[1].getFullName()); } private: diff --git a/src/test/helper/TestFileManager.cpp b/src/test/helper/TestFileManager.cpp index 0ef56b29..b728574a 100644 --- a/src/test/helper/TestFileManager.cpp +++ b/src/test/helper/TestFileManager.cpp @@ -18,3 +18,8 @@ bool TestFileManager::hasIncludeExtension(const FilePath& filePath) const { return true; } + +const FileInfo TestFileManager::getFileInfo(const FilePath& filePath) const +{ + return FileInfo(filePath); +} diff --git a/src/test/helper/TestFileManager.h b/src/test/helper/TestFileManager.h index c6957027..e9ebf561 100644 --- a/src/test/helper/TestFileManager.h +++ b/src/test/helper/TestFileManager.h @@ -12,6 +12,8 @@ public: virtual bool hasFilePath(const FilePath& filePath) const; virtual bool hasSourceExtension(const FilePath& filePath) const; virtual bool hasIncludeExtension(const FilePath& filePath) const; + + virtual const FileInfo getFileInfo(const FilePath& filePath) const; }; #endif // TEST_FILE_MANAGER_H