remove standard checks

ludviggunne · ludviggunne · commit 232537163248 · 2026-07-24T10:13:55.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -3726,7 +3726,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                     continue;
                 }
             } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF ||
-                       ((getCStd(dui.std) >= C23 || getCppStd(dui.std) >= CPP23) && (rawtok->str() == ELIFDEF || rawtok->str() == ELIFNDEF))) {
+                       rawtok->str() == ELIFDEF || rawtok->str() == ELIFNDEF) {
                 if (!sameline(rawtok,rawtok->next)) {
                     if (outputList) {
                         simplecpp::Output out{
diff --git a/test.cpp b/test.cpp
@@ -2372,9 +2372,6 @@ static void elif()
 
 static void elifdef()
 {
-    simplecpp::DUI dui;
-    dui.std = "c++23";
-
     {
         const char code[] = "#if 1\n"
                             "1\n"
@@ -2383,7 +2380,7 @@ static void elifdef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n1", preprocess(code, dui));
+        ASSERT_EQUALS("\n1", preprocess(code));
     }
     {
         const char code[] = "#define X\n"
@@ -2394,7 +2391,7 @@ static void elifdef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n\n\n\n2", preprocess(code, dui));
+        ASSERT_EQUALS("\n\n\n\n2", preprocess(code));
     }
     {
         const char code[] = "#if 0\n"
@@ -2404,15 +2401,12 @@ static void elifdef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n\n\n\n\n3", preprocess(code, dui));
+        ASSERT_EQUALS("\n\n\n\n\n3", preprocess(code));
     }
 }
 
 static void elifndef()
 {
-    simplecpp::DUI dui;
-    dui.std = "c++23";
-
     {
         const char code[] = "#if 1\n"
                             "1\n"
@@ -2421,7 +2415,7 @@ static void elifndef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n1", preprocess(code, dui));
+        ASSERT_EQUALS("\n1", preprocess(code));
     }
     {
         const char code[] = "#if 0\n"
@@ -2431,7 +2425,7 @@ static void elifndef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n\n\n2", preprocess(code, dui));
+        ASSERT_EQUALS("\n\n\n2", preprocess(code));
     }
     {
         const char code[] = "#define X\n"
@@ -2442,7 +2436,7 @@ static void elifndef()
                             "#else\n"
                             "3\n"
                             "#endif";
-        ASSERT_EQUALS("\n\n\n\n\n\n3", preprocess(code, dui));
+        ASSERT_EQUALS("\n\n\n\n\n\n3", preprocess(code));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3726,7 +3726,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL`
`3726`	`3726`	`continue;`
`3727`	`3727`	`}`
`3728`	`3728`	`} else if (rawtok->str() == IF \|\| rawtok->str() == IFDEF \|\| rawtok->str() == IFNDEF \|\| rawtok->str() == ELIF \|\|`
`3729`		`- ((getCStd(dui.std) >= C23 \|\| getCppStd(dui.std) >= CPP23) && (rawtok->str() == ELIFDEF \|\| rawtok->str() == ELIFNDEF))) {`
	`3729`	`+ rawtok->str() == ELIFDEF \|\| rawtok->str() == ELIFNDEF) {`
`3730`	`3730`	`if (!sameline(rawtok,rawtok->next)) {`
`3731`	`3731`	`if (outputList) {`
`3732`	`3732`	`simplecpp::Output out{`
Original file line number	Diff line number	Diff line change
`@@ -2372,9 +2372,6 @@ static void elif()`
`2372`	`2372`
`2373`	`2373`	`static void elifdef()`
`2374`	`2374`	`{`
`2375`		`- simplecpp::DUI dui;`
`2376`		`- dui.std = "c++23";`
`2377`		`-`
`2378`	`2375`	`{`
`2379`	`2376`	`const char code[] = "#if 1\n"`
`2380`	`2377`	`"1\n"`
`@@ -2383,7 +2380,7 @@ static void elifdef()`
`2383`	`2380`	`"#else\n"`
`2384`	`2381`	`"3\n"`
`2385`	`2382`	`"#endif";`
`2386`		`- ASSERT_EQUALS("\n1", preprocess(code, dui));`
	`2383`	`+ ASSERT_EQUALS("\n1", preprocess(code));`
`2387`	`2384`	`}`
`2388`	`2385`	`{`
`2389`	`2386`	`const char code[] = "#define X\n"`
`@@ -2394,7 +2391,7 @@ static void elifdef()`
`2394`	`2391`	`"#else\n"`
`2395`	`2392`	`"3\n"`
`2396`	`2393`	`"#endif";`
`2397`		`- ASSERT_EQUALS("\n\n\n\n2", preprocess(code, dui));`
	`2394`	`+ ASSERT_EQUALS("\n\n\n\n2", preprocess(code));`
`2398`	`2395`	`}`
`2399`	`2396`	`{`
`2400`	`2397`	`const char code[] = "#if 0\n"`
`@@ -2404,15 +2401,12 @@ static void elifdef()`
`2404`	`2401`	`"#else\n"`
`2405`	`2402`	`"3\n"`
`2406`	`2403`	`"#endif";`
`2407`		`- ASSERT_EQUALS("\n\n\n\n\n3", preprocess(code, dui));`
	`2404`	`+ ASSERT_EQUALS("\n\n\n\n\n3", preprocess(code));`
`2408`	`2405`	`}`
`2409`	`2406`	`}`
`2410`	`2407`
`2411`	`2408`	`static void elifndef()`
`2412`	`2409`	`{`
`2413`		`- simplecpp::DUI dui;`
`2414`		`- dui.std = "c++23";`
`2415`		`-`
`2416`	`2410`	`{`
`2417`	`2411`	`const char code[] = "#if 1\n"`
`2418`	`2412`	`"1\n"`
`@@ -2421,7 +2415,7 @@ static void elifndef()`
`2421`	`2415`	`"#else\n"`
`2422`	`2416`	`"3\n"`
`2423`	`2417`	`"#endif";`
`2424`		`- ASSERT_EQUALS("\n1", preprocess(code, dui));`
	`2418`	`+ ASSERT_EQUALS("\n1", preprocess(code));`
`2425`	`2419`	`}`
`2426`	`2420`	`{`
`2427`	`2421`	`const char code[] = "#if 0\n"`
`@@ -2431,7 +2425,7 @@ static void elifndef()`
`2431`	`2425`	`"#else\n"`
`2432`	`2426`	`"3\n"`
`2433`	`2427`	`"#endif";`
`2434`		`- ASSERT_EQUALS("\n\n\n2", preprocess(code, dui));`
	`2428`	`+ ASSERT_EQUALS("\n\n\n2", preprocess(code));`
`2435`	`2429`	`}`
`2436`	`2430`	`{`
`2437`	`2431`	`const char code[] = "#define X\n"`
`@@ -2442,7 +2436,7 @@ static void elifndef()`
`2442`	`2436`	`"#else\n"`
`2443`	`2437`	`"3\n"`
`2444`	`2438`	`"#endif";`
`2445`		`- ASSERT_EQUALS("\n\n\n\n\n\n3", preprocess(code, dui));`
	`2439`	`+ ASSERT_EQUALS("\n\n\n\n\n\n3", preprocess(code));`
`2446`	`2440`	`}`
`2447`	`2441`	`}`
`2448`	`2442`