From 336a00946d7874c22b087b48362887c205423f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20M=C3=BCller?= Date: Mon, 3 Dec 2018 12:20:32 +0100 Subject: [PATCH] Parse feature flags in compilation database --- src/libclang/libclang_parser.cpp | 2 +- test/libclang_parser.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libclang/libclang_parser.cpp b/src/libclang/libclang_parser.cpp index 85dddc1..024a259 100644 --- a/src/libclang/libclang_parser.cpp +++ b/src/libclang/libclang_parser.cpp @@ -237,7 +237,7 @@ libclang_compile_config::libclang_compile_config(const libclang_compilation_data else if (flag == "-std") // standard add_flag(std::move(flag) + "=" + std::move(args)); - else if (flag == "-f" && (args == "ms-compatibility" || args == "ms-extensions")) + else if (flag == "-f") // other options add_flag(std::move(flag) + std::move(args)); }); diff --git a/test/libclang_parser.cpp b/test/libclang_parser.cpp index c1762cb..e5e2ffc 100644 --- a/test/libclang_parser.cpp +++ b/test/libclang_parser.cpp @@ -58,7 +58,7 @@ TEST_CASE("libclang_compile_config") }, { "directory": "", - "command": "/usr/bin/clang++ -std=c++14 -fms-extensions -fms-compatibility -c -o c.o c.cpp", + "command": "/usr/bin/clang++ -std=c++14 -fms-extensions -fms-compatibility -fno-strict-aliasing -c -o c.o c.cpp", "file": "C:/c.cpp", } ])"; @@ -84,7 +84,7 @@ TEST_CASE("libclang_compile_config") }, { "directory": "", - "command": "/usr/bin/clang++ -std=c++14 -fms-extensions -fms-compatibility -c -o c.o c.cpp", + "command": "/usr/bin/clang++ -std=c++14 -fms-extensions -fms-compatibility -fno-strict-aliasing -c -o c.o c.cpp", "file": "/c.cpp", } ])"; @@ -104,5 +104,5 @@ TEST_CASE("libclang_compile_config") "/absolute -DB(X)=X"); libclang_compile_config c(database, CPPAST_DETAIL_DRIVE "/c.cpp"); - require_flags(c, "-std=c++14 -fms-extensions -fms-compatibility"); + require_flags(c, "-std=c++14 -fms-extensions -fms-compatibility -fno-strict-aliasing"); }