fixes #352 - internally default to latest standard if none is provided

Author: firewave

simplecpp.cpp

@@ -2554,7 +2554,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
 static bool isCpp17OrLater(const simplecpp::DUI &dui)
 {
     const std::string std_ver = simplecpp::getCppStdString(dui.std);
-    return !std_ver.empty() && (std_ver >= "201703L");
+    return std_ver.empty() || (std_ver >= "201703L");
 }
 
 static bool isGnu(const simplecpp::DUI &dui)

test.cpp

@@ -1562,11 +1562,13 @@ static void has_include_1()
                         "#endif";
     simplecpp::DUI dui;
     dui.includePaths.push_back(testSourceDir);
-    dui.std = "c++17";
-    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
     dui.std = "c++14";
     ASSERT_EQUALS("", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
+    dui.std = "c++17";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
+    dui.std = "c++20";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
 }
 
 static void has_include_2()
@@ -1580,9 +1582,13 @@ static void has_include_2()
                         "#endif";
     simplecpp::DUI dui;
     dui.includePaths.push_back(testSourceDir);
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
+    dui.std = "c++14";
+    ASSERT_EQUALS("", preprocess(code, dui));
     dui.std = "c++17";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
+    dui.std = "c++20";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
 }
 
 static void has_include_3()
@@ -1595,13 +1601,24 @@ static void has_include_3()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-    dui.std = "c++17";
+
     // Test file not found...
+    ASSERT_EQUALS("\n\n\n\nB", preprocess(code, dui)); // we default to latest standard internally
+    dui.std = "c++14";
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.std = "c++17";
     ASSERT_EQUALS("\n\n\n\nB", preprocess(code, dui));
+
     // Unless -I is set (preferably, we should differentiate -I and -isystem...)
     dui.includePaths.push_back(testSourceDir + "/testsuite");
+    dui.std = "";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
+    dui.std = "c++14";
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.std = "c++17";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
+    dui.std = "c++20";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_4()
@@ -1614,10 +1631,14 @@ static void has_include_4()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
+    dui.includePaths.push_back(testSourceDir); // we default to latest standard internally
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
+    dui.std = "c++14";
+    ASSERT_EQUALS("", preprocess(code, dui));
     dui.std = "c++17";
-    dui.includePaths.push_back(testSourceDir);
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
+    dui.std = "c++20";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
 }
 
 static void has_include_5()
@@ -1630,10 +1651,14 @@ static void has_include_5()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-    dui.std = "c++17";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
     dui.includePaths.push_back(testSourceDir);
+    dui.std = "c++14";
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.std = "c++17";
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui));
+    dui.std = "c++20";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_6()
@@ -1646,10 +1671,12 @@ static void has_include_6()
                         "  #endif\n"
                         "#endif";
     simplecpp::DUI dui;
-    dui.std = "gnu99";
     dui.includePaths.push_back(testSourceDir);
+    ASSERT_EQUALS("\n\nA", preprocess(code, dui)); // we default to latest standard internally
+    dui.std = "c++99";
+    ASSERT_EQUALS("", preprocess(code, dui));
+    dui.std = "gnu99";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void strict_ansi_1()
@@ -2983,6 +3010,7 @@ static void stdcVersionDefine()
                         "  __STDC_VERSION__\n"
                         "#endif\n";
     simplecpp::DUI dui;
+    ASSERT_EQUALS("", preprocess(code, dui));
     dui.std = "c11";
     ASSERT_EQUALS("\n201112L", preprocess(code, dui));
 }
@@ -2993,6 +3021,7 @@ static void cpluscplusDefine()
                         "  __cplusplus\n"
                         "#endif\n";
     simplecpp::DUI dui;
+    ASSERT_EQUALS("", preprocess(code, dui));
     dui.std = "c++11";
     ASSERT_EQUALS("\n201103L", preprocess(code, dui));
 }