testrunner: pass Standards::Language to SimpleTokenList

Author: firewave

test/helpers.h

@@ -20,6 +20,7 @@
 #define helpersH
 
 #include "settings.h"
+#include "standards.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
@@ -64,10 +65,10 @@ class SimpleTokenList
 {
 public:
 
-    explicit SimpleTokenList(const char code[], bool cpp = true)
+    explicit SimpleTokenList(const char code[], Standards::Language lang = Standards::Language::CPP)
     {
         std::istringstream iss(code);
-        if (!list.createTokens(iss, cpp ? "test.cpp" : "test.c"))
+        if (!list.createTokens(iss, lang))
             throw std::runtime_error("creating tokens failed");
     }
 

test/testtoken.cpp

@@ -562,22 +562,22 @@ class TestToken : public TestFixture {
     }
 
     void eraseTokens() const {
-        SimpleTokenList code("begin ; { this code will be removed } end", true);
+        SimpleTokenList code("begin ; { this code will be removed } end", Standards::Language::C);
         Token::eraseTokens(code.front()->next(), code.front()->tokAt(9));
         ASSERT_EQUALS("begin ; end", code.front()->stringifyList(nullptr, false));
     }
 
 
     void matchAny() const {
-        const SimpleTokenList varBitOrVar("abc|def", true);
+        const SimpleTokenList varBitOrVar("abc|def");
         ASSERT_EQUALS(true, Token::Match(varBitOrVar.front(), "%name% %or% %name%"));
 
-        const SimpleTokenList varLogOrVar("abc||def", true);
+        const SimpleTokenList varLogOrVar("abc||def");
         ASSERT_EQUALS(true, Token::Match(varLogOrVar.front(), "%name% %oror% %name%"));
     }
 
     void matchSingleChar() const {
-        const SimpleTokenList singleChar("a", true);
+        const SimpleTokenList singleChar("a");
         ASSERT_EQUALS(true, Token::Match(singleChar.front(), "[a|bc]"));
         ASSERT_EQUALS(false, Token::Match(singleChar.front(), "[d|ef]"));
 
@@ -595,7 +595,7 @@ class TestToken : public TestFixture {
         const SimpleTokenList ifSemicolon("if ;");
         ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
 
-        const SimpleTokenList ifSemicolonSomething("if ; something", true);
+        const SimpleTokenList ifSemicolonSomething("if ; something");
         ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
 
         const SimpleTokenList justElse("else");
@@ -617,7 +617,7 @@ class TestToken : public TestFixture {
         const SimpleTokenList noType1_cpp("delete");
         ASSERT_EQUALS(false, Token::Match(noType1_cpp.front(), "%type%"));
 
-        const SimpleTokenList noType1_c("delete", false);
+        const SimpleTokenList noType1_c("delete", Standards::Language::C);
         ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
 
         const SimpleTokenList noType2("void delete");

test/testtokenlist.cpp

@@ -72,7 +72,7 @@ class TestTokenList : public TestFixture {
         const char code[] = "for a int delete true";
 
         {
-            const SimpleTokenList tokenlist(code, false);
+            const SimpleTokenList tokenlist(code, Standards::Language::C);
 
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
             ASSERT_EQUALS(true, tokenlist.front()->isControlFlowKeyword());
@@ -112,7 +112,7 @@ class TestTokenList : public TestFixture {
 
         {
             const char code2[] = "_Generic"; // C11 keyword
-            const SimpleTokenList tokenlist(code2, false); // default settings use latest standard
+            const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
         }
 
@@ -133,7 +133,7 @@ class TestTokenList : public TestFixture {
 
         {
             const char code2[] = "co_return"; // C++20 keyword
-            const SimpleTokenList tokenlist(code2, false); // default settings use latest standard
+            const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }