Fixed danmar#5088 (Token::Match called with varid 0. in libreoffice sd/source/ui/table/TableDesignPane.cxx)

IOBYTE · danmar · commit b41ab8a4d5d5 · 2013-10-14T21:05:54.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -4213,6 +4213,17 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
     if (tokAfterCondition->str()=="{") {
         // already surrounded by braces
         tokBracesEnd=tokAfterCondition->link();
+    } else if (Token::Match(tokAfterCondition, "try {") &&
+               Token::Match(tokAfterCondition->linkAt(1), "} catch (")) {
+        tokAfterCondition->previous()->insertToken("{");
+        Token * tokOpenBrace = tokAfterCondition->previous();
+        Token * tokEnd = tokAfterCondition->linkAt(1)->linkAt(2)->linkAt(1);
+
+        tokEnd->insertToken("}");
+        Token * tokCloseBrace = tokEnd->next();
+
+        Token::createMutualLinks(tokOpenBrace, tokCloseBrace);
+        tokBracesEnd = tokCloseBrace;
     } else {
         Token * tokEnd = simplifyAddBracesToCommand(tokAfterCondition);
         if (!tokEnd) // Ticket #4887
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -121,7 +121,8 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(whileAddBraces);
         TEST_CASE(doWhileAddBraces);
 
-        TEST_CASE(forAddBraces);
+        TEST_CASE(forAddBraces1);
+        TEST_CASE(forAddBraces2); // #5088
 
         TEST_CASE(pointers_condition);
 
@@ -1459,7 +1460,7 @@ class TestTokenizer : public TestFixture {
         }
     }
 
-    void forAddBraces() {
+    void forAddBraces1() {
         {
             const char code[] = "void f() {\n"
                                 "     for(;;)\n"
@@ -1491,6 +1492,15 @@ class TestTokenizer : public TestFixture {
         }
     }
 
+    void forAddBraces2() { // #5088
+        const char code[] = "void f() {\n"
+                            "    for(;;) try { } catch (...) { }\n"
+                            "}";
+        const char expected[] = "void f ( ) {\n"
+                                "for ( ; ; ) { try { } catch ( . . . ) { } }\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+    }
 
     std::string simplifyKnownVariables(const char code[]) {
         errout.str("");

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,8 @@ class TestTokenizer : public TestFixture {`
`121`	`121`	`TEST_CASE(whileAddBraces);`
`122`	`122`	`TEST_CASE(doWhileAddBraces);`
`123`	`123`
`124`		`- TEST_CASE(forAddBraces);`
	`124`	`+ TEST_CASE(forAddBraces1);`
	`125`	`+ TEST_CASE(forAddBraces2); // #5088`
`125`	`126`
`126`	`127`	`TEST_CASE(pointers_condition);`
`127`	`128`
`@@ -1459,7 +1460,7 @@ class TestTokenizer : public TestFixture {`
`1459`	`1460`	`}`
`1460`	`1461`	`}`
`1461`	`1462`
`1462`		`- void forAddBraces() {`
	`1463`	`+ void forAddBraces1() {`
`1463`	`1464`	`{`
`1464`	`1465`	`const char code[] = "void f() {\n"`
`1465`	`1466`	`" for(;;)\n"`
`@@ -1491,6 +1492,15 @@ class TestTokenizer : public TestFixture {`
`1491`	`1492`	`}`
`1492`	`1493`	`}`
`1493`	`1494`
	`1495`	`+ void forAddBraces2() { // #5088`
	`1496`	`+ const char code[] = "void f() {\n"`
	`1497`	`+ " for(;;) try { } catch (...) { }\n"`
	`1498`	`+ "}";`
	`1499`	`+ const char expected[] = "void f ( ) {\n"`
	`1500`	`+ "for ( ; ; ) { try { } catch ( . . . ) { } }\n"`
	`1501`	`+ "}";`
	`1502`	`+ ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));`
	`1503`	`+ }`
`1494`	`1504`
`1495`	`1505`	`std::string simplifyKnownVariables(const char code[]) {`
`1496`	`1506`	`errout.str("");`