fixed #12715 - made Visual Studio conditions work again [skip ci]

danmar · May 7, 2024 · 2bfe4cd · 2bfe4cd
1 parent f562ff2
commit 2bfe4cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -568,6 +568,7 @@ namespace {
             TokenList tokenlist(&s);
             std::istringstream istr(c);
             tokenlist.createTokens(istr, Standards::Language::C); // TODO: check result
+            tokenlist.createAst();
             for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
                 if (tok->str() == "(" && tok->astOperand1() && tok->astOperand2()) {
                     // TODO: this is wrong - it is Contains() not Equals()

diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
@@ -43,6 +43,7 @@ class TestTokenList : public TestFixture {
         TEST_CASE(inc);
         TEST_CASE(isKeyword);
         TEST_CASE(notokens);
+        TEST_CASE(ast1);
     }
 
     // inspired by #5895
@@ -161,6 +162,15 @@ class TestTokenList : public TestFixture {
         TokenList tokenlist(&settingsDefault);
         tokenlist.createTokens(std::move(tokensP)); // do not assert
     }
+
+    void ast1() {
+        const std::string s = "('Release|x64' == 'Release|x64');";
+
+        TokenList tokenlist(&settings);
+        std::istringstream istr(s);
+        tokenlist.createTokens(istr, Standards::Language::C);
+        tokenlist.createAst(); // TODO: do not crash
+    }
 };
 
 REGISTER_TEST(TestTokenList)