Better handling of # in define (danmar#60)

danmar · danmar · commit e6d9457f4ccb · 2020-06-30T21:18:20.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1612,14 +1612,14 @@ namespace simplecpp {
                     hashToken = hashToken->next;
                     ++numberOfHash;
                 }
-                if (numberOfHash == 4) {
+                if (numberOfHash == 4 && tok->next->location.col + 1 == tok->next->next->location.col) {
                     // # ## #  => ##
                     output->push_back(newMacroToken("##", loc, isReplaced(expandedmacros)));
                     tok = hashToken;
                     continue;
                 }
 
-                if (numberOfHash == 2 && tok->location.col + 1 < tok->next->location.col) {
+                if (numberOfHash >= 2 && tok->location.col + 1 < tok->next->location.col) {
                     output->push_back(new Token(*tok));
                     tok = tok->next;
                     continue;
diff --git a/test.cpp b/test.cpp
@@ -766,6 +766,13 @@ static void hashhash10()
     ASSERT_EQUALS("# #", preprocess(code));
 }
 
+static void hashhash11()
+{
+    const char code[] = "#define x # # #\n"
+                        "x";
+    ASSERT_EQUALS("# # #", preprocess(code));
+}
+
 static void hashhash_invalid_1()
 {
     std::istringstream istr("#define  f(a)  (##x)\nf(1)");
@@ -1930,7 +1937,8 @@ int main(int argc, char **argv)
     TEST_CASE(hashhash7); // # ## #  (C standard; 6.10.3.3.p4)
     TEST_CASE(hashhash8);
     TEST_CASE(hashhash9);
-    TEST_CASE(hashhash10);
+    TEST_CASE(hashhash10); // #108 : #define x # #
+    TEST_CASE(hashhash11); // #60: #define x # # #
     TEST_CASE(hashhash_invalid_1);
     TEST_CASE(hashhash_invalid_2);
 
