TokenList::combineOperators: dont combine &= for anonymous reference parameter

danmar · danmar · commit 127340e83df4 · 2018-04-01T09:05:23.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -658,7 +658,26 @@ static bool isFloatSuffix(const simplecpp::Token *tok)
 
 void simplecpp::TokenList::combineOperators()
 {
+    std::stack<bool> executableScope;
+    executableScope.push(false);
     for (Token *tok = front(); tok; tok = tok->next) {
+        if (tok->op == '{') {
+            if (executableScope.top()) {
+                executableScope.push(true);
+                continue;
+            }
+            const Token *prev = tok->previous;
+            while (prev && prev->isOneOf(";{}()"))
+                prev = prev->previous;
+            executableScope.push(prev && prev->op == ')');
+            continue;
+        }
+        if (tok->op == '}') {
+            if (executableScope.size() > 1)
+                executableScope.pop();
+            continue;
+        }
+
         if (tok->op == '.') {
             if (tok->previous && tok->previous->op == '.')
                 continue;
@@ -694,6 +713,39 @@ void simplecpp::TokenList::combineOperators()
             continue;
 
         if (tok->next->op == '=' && tok->isOneOf("=!<>+-*/%&|^")) {
+            if (tok->op == '&' && !executableScope.top()) {
+                // don't combine &= if it is a anonymous reference parameter with default value:
+                // void f(x&=2)
+                int indentlevel = 0;
+                const Token *start = tok;
+                while (indentlevel >= 0 && start) {
+                    if (start->op == ')')
+                        ++indentlevel;
+                    else if (start->op == '(')
+                        --indentlevel;
+                    else if (start->isOneOf(";{}"))
+                        break;
+                    start = start->previous;
+                }
+                if (indentlevel == -1 && start) {
+                    const Token *ftok = start;
+                    bool isFuncDecl = ftok->name;
+                    while (isFuncDecl) {
+                        if (!start->name && start->str != "::" && start->op != '*' && start->op != '&')
+                            isFuncDecl = false;
+                        if (!start->previous)
+                            break;
+                        if (start->previous->isOneOf(";{}:"))
+                            break;
+                        start = start->previous;
+                    }
+                    isFuncDecl &= start != ftok && start->name;
+                    if (isFuncDecl) {
+                        // TODO: we could loop through the parameters here and check if they are correct.
+                        continue;
+                    }
+                }
+            }
             tok->setstr(tok->str + "=");
             deleteToken(tok->next);
         } else if ((tok->op == '|' || tok->op == '&') && tok->op == tok->next->op) {
diff --git a/test.cpp b/test.cpp
@@ -168,6 +168,13 @@ static void combineOperators_coloncolon()
     ASSERT_EQUALS("x ? y : :: z", preprocess("x ? y : ::z"));
 }
 
+static void combineOperators_andequal()
+{
+    ASSERT_EQUALS("x &= 2 ;", preprocess("x &= 2;"));
+    ASSERT_EQUALS("void f ( x & = 2 ) ;", preprocess("void f(x &= 2);"));
+    ASSERT_EQUALS("f ( x &= 2 ) ;", preprocess("f(x &= 2);"));
+}
+
 static void comment()
 {
     ASSERT_EQUALS("// abc", readfile("// abc"));
@@ -612,7 +619,8 @@ static void hashhash8()
     ASSERT_EQUALS("\nxy = 123 ;", preprocess(code));
 }
 
-static void hashhash_invalid_1() {
+static void hashhash_invalid_1()
+{
     std::istringstream istr("#define  f(a)  (##x)\nf(1)");
     std::vector<std::string> files;
     std::map<std::string, simplecpp::TokenList*> filedata;
@@ -622,7 +630,8 @@ static void hashhash_invalid_1() {
     ASSERT_EQUALS("file0,1,syntax_error,failed to expand 'f', Invalid ## usage when expanding 'f'.\n", toString(outputList));
 }
 
-static void hashhash_invalid_2() {
+static void hashhash_invalid_2()
+{
     std::istringstream istr("#define  f(a)  (x##)\nf(1)");
     std::vector<std::string> files;
     std::map<std::string, simplecpp::TokenList*> filedata;
@@ -1484,6 +1493,7 @@ int main(int argc, char **argv)
     TEST_CASE(combineOperators_floatliteral);
     TEST_CASE(combineOperators_increment);
     TEST_CASE(combineOperators_coloncolon);
+    TEST_CASE(combineOperators_andequal);
 
     TEST_CASE(comment);
     TEST_CASE(comment_multiline);
