fixed cppcheck-opensource#73 - nested conditions containing defined(smth) are not expanded

danmar · danmar · commit 96ade8d92399 · 2017-05-28T22:57:18.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1471,6 +1471,25 @@ namespace simplecpp {
                 return tok2->next;
             }
 
+            else if (tok->str == DEFINED) {
+                const Token *tok2 = tok->next;
+                const Token *tok3 = tok2 ? tok2->next : NULL;
+                const Token *tok4 = tok3 ? tok3->next : NULL;
+                const Token *defToken = NULL;
+                const Token *lastToken = NULL;
+                if (sameline(tok, tok4) && tok2->op == '(' && tok3->name && tok4->op == ')') {
+                    defToken = tok3;
+                    lastToken = tok4;
+                } else if (sameline(tok,tok2) && tok2->name) {
+                    defToken = lastToken = tok2;
+                }
+                if (defToken) {
+                    const bool def = (macros.find(defToken->str) != macros.end());
+                    output->push_back(newMacroToken(def ? "1" : "0", loc, true));
+                    return lastToken->next;
+                }
+            }
+
             output->push_back(newMacroToken(tok->str, loc, true));
             return tok->next;
         }
diff --git a/test.cpp b/test.cpp
@@ -642,6 +642,41 @@ void ifDefined()
     ASSERT_EQUALS("\nX", preprocess(code, dui));
 }
 
+void ifDefinedNoPar()
+{
+    const char code[] = "#if defined A\n"
+                        "X\n"
+                        "#endif";
+    simplecpp::DUI dui;
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.defines.push_back("A=1");
+    ASSERT_EQUALS("\nX", preprocess(code, dui));
+}
+
+void ifDefinedNested()
+{
+    const char code[] = "#define FOODEF defined(FOO)\n"
+                        "#if FOODEF\n"
+                        "X\n"
+                        "#endif";
+    simplecpp::DUI dui;
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.defines.push_back("FOO=1");
+    ASSERT_EQUALS("\n\nX", preprocess(code, dui));
+}
+
+void ifDefinedNestedNoPar()
+{
+    const char code[] = "#define FOODEF defined FOO\n"
+                        "#if FOODEF\n"
+                        "X\n"
+                        "#endif";
+    simplecpp::DUI dui;
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.defines.push_back("FOO=1");
+    ASSERT_EQUALS("\n\nX", preprocess(code, dui));
+}
+
 void ifDefinedInvalid1()   // #50 - invalid unterminated defined
 {
     const char code[] = "#if defined(A";
@@ -1276,6 +1311,9 @@ int main(int argc, char **argv)
     TEST_CASE(ifA);
     TEST_CASE(ifCharLiteral);
     TEST_CASE(ifDefined);
+    TEST_CASE(ifDefinedNoPar);
+    TEST_CASE(ifDefinedNested);
+    TEST_CASE(ifDefinedNestedNoPar);
     TEST_CASE(ifDefinedInvalid1);
     TEST_CASE(ifDefinedInvalid2);
     TEST_CASE(ifLogical);
