fixes #352 - 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,11 @@ static void has_include_1()
                         "#endif";
     simplecpp::DUI dui;
     dui.includePaths.push_back(testSourceDir);
+    ASSERT_EQUALS("\n\nA", preprocess(code)); // we default to latest standard
     dui.std = "c++17";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
     dui.std = "c++14";
     ASSERT_EQUALS("", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_2()
@@ -1582,7 +1582,6 @@ static void has_include_2()
     dui.includePaths.push_back(testSourceDir);
     dui.std = "c++17";
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_3()
@@ -1601,7 +1600,6 @@ static void has_include_3()
     // Unless -I is set (preferably, we should differentiate -I and -isystem...)
     dui.includePaths.push_back(testSourceDir + "/testsuite");
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_4()
@@ -1617,7 +1615,6 @@ static void has_include_4()
     dui.std = "c++17";
     dui.includePaths.push_back(testSourceDir);
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_5()
@@ -1633,7 +1630,6 @@ static void has_include_5()
     dui.std = "c++17";
     dui.includePaths.push_back(testSourceDir);
     ASSERT_EQUALS("\n\nA", preprocess(code, dui));
-    ASSERT_EQUALS("", preprocess(code));
 }
 
 static void has_include_6()
@@ -2983,6 +2979,7 @@ static void stdcVersionDefine()
                         "  __STDC_VERSION__\n"
                         "#endif\n";
     simplecpp::DUI dui;
+    ASSERT_EQUALS("\n202311L", preprocess(code)); // we default to latest standard
     dui.std = "c11";
     ASSERT_EQUALS("\n201112L", preprocess(code, dui));
 }
@@ -2993,6 +2990,7 @@ static void cpluscplusDefine()
                         "  __cplusplus\n"
                         "#endif\n";
     simplecpp::DUI dui;
+    ASSERT_EQUALS("\n202400L", preprocess(code)); // we default to latest standard
     dui.std = "c++11";
     ASSERT_EQUALS("\n201103L", preprocess(code, dui));
 }