Syntax error: Clarify a syntax error in audacity

danmar · danmar · commit 73433c296181 · 2019-03-31T10:46:59.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9060,7 +9060,7 @@ void Tokenizer::findGarbageCode() const
         while (prev && prev->isName())
             prev = prev->previous();
         if (Token::Match(prev, "%op%|%num%|%str%|%char%"))
-            syntaxError(tok);
+            syntaxError(tok, prev == tok->previous() ? (prev->str() + " " + tok->str()) : (prev->str() + " .. " + tok->str()));
     }
 
     // case keyword must be inside switch
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -1656,7 +1656,7 @@ class TestGarbage : public TestFixture {
     void syntaxErrorFuzzerCliType1() {
         ASSERT_THROW(checkCode("void f(){x=0,return return''[]()}"), InternalError);
         ASSERT_THROW(checkCode("void f(){x='0'++'0'(return)[];}"), InternalError); // #9063
-        checkCode("void f(){*(int *)42=0;}");
+        checkCode("void f(){*(int *)42=0;}"); // no syntax error
         ASSERT_THROW(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), InternalError); // #9067
         ASSERT_THROW(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), InternalError); // #9068
         ASSERT_THROW(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), InternalError); // #9069

Original file line number	Diff line number	Diff line change
`@@ -9060,7 +9060,7 @@ void Tokenizer::findGarbageCode() const`
`9060`	`9060`	`while (prev && prev->isName())`
`9061`	`9061`	`prev = prev->previous();`
`9062`	`9062`	`if (Token::Match(prev, "%op%\|%num%\|%str%\|%char%"))`
`9063`		`- syntaxError(tok);`
	`9063`	`+ syntaxError(tok, prev == tok->previous() ? (prev->str() + " " + tok->str()) : (prev->str() + " .. " + tok->str()));`
`9064`	`9064`	`}`
`9065`	`9065`
`9066`	`9066`	`// case keyword must be inside switch`