Fix #321 End of double #define not recognized (#322)

Author: chrchr-github

simplecpp.cpp

@@ -949,7 +949,7 @@ void simplecpp::TokenList::combineOperators()
             if (tok->previous && tok->previous->number && sameline(tok->previous, tok)) {
                 tok->setstr(tok->previous->str() + '.');
                 deleteToken(tok->previous);
-                if (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp"))) {
+                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {
                     tok->setstr(tok->str() + tok->next->str());
                     deleteToken(tok->next);
                 }

simplecpp.h

@@ -120,7 +120,7 @@ namespace simplecpp {
             name = (std::isalpha(static_cast<unsigned char>(string[0])) || string[0] == '_' || string[0] == '$')
                    && (std::memchr(string.c_str(), '\'', string.size()) == nullptr);
             comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
-            number = std::isdigit(static_cast<unsigned char>(string[0])) || (string.size() > 1U && (string[0] == '-' || string[0] == '+') && std::isdigit(static_cast<unsigned char>(string[1])));
+            number = isNumberLike(string);
             op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
         }
 
@@ -135,6 +135,10 @@ namespace simplecpp {
         bool isOneOf(const char ops[]) const;
         bool startsWithOneOf(const char c[]) const;
         bool endsWithOneOf(const char c[]) const;
+        static bool SIMPLECPP_LIB isNumberLike(const std::string& str) {
+            return std::isdigit(static_cast<unsigned char>(str[0])) ||
+                   (str.size() > 1U && (str[0] == '-' || str[0] == '+') && std::isdigit(static_cast<unsigned char>(str[1])));
+        }
 
         TokenString macro;
         char op;

test.cpp

@@ -593,6 +593,19 @@ static void define12()
                   "} ;", preprocess(code));
 }
 
+static void define13()
+{
+    const char code[] = "#define M 180.\n"
+                        "extern void g();\n"
+                        "void f(double d) {\n"
+                        "    if (d > M) {}\n"
+                        "}\n";
+    ASSERT_EQUALS("\nextern void g ( ) ;\n"
+                  "void f ( double d ) {\n"
+                  "if ( d > 180. ) { }\n"
+                  "}", preprocess(code));
+}
+
 
 
 static void define_invalid_1()
@@ -2646,6 +2659,7 @@ int main(int argc, char **argv)
     TEST_CASE(define10);
     TEST_CASE(define11);
     TEST_CASE(define12);
+    TEST_CASE(define13);
     TEST_CASE(define_invalid_1);
     TEST_CASE(define_invalid_2);
     TEST_CASE(define_define_1);