Fix #12924 Syntax error on func(&data)[0] (#6585)

danmar · Jul 11, 2024 · 5d3b528 · 5d3b528
1 parent ba29f83
commit 5d3b528
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -4328,7 +4328,7 @@ static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap
         }
         if (Token::Match(tok3, "= %num%"))
             return false;
-        if (bracket && Token::Match(tok1->previous(), "[(,]") && Token::Match(tok3, "[,)]"))
+        if (bracket && Token::Match(tok1->previous(), "[(,]") && Token::Match(tok3, ",|)|%cop%"))
             return false;
     }
 

diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -3279,6 +3279,15 @@ class TestVarID : public TestFixture {
                                "  else x;\n"
                                "  x;\n"
                                "}"));
+
+        ASSERT_EQUALS("1: const char * f ( int * ) ;\n" // #12924
+                      "2: void g ( int i@1 ) {\n"
+                      "3: if ( f ( & i@1 ) [ 0 ] == 'm' ) { }\n"
+                      "4: }\n",
+                      tokenize("const char *f(int*);\n"
+                               "void g(int i) {\n"
+                               "    if (f(&i)[0] == 'm') {}\n"
+                               "}\n", false));
     }
 
     void varid_globalScope() {