[#190][Preprocessor] Undefined identifiers are set to 0

libocca · Aug 9, 2018 · 5bf34fa · 5bf34fa
1 parent 8646ac0
commit 5bf34fa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/lang/preprocessor.cpp b/src/lang/preprocessor.cpp
@@ -605,6 +605,16 @@ namespace occa {
       getExpandedLineTokens(lineTokens);
       removeNewline(lineTokens);
 
+      const int tokenCount = (int) lineTokens.size();
+      for (int i = 0; i < tokenCount; ++i) {
+        token_t *token = lineTokens[i];
+        if (!(token->type() & tokenType::identifier)) {
+          continue;
+        }
+        lineTokens[i] = new primitiveToken(token->origin, 0, "0");
+        delete token;
+      }
+
       exprNode *expr = getExpression(lineTokens);
 
       // Errors when expr is NULL are handled

diff --git a/tests/src/lang/preprocessor.cpp b/tests/src/lang/preprocessor.cpp
@@ -32,6 +32,7 @@ void testMacroDefines();
 void testCppStandardTests();
 void testIfElse();
 void testIfElseDefines();
+void testIfWithUndefines();
 void testErrorDefines();
 void testSpecialMacros();
 void testInclude();
@@ -96,6 +97,7 @@ int main(const int argc, const char **argv) {
   testCppStandardTests();
   testIfElse();
   testIfElseDefines();
+  testIfWithUndefines();
   testErrorDefines();
   testSpecialMacros();
   testInclude();
@@ -485,6 +487,18 @@ void testIfElseDefines () {
   }
 }
 
+void testIfWithUndefines() {
+  setStream(
+    "#if foo == 0\n"
+    "  1\n"
+    "#else\n"
+    "  0\n"
+    "#endif"
+  );
+  ASSERT_EQ(1,
+            (int) nextTokenPrimitiveValue());
+}
+
 void testErrorDefines() {
   std::cerr << "Testing error and warning directives\n";
   setStream(