AST: Improved handling of brackets

danmar · danmar · commit 3b11ee9e0e1b · 2013-11-25T20:58:40.000+01:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -363,10 +363,8 @@ static bool iscast(const Token *tok)
         return false;
 
     for (const Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
-        if (tok2->str() == ")")
-            return (tok2->next() && !tok2->next()->isOp());
         if (!Token::Match(tok2, "%var%|*"))
-            return false;
+            return Token::Match(tok2, ") %any%") && (!tok2->next()->isOp() && tok2->next()->str() != "[");
     }
 
     return false;
@@ -500,16 +498,26 @@ static void compileScope(Token *&tok, std::stack<Token*> &op)
     }
 }
 
-static void compileDot(Token *&tok, std::stack<Token*> &op)
+static void compileParAndBrackets(Token *&tok, std::stack<Token*> &op)
 {
     compileScope(tok,op);
     while (tok) {
-        if (tok->str() == ".") {
+        if (tok->str() == "[") {
             compileBinOp(tok, compileScope, op);
         } else break;
     }
 }
 
+static void compileDot(Token *&tok, std::stack<Token*> &op)
+{
+    compileParAndBrackets(tok,op);
+    while (tok) {
+        if (tok->str() == ".") {
+            compileBinOp(tok, compileParAndBrackets, op);
+        } else break;
+    }
+}
+
 static void compileMulDiv(Token *&tok, std::stack<Token*> &op)
 {
     compileDot(tok,op);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -10008,10 +10008,6 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_EQUALS("'X''a'>", testAst("('X' > 'a')"));
         ASSERT_EQUALS("'X''a'>", testAst("(L'X' > L'a')"));
-
-        // ({..})
-        ASSERT_EQUALS("a{+d+", testAst("a+({b+c;})+d"));
-        ASSERT_EQUALS("a{d*+", testAst("a+({b+c;})*d"));
     }
 
     void astpar() const { // parentheses
@@ -10023,11 +10019,18 @@ class TestTokenizer : public TestFixture {
         // casts
         ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;"));
         ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;"));
+
+        // ({..})
+        ASSERT_EQUALS("a{+d+", testAst("a+({b+c;})+d"));
+        ASSERT_EQUALS("a{d*+", testAst("a+({b+c;})*d"));
     }
 
     void astbrackets() const { // []
         ASSERT_EQUALS("a23+[4+", testAst("a[2+3]+4"));
         ASSERT_EQUALS("a1[0[", testAst("a[1][0]"));
+        ASSERT_EQUALS("ab0[=", testAst("a=(b)[0];"));
+        ASSERT_EQUALS("abc0[.=", testAst("a=b.c[0];"));
+        ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];"));
     }
 
     void astunaryop() const { // unary operators

Original file line number	Diff line number	Diff line change
`@@ -363,10 +363,8 @@ static bool iscast(const Token *tok)`
`363`	`363`	`return false;`
`364`	`364`
`365`	`365`	`for (const Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {`
`366`		`- if (tok2->str() == ")")`
`367`		`- return (tok2->next() && !tok2->next()->isOp());`
`368`	`366`	`if (!Token::Match(tok2, "%var%\|*"))`
`369`		`- return false;`
	`367`	`+ return Token::Match(tok2, ") %any%") && (!tok2->next()->isOp() && tok2->next()->str() != "[");`
`370`	`368`	`}`
`371`	`369`
`372`	`370`	`return false;`
`@@ -500,16 +498,26 @@ static void compileScope(Token &tok, std::stack<Token> &op)`
`500`	`498`	`}`
`501`	`499`	`}`
`502`	`500`
`503`		`-static void compileDot(Token &tok, std::stack<Token> &op)`
	`501`	`+static void compileParAndBrackets(Token &tok, std::stack<Token> &op)`
`504`	`502`	`{`
`505`	`503`	`compileScope(tok,op);`
`506`	`504`	`while (tok) {`
`507`		`- if (tok->str() == ".") {`
	`505`	`+ if (tok->str() == "[") {`
`508`	`506`	`compileBinOp(tok, compileScope, op);`
`509`	`507`	`} else break;`
`510`	`508`	`}`
`511`	`509`	`}`
`512`	`510`
	`511`	`+static void compileDot(Token &tok, std::stack<Token> &op)`
	`512`	`+{`
	`513`	`+ compileParAndBrackets(tok,op);`
	`514`	`+ while (tok) {`
	`515`	`+ if (tok->str() == ".") {`
	`516`	`+ compileBinOp(tok, compileParAndBrackets, op);`
	`517`	`+ } else break;`
	`518`	`+ }`
	`519`	`+}`
	`520`	`+`
`513`	`521`	`static void compileMulDiv(Token &tok, std::stack<Token> &op)`
`514`	`522`	`{`
`515`	`523`	`compileDot(tok,op);`