Merge pull request #87 from dedmen/patch-2

Don't evaluate macros in double quotes
KoffeinFlummi · Nov 18, 2018 · 8b88b46 · 8b88b46
2 parents 7e70b98 + 7942c07
commit 8b88b46
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/preprocess.c b/src/preprocess.c
@@ -297,9 +297,16 @@ char *constants_preprocess(struct constants *constants, char *source, int line,
     while (true) {
         // Non-tokens
         start = ptr;
-        while (*ptr != 0 && !IS_MACRO_CHAR(*ptr))
-            ptr++;
-
+        while (*ptr != 0 && !IS_MACRO_CHAR(*ptr)) {
+            if (*ptr == '"') {
+                ptr++;
+                while (*ptr != 0 && *ptr != '"')
+                    ptr++;
+            }
+            ptr++; //also skips ending "
+        }
+
+
         if (ptr - start > 0) {
             len += ptr - start;
             result = (char *)safe_realloc(result, len + 1);