fixed #12715 - made Visual Studio conditions work again (#6389)

danmar · May 14, 2024 · 994c015 · 994c015
1 parent eb4ceac
commit 994c015
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 0 deletions.
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -566,6 +566,7 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const s
     if (type.find('(') != std::string::npos)
         type.erase(type.find('('));
 
+    // TODO: put in a helper?
     std::stack<Token *> lpar;
     for (const std::string &s: splitString(type)) {
         Token *tok = addtoken(tokenList, s, false);

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -33,6 +33,7 @@
 #include <iostream>
 #include <iterator>
 #include <sstream>
+#include <stack>
 #include <unordered_set>
 #include <utility>
 
@@ -568,6 +569,22 @@ namespace {
             TokenList tokenlist(&s);
             std::istringstream istr(c);
             tokenlist.createTokens(istr, Standards::Language::C); // TODO: check result
+            // TODO: put in a helper
+            // generate links
+            {
+                std::stack<Token*> lpar;
+                for (Token* tok2 = tokenlist.front(); tok2; tok2 = tok2->next()) {
+                    if (tok2->str() == "(")
+                        lpar.push(tok2);
+                    else if (tok2->str() == ")") {
+                        if (lpar.empty())
+                            break;
+                        Token::createMutualLinks(lpar.top(), tok2);
+                        lpar.pop();
+                    }
+                }
+            }
+            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/lib/library.cpp b/lib/library.cpp
@@ -1774,6 +1774,7 @@ std::shared_ptr<Token> createTokenFromExpression(const std::string& returnValue,
             return nullptr;
     }
 
+    // TODO: put in a helper?
     // combine operators, set links, etc..
     std::stack<Token*> lpar;
     for (Token* tok2 = tokenList->front(); tok2; tok2 = tok2->next()) {

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -303,6 +303,7 @@ Token *TokenList::copyTokens(Token *dest, const Token *first, const Token *last,
 
 void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
 {
+    // TODO: put the linking in a helper?
     std::stack<Token *> link;
 
     while (n > 0) {

diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
@@ -26,6 +26,7 @@
 #include "tokenlist.h"
 
 #include <sstream>
+#include <stack>
 #include <string>
 
 #include <simplecpp.h>
@@ -43,6 +44,7 @@ class TestTokenList : public TestFixture {
         TEST_CASE(inc);
         TEST_CASE(isKeyword);
         TEST_CASE(notokens);
+        TEST_CASE(ast1);
     }
 
     // inspired by #5895
@@ -161,6 +163,30 @@ class TestTokenList : public TestFixture {
         TokenList tokenlist(&settingsDefault);
         tokenlist.createTokens(std::move(tokensP)); // do not assert
     }
+
+    void ast1() const {
+        const std::string s = "('Release|x64' == 'Release|x64');";
+
+        TokenList tokenlist(&settings);
+        std::istringstream istr(s);
+        tokenlist.createTokens(istr, Standards::Language::C);
+        // TODO: put this logic in TokenList
+        // generate links
+        {
+            std::stack<Token*> lpar;
+            for (Token* tok2 = tokenlist.front(); tok2; tok2 = tok2->next()) {
+                if (tok2->str() == "(")
+                    lpar.push(tok2);
+                else if (tok2->str() == ")") {
+                    if (lpar.empty())
+                        break;
+                    Token::createMutualLinks(lpar.top(), tok2);
+                    lpar.pop();
+                }
+            }
+        }
+        tokenlist.createAst(); // do not crash
+    }
 };
 
 REGISTER_TEST(TestTokenList)