Skip to content

Commit 982c7ea

Browse files
committed
Revert "Fix danmar#470 Crash in simplecpp::Macro::expand() (danmar#555)"
This reverts commit b070df6.
1 parent 466bbbe commit 982c7ea

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

simplecpp.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,13 +2035,7 @@ namespace simplecpp {
20352035

20362036
tok = tok->next;
20372037
if (tok == endToken2) {
2038-
if (tok) {
2039-
output.push_back(new Token(*tok->previous));
2040-
}
2041-
else {
2042-
output.push_back(new Token(*nameTokInst));
2043-
output.back()->setstr("\"\"");
2044-
}
2038+
output.push_back(new Token(*tok->previous));
20452039
break;
20462040
}
20472041
if (tok->op == '#') {

test.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,16 +1048,6 @@ static void define_va_opt_7()
10481048
toString(outputList));
10491049
}
10501050

1051-
static void define_va_opt_8()
1052-
{
1053-
const char code[] = "#define f(...) #__VA_OPT__(x)\n"
1054-
"const char* v1 = f();";
1055-
1056-
simplecpp::OutputList outputList;
1057-
ASSERT_EQUALS("\nconst char * v1 = \"\" ;", preprocess(code, &outputList));
1058-
ASSERT_EQUALS("", toString(outputList));
1059-
}
1060-
10611051
static void define_ifdef()
10621052
{
10631053
const char code[] = "#define A(X) X\n"
@@ -3596,7 +3586,6 @@ int main(int argc, char **argv)
35963586
TEST_CASE(define_va_opt_5);
35973587
TEST_CASE(define_va_opt_6);
35983588
TEST_CASE(define_va_opt_7);
3599-
TEST_CASE(define_va_opt_8);
36003589

36013590
TEST_CASE(pragma_backslash); // multiline pragma directive
36023591

0 commit comments

Comments
 (0)