s

Author: firewave

test/testsimplifytemplate.cpp

@@ -308,7 +308,8 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], bool debugwarnings = false, Platform::Type type = Platform::Type::Native) {
+    template<size_t size>
+    std::string tok_(const char* file, int line, const char (&code)[size], bool debugwarnings = false, Platform::Type type = Platform::Type::Native) {
         const Settings settings1 = settingsBuilder(settings).library("std.cfg").debugwarnings(debugwarnings).platform(type).build();
         SimpleTokenizer tokenizer(settings1, *this);
 
@@ -5774,7 +5775,8 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
 #define instantiateMatch(code, numberOfArguments, patternAfter) instantiateMatch_(code, numberOfArguments, patternAfter, __FILE__, __LINE__)
-    bool instantiateMatch_(const char code[], const std::size_t numberOfArguments, const char patternAfter[], const char* file, int line) {
+    template<size_t size>
+    bool instantiateMatch_(const char (&code)[size], const std::size_t numberOfArguments, const char patternAfter[], const char* file, int line) {
         SimpleTokenizer tokenizer(settings, *this);
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);

test/testtoken.cpp

@@ -137,11 +137,13 @@ class TestToken : public TestFixture {
     }
 
 #define MatchCheck(...) MatchCheck_(__FILE__, __LINE__, __VA_ARGS__)
-    bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern, unsigned int varid = 0) {
+    template<size_t size>
+    bool MatchCheck_(const char* file, int line, const char (&code)[size], const std::string& pattern, unsigned int varid = 0) {
         SimpleTokenizer tokenizer(settingsDefault, *this);
         const std::string code2 = ";" + code + ";";
         try {
-            ASSERT_LOC(tokenizer.tokenize(code2.c_str()), file, line);
+            std::stringstream istr(code2);
+            ASSERT_LOC(tokenizer.tokenize(istr), file, line);
         } catch (...) {}
         return Token::Match(tokenizer.tokens()->next(), pattern.c_str(), varid);
     }