Fix #376: Member access on user-defined literal tokenized incorrectly (#379)

ludviggunne · web-flow · commit d9edfb0ac8a2 · 2024-10-21T14:48:27.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1002,7 +1002,7 @@ void simplecpp::TokenList::combineOperators()
                 continue;
             }
             // float literals..
-            if (tok->previous && tok->previous->number && sameline(tok->previous, tok)) {
+            if (tok->previous && tok->previous->number && sameline(tok->previous, tok) && tok->previous->str().find_first_of("._") == std::string::npos) {
                 tok->setstr(tok->previous->str() + '.');
                 deleteToken(tok->previous);
                 if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {
diff --git a/test.cpp b/test.cpp
@@ -390,6 +390,8 @@ static void combineOperators_floatliteral()
     ASSERT_EQUALS("0x1p+3f", preprocess("0x1p+3f"));
     ASSERT_EQUALS("0x1p+3L", preprocess("0x1p+3L"));
     ASSERT_EQUALS("1p + 3", preprocess("1p+3"));
+    ASSERT_EQUALS("1.0_a . b", preprocess("1.0_a.b"));
+    ASSERT_EQUALS("1_a . b", preprocess("1_a.b"));
 }
 
 static void combineOperators_increment()

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,7 @@ void simplecpp::TokenList::combineOperators()`
`1002`	`1002`	`continue;`
`1003`	`1003`	`}`
`1004`	`1004`	`// float literals..`
`1005`		`- if (tok->previous && tok->previous->number && sameline(tok->previous, tok)) {`
	`1005`	`+ if (tok->previous && tok->previous->number && sameline(tok->previous, tok) && tok->previous->str().find_first_of("._") == std::string::npos) {`
`1006`	`1006`	`tok->setstr(tok->previous->str() + '.');`
`1007`	`1007`	`deleteToken(tok->previous);`
`1008`	`1008`	`if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) \|\| (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {`
Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,8 @@ static void combineOperators_floatliteral()`
`390`	`390`	`ASSERT_EQUALS("0x1p+3f", preprocess("0x1p+3f"));`
`391`	`391`	`ASSERT_EQUALS("0x1p+3L", preprocess("0x1p+3L"));`
`392`	`392`	`ASSERT_EQUALS("1p + 3", preprocess("1p+3"));`
	`393`	`+ ASSERT_EQUALS("1.0_a . b", preprocess("1.0_a.b"));`
	`394`	`+ ASSERT_EQUALS("1_a . b", preprocess("1_a.b"));`
`393`	`395`	`}`
`394`	`396`
`395`	`397`	`static void combineOperators_increment()`