Fixed wrong locations in expanded macros

danmar · danmar · commit fe7f1c320e8c · 2020-07-03T11:38:10.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1473,7 +1473,7 @@ namespace simplecpp {
 
         const Token *appendTokens(TokenList *tokens,
                                   const Location &rawloc,
-                                  const Token *lpar,
+                                  const Token * const lpar,
                                   const std::map<TokenString,Macro> &macros,
                                   const std::set<TokenString> &expandedmacros,
                                   const std::vector<const Token*> &parametertokens) const {
@@ -1512,6 +1512,8 @@ namespace simplecpp {
                     tok = tok->next;
                 }
             }
+            for (Token *tok2 = tokens->front(); tok2; tok2 = tok2->next)
+                tok2->location = lpar->location;
             return sameline(lpar,tok) ? tok : NULL;
         }
 
diff --git a/test.cpp b/test.cpp
@@ -339,6 +339,19 @@ static void define10()   // don't combine prefix with space in macro
     ASSERT_EQUALS("\nu8 \"a b\" ;", preprocess(code));
 }
 
+static void define11() // location of expanded argument
+{
+    const char code[] = "#line 4 \"version.h\"\n"
+                        "#define A(x) B(x)\n"
+                        "#define B(x) x\n"
+                        "#define VER A(1)\n"
+                        "\n"
+                        "#line 10 \"cppcheck.cpp\"\n"
+                        "VER;";
+    ASSERT_EQUALS("\n#line 10 \"cppcheck.cpp\"\n1 ;", preprocess(code));
+}
+
+
 static void define_invalid_1()
 {
     std::istringstream istr("#define  A(\nB\n");
@@ -1911,6 +1924,7 @@ int main(int argc, char **argv)
     TEST_CASE(define8);
     TEST_CASE(define9);
     TEST_CASE(define10);
+    TEST_CASE(define11);
     TEST_CASE(define_invalid_1);
     TEST_CASE(define_invalid_2);
     TEST_CASE(define_define_1);

Original file line number	Diff line number	Diff line change
`@@ -1473,7 +1473,7 @@ namespace simplecpp {`
`1473`	`1473`
`1474`	`1474`	`const Token appendTokens(TokenList tokens,`
`1475`	`1475`	`const Location &rawloc,`
`1476`		`- const Token *lpar,`
	`1476`	`+ const Token * const lpar,`
`1477`	`1477`	`const std::map<TokenString,Macro> &macros,`
`1478`	`1478`	`const std::set<TokenString> &expandedmacros,`
`1479`	`1479`	`const std::vector<const Token*> &parametertokens) const {`
`@@ -1512,6 +1512,8 @@ namespace simplecpp {`
`1512`	`1512`	`tok = tok->next;`
`1513`	`1513`	`}`
`1514`	`1514`	`}`
	`1515`	`+ for (Token *tok2 = tokens->front(); tok2; tok2 = tok2->next)`
	`1516`	`+ tok2->location = lpar->location;`
`1515`	`1517`	`return sameline(lpar,tok) ? tok : NULL;`
`1516`	`1518`	`}`
`1517`	`1519`