made some function names more descriptive

firewave · firewave · commit 6e5d3385a15b · 2025-09-13T08:20:59.000+02:00
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
@@ -68,7 +68,7 @@ class CppcheckExecutor : public ErrorLogger {
 
     template<std::size_t size>
     void run(const char (&code)[size]) {
-        cppcheck.check(FileWithDetails("test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const uint8_t*>(code), size-1);
+        cppcheck.checkBuffer(FileWithDetails("test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const uint8_t*>(code), size-1);
     }
 
     void reportOut(const std::string & /*outmsg*/, Color /*c*/) override {}
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -732,7 +732,7 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
     {
         const std::string code_s = code.toStdString();
         // TODO: apply enforcedLanguage?
-        cppcheck.check(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), reinterpret_cast<const std::uint8_t*>(code_s.data()), code_s.size());
+        cppcheck.checkBuffer(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), reinterpret_cast<const std::uint8_t*>(code_s.data()), code_s.size());
     }
     analysisDone();
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -799,7 +799,7 @@ unsigned int CppCheck::check(const FileWithDetails &file)
     return returnValue;
 }
 
-unsigned int CppCheck::check(const FileWithDetails &file, const uint8_t* data, std::size_t size)
+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const uint8_t* data, std::size_t size)
 {
     return checkBuffer(file, "", 0, data, size);
 }
@@ -1077,7 +1077,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                     code += "#line " + std::to_string(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
             }
             TokenList tokenlist(mSettings, file.lang());
-            tokenlist.createTokens(code.data(), code.size()); // TODO: check result?
+            tokenlist.createTokensFromBuffer(code.data(), code.size()); // TODO: check result?
             executeRules("define", tokenlist);
         }
 #endif
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -109,7 +109,11 @@ class CPPCHECKLIB CppCheck {
      * @note You must set settings before calling this function (by calling
      *  settings()).
      */
-    unsigned int check(const FileWithDetails &file, const uint8_t* data, std::size_t size);
+    unsigned int checkBuffer(const FileWithDetails &file, const uint8_t* data, std::size_t size);
+
+    unsigned int checkString(const FileWithDetails &file, const std::string& data) {
+        return checkBuffer(file, reinterpret_cast<const uint8_t*>(data.data()), data.size());
+    }
 
     /**
      * @brief Returns current version number as a string.
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -533,7 +533,7 @@ namespace {
             // TODO: improve evaluation
             const Settings s;
             TokenList tokenlist(s, Standards::Language::C);
-            tokenlist.createTokens(c.data(), c.size()); // TODO: check result
+            tokenlist.createTokensFromBuffer(c.data(), c.size()); // TODO: check result
             // TODO: put in a helper
             // generate links
             {
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -178,7 +178,7 @@ static std::vector<std::string> getnames(const char *names)
 static void gettokenlistfromvalid(const std::string& valid, TokenList& tokenList)
 {
     const std::string str(valid + ',');
-    tokenList.createTokens(str.data(), str.size()); // TODO: check result?
+    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
     for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
         if (Token::Match(tok,"- %num%")) {
             tok->str("-" + tok->strAt(1));
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -1822,7 +1822,7 @@ static std::shared_ptr<Token> createTokenFromExpression(const std::string& retur
     std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
     {
         const std::string code = "return " + returnValue + ";";
-        if (!tokenList->createTokens(code.data(), code.size()))
+        if (!tokenList->createTokensFromBuffer(code.data(), code.size()))
             return nullptr;
     }
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -7757,7 +7757,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                     ValueType valuetype;
                     TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
                     const std::string str(typestr+";");
-                    tokenList.createTokens(str.data(), str.size()); // TODO: check result?
+                    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
                     tokenList.simplifyStdType();
                     if (parsedecl(tokenList.front(), &valuetype, mDefaultSignedness, mSettings)) {
                         valuetype.originalTypeName = typestr;
@@ -7847,7 +7847,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 }
                 TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
                 const std::string str(typestr+";");
-                if (tokenList.createTokens(str.data(), str.size())) {
+                if (tokenList.createTokensFromBuffer(str.data(), str.size())) {
                     ValueType vt;
                     tokenList.simplifyPlatformTypes();
                     tokenList.simplifyStdType();
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -321,14 +321,14 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokens(const uint8_t* data, size_t size)
+bool TokenList::createTokensFromBuffer(const uint8_t* data, size_t size)
 {
-    return createTokensInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());
+    return createTokensFromBufferInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());
 }
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokensInternal(const std::string& file0)
+bool TokenList::createTokensFromFileInternal(const std::string& file0)
 {
     simplecpp::OutputList outputList;
     simplecpp::TokenList tokens(file0, mFiles, &outputList);
@@ -340,7 +340,7 @@ bool TokenList::createTokensInternal(const std::string& file0)
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokensInternal(const uint8_t* data, size_t size, const std::string& file0)
+bool TokenList::createTokensFromBufferInternal(const uint8_t* data, size_t size, const std::string& file0)
 {
     simplecpp::OutputList outputList;
     simplecpp::TokenList tokens(data, size, mFiles, file0, &outputList);
diff --git a/lib/tokenlist.h b/lib/tokenlist.h
@@ -99,13 +99,13 @@ class CPPCHECKLIB TokenList {
      * - UTF in the code are not handled.
      * - comments are not handled.
      */
-    bool createTokens(const uint8_t* data, size_t size);
-    bool createTokens(const char* data, size_t size) {
-        return createTokens(reinterpret_cast<const uint8_t*>(data), size);
+    bool createTokensFromBuffer(const uint8_t* data, size_t size);
+    bool createTokensFromBuffer(const char* data, size_t size) {
+        return createTokensFromBuffer(reinterpret_cast<const uint8_t*>(data), size);
     }
     template<size_t size>
-    bool createTokens(const char (&data)[size]) {
-        return createTokens(reinterpret_cast<const uint8_t*>(data), size-1);
+    bool createTokensFromString(const char (&data)[size]) {
+        return createTokensFromBuffer(reinterpret_cast<const uint8_t*>(data), size-1);
     }
 
     void createTokens(simplecpp::TokenList&& tokenList);
@@ -214,8 +214,8 @@ class CPPCHECKLIB TokenList {
     }
 
 private:
-    bool createTokensInternal(const std::string& file0);
-    bool createTokensInternal(const uint8_t* data, std::size_t size, const std::string& file0);
+    bool createTokensFromFileInternal(const std::string& file0);
+    bool createTokensFromBufferInternal(const uint8_t* data, std::size_t size, const std::string& file0);
 
     /** Token list */
     std::shared_ptr<TokensFrontBack> mTokensFrontBack;
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -1996,7 +1996,7 @@ static bool isNotEqual(std::pair<const Token*, const Token*> x, std::pair<const
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const std::string& y, bool cpp, const Settings& settings)
 {
     TokenList tokenList(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
-    tokenList.createTokens(y.data(), y.size()); // TODO: check result?
+    tokenList.createTokensFromBuffer(y.data(), y.size()); // TODO: check result?
     return isNotEqual(x, std::make_pair(tokenList.front(), tokenList.back()));
 }
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const ValueType* y, bool cpp, const Settings& settings)
@@ -7116,7 +7116,7 @@ static bool getMinMaxValues(const std::string& typestr,
 {
     TokenList typeTokens(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
     const std::string str(typestr + ";");
-    if (!typeTokens.createTokens(str.data(), str.size()))
+    if (!typeTokens.createTokensFromBuffer(str.data(), str.size()))
         return false;
     typeTokens.simplifyPlatformTypes();
     typeTokens.simplifyStdType();
diff --git a/oss-fuzz/main.cpp b/oss-fuzz/main.cpp
@@ -64,7 +64,7 @@ static void doCheck(const uint8_t *data, size_t dataSize)
 {
     Suppressions supprs;
     CppCheck cppcheck(s_settings, supprs, s_errorLogger, false, nullptr);
-    cppcheck.check(s_file, data, dataSize);
+    cppcheck.checkBuffer(s_file, data, dataSize);
 }
 
 #ifndef NO_FUZZ
diff --git a/test/helpers.h b/test/helpers.h
@@ -90,7 +90,7 @@ class SimpleTokenizer : public Tokenizer {
         if (list.front())
             throw std::runtime_error("token list is not empty");
         list.appendFileIfNew(filename);
-        if (!list.createTokens(code, size))
+        if (!list.createTokensFromBuffer(code, size))
             return false;
 
         return simplifyTokens1("");
@@ -107,7 +107,7 @@ class SimpleTokenList
     explicit SimpleTokenList(const char (&code)[size], Standards::Language lang = Standards::Language::CPP)
         : list{settings, lang}
     {
-        if (!list.createTokens(code, size-1))
+        if (!list.createTokensFromBuffer(code, size-1))
             throw std::runtime_error("creating tokens failed");
     }
 
@@ -116,7 +116,7 @@ class SimpleTokenList
         : list{settings, lang}
     {
         list.appendFileIfNew(file0);
-        if (!list.createTokens(code, size-1))
+        if (!list.createTokensFromBuffer(code, size-1))
             throw std::runtime_error("creating tokens failed");
     }
 
@@ -278,17 +278,17 @@ class SimpleTokenizer2 : public Tokenizer {
 struct TokenListHelper
 {
     template<size_t size>
-    static bool createTokens(TokenList& tokenlist, const char (&code)[size], const std::string& file)
+    static bool createTokensFromString(TokenList& tokenlist, const char (&code)[size], const std::string& file)
     {
-        return createTokens(tokenlist, code, size-1, file);
+        return createTokensFromBuffer(tokenlist, code, size-1, file);
     }
 
-    static bool createTokens(TokenList& tokenlist, const char* data, size_t size, const std::string& file)
+    static bool createTokensFromBuffer(TokenList& tokenlist, const char* data, size_t size, const std::string& file)
     {
         if (tokenlist.front())
             throw std::runtime_error("token list is not empty");
         tokenlist.appendFileIfNew(file);
-        return tokenlist.createTokens(data, size);
+        return tokenlist.createTokensFromBuffer(data, size);
     }
 };
 
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -155,7 +155,7 @@ class TestLibrary : public TestFixture {
 
         TokenList tokenList(settingsDefault, Standards::Language::CPP);
         const char code[] = "foo();"; // <- too few arguments, not library function
-        ASSERT(tokenList.createTokens(code));
+        ASSERT(tokenList.createTokensFromString(code));
         Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
         tokenList.createAst();
 
@@ -179,7 +179,7 @@ class TestLibrary : public TestFixture {
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
             const char code[] = "foo();"; // <- too few arguments, not library function
-            ASSERT(tokenList.createTokens(code));
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -188,7 +188,7 @@ class TestLibrary : public TestFixture {
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
             const char code[] = "foo(a);"; // <- library function
-            ASSERT(tokenList.createTokens(code));
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -199,7 +199,7 @@ class TestLibrary : public TestFixture {
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
             const char code[] = "foo(a, b);"; // <- library function
-            ASSERT(tokenList.createTokens(code));
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -210,7 +210,7 @@ class TestLibrary : public TestFixture {
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
             const char code[] = "foo(a, b, c);"; // <- too much arguments, not library function
-            ASSERT(tokenList.createTokens(code));
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -5459,7 +5459,7 @@ class TestSimplifyTemplate : public TestFixture {
     unsigned int templateParameters(const char (&data)[size]) {
         TokenList tokenlist{settings, Standards::Language::CPP};
         tokenlist.appendFileIfNew("test.cpp");
-        if (!tokenlist.createTokens(data, size-1))
+        if (!tokenlist.createTokensFromBuffer(data, size-1))
             return false;
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -5529,7 +5529,7 @@ class TestSimplifyTemplate : public TestFixture {
         TokenList tokenlist{settings, Standards::Language::CPP};
 
         tokenlist.appendFileIfNew("test.cpp");
-        if (!tokenlist.createTokens(data, size-1))
+        if (!tokenlist.createTokensFromBuffer(data, size-1))
             return false;
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -5600,7 +5600,7 @@ class TestSimplifyTemplate : public TestFixture {
     template<size_t size>
     bool findTemplateDeclarationEndHelper(const char (&data)[size], const char pattern[], unsigned offset = 0) {
         TokenList tokenlist{settings, Standards::Language::CPP};
-        if (!TokenListHelper::createTokens(tokenlist, data, size-1, "test.cpp"))
+        if (!TokenListHelper::createTokensFromBuffer(tokenlist, data, size-1, "test.cpp"))
             return false;
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -5631,7 +5631,7 @@ class TestSimplifyTemplate : public TestFixture {
     bool getTemplateParametersInDeclarationHelper(const char (&data)[size], const std::vector<std::string> & params) {
         TokenList tokenlist{settings, Standards::Language::CPP};
 
-        if (!TokenListHelper::createTokens(tokenlist, data, size-1, "test.cpp"))
+        if (!TokenListHelper::createTokensFromBuffer(tokenlist, data, size-1, "test.cpp"))
             return false;
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -279,7 +279,7 @@ class TestSimplifyTypedef : public TestFixture {
     template<size_t size>
     std::string simplifyTypedef(const char (&data)[size]) {
         TokenList tokenlist{settings1, Standards::Language::CPP};
-        if (!tokenlist.createTokens(data, size-1))
+        if (!tokenlist.createTokensFromBuffer(data, size-1))
             return "";
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -314,7 +314,7 @@ class TestSimplifyTypedef : public TestFixture {
     std::string simplifyTypedefC(const char (&data)[size]) {
         TokenList tokenlist{settings1, Standards::Language::C};
 
-        if (!TokenListHelper::createTokens(tokenlist, data, size-1, "file.c"))
+        if (!TokenListHelper::createTokensFromBuffer(tokenlist, data, size-1, "file.c"))
             return "";
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -330,7 +330,7 @@ class TestSimplifyTypedef : public TestFixture {
     template<size_t size>
     std::string dumpTypedefInfo(const char (&code)[size]) {
         TokenList tokenlist{settings1, Standards::Language::C};
-        if (!TokenListHelper::createTokens(tokenlist, code, size-1, "file.c"))
+        if (!TokenListHelper::createTokensFromBuffer(tokenlist, code, size-1, "file.c"))
             return {};
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
@@ -4457,7 +4457,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void test(rFunctionPointer_fp functionPointer);";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        ASSERT(TokenListHelper::createTokens(tokenlist, code, "file.c"));
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
@@ -4499,7 +4499,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "}";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        ASSERT(TokenListHelper::createTokens(tokenlist, code, "file.c"));
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
@@ -4517,7 +4517,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "}";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        ASSERT(TokenListHelper::createTokens(tokenlist, code, "file.c"));
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
         Tokenizer tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
@@ -1252,7 +1252,7 @@ class TestSuppressions : public TestFixture {
         CppCheck cppCheck(settings, supprs, *this, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
 
         const char code[] = "int f() { int a; return a; }";
-        ASSERT_EQUALS(0, cppCheck.check(FileWithDetails("test.c", Standards::Language::C, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code))); // <- no unsuppressed error is seen
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code))); // <- no unsuppressed error is seen
         ASSERT_EQUALS("[test.c:1:25]: (error) Uninitialized variable: a [uninitvar]\n", errout_str()); // <- report error so ThreadExecutor can suppress it and make sure the global suppression is matched.
     }
 
@@ -1296,7 +1296,7 @@ class TestSuppressions : public TestFixture {
             "    int y;\n"
             "};";
         CppCheck cppCheck(settings, supprs, *this, true, nullptr);
-        ASSERT_EQUALS(0, cppCheck.check(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code)));
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const std::uint8_t*>(code), sizeof(code)));
         ASSERT_EQUALS("",errout_str());
     }
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class CppcheckExecutor : public ErrorLogger {`
`68`	`68`
`69`	`69`	`template<std::size_t size>`
`70`	`70`	`void run(const char (&code)[size]) {`
`71`		`- cppcheck.check(FileWithDetails("test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const uint8_t*>(code), size-1);`
	`71`	`+ cppcheck.checkBuffer(FileWithDetails("test.cpp", Standards::Language::CPP, 0), reinterpret_cast<const uint8_t*>(code), size-1);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void reportOut(const std::string & /outmsg/, Color /c/) override {}`
Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)`
`732`	`732`	`{`
`733`	`733`	`const std::string code_s = code.toStdString();`
`734`	`734`	`// TODO: apply enforcedLanguage?`
`735`		`- cppcheck.check(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), reinterpret_cast<const std::uint8_t*>(code_s.data()), code_s.size());`
	`735`	`+ cppcheck.checkBuffer(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), reinterpret_cast<const std::uint8_t*>(code_s.data()), code_s.size());`
`736`	`736`	`}`
`737`	`737`	`analysisDone();`
`738`	`738`
Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,7 @@ unsigned int CppCheck::check(const FileWithDetails &file)`
`799`	`799`	`return returnValue;`
`800`	`800`	`}`
`801`	`801`
`802`		`-unsigned int CppCheck::check(const FileWithDetails &file, const uint8_t* data, std::size_t size)`
	`802`	`+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const uint8_t* data, std::size_t size)`
`803`	`803`	`{`
`804`	`804`	`return checkBuffer(file, "", 0, data, size);`
`805`	`805`	`}`
`@@ -1077,7 +1077,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str`
`1077`	`1077`	`code += "#line " + std::to_string(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';`
`1078`	`1078`	`}`
`1079`	`1079`	`TokenList tokenlist(mSettings, file.lang());`
`1080`		`- tokenlist.createTokens(code.data(), code.size()); // TODO: check result?`
	`1080`	`+ tokenlist.createTokensFromBuffer(code.data(), code.size()); // TODO: check result?`
`1081`	`1081`	`executeRules("define", tokenlist);`
`1082`	`1082`	`}`
`1083`	`1083`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ namespace {`
`533`	`533`	`// TODO: improve evaluation`
`534`	`534`	`const Settings s;`
`535`	`535`	`TokenList tokenlist(s, Standards::Language::C);`
`536`		`- tokenlist.createTokens(c.data(), c.size()); // TODO: check result`
	`536`	`+ tokenlist.createTokensFromBuffer(c.data(), c.size()); // TODO: check result`
`537`	`537`	`// TODO: put in a helper`
`538`	`538`	`// generate links`
`539`	`539`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ static std::vector<std::string> getnames(const char *names)`
`178`	`178`	`static void gettokenlistfromvalid(const std::string& valid, TokenList& tokenList)`
`179`	`179`	`{`
`180`	`180`	`const std::string str(valid + ',');`
`181`		`- tokenList.createTokens(str.data(), str.size()); // TODO: check result?`
	`181`	`+ tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?`
`182`	`182`	`for (Token *tok = tokenList.front(); tok; tok = tok->next()) {`
`183`	`183`	`if (Token::Match(tok,"- %num%")) {`
`184`	`184`	`tok->str("-" + tok->strAt(1));`
Original file line number	Diff line number	Diff line change
`@@ -1822,7 +1822,7 @@ static std::shared_ptr<Token> createTokenFromExpression(const std::string& retur`
`1822`	`1822`	`std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings, cpp ? Standards::Language::CPP : Standards::Language::C);`
`1823`	`1823`	`{`
`1824`	`1824`	`const std::string code = "return " + returnValue + ";";`
`1825`		`- if (!tokenList->createTokens(code.data(), code.size()))`
	`1825`	`+ if (!tokenList->createTokensFromBuffer(code.data(), code.size()))`
`1826`	`1826`	`return nullptr;`
`1827`	`1827`	`}`
`1828`	`1828`
Original file line number	Diff line number	Diff line change
`@@ -321,14 +321,14 @@ void TokenList::insertTokens(Token dest, const Token src, nonneg int n)`
`321`	`321`
`322`	`322`	`//---------------------------------------------------------------------------`
`323`	`323`
`324`		`-bool TokenList::createTokens(const uint8_t* data, size_t size)`
	`324`	`+bool TokenList::createTokensFromBuffer(const uint8_t* data, size_t size)`
`325`	`325`	`{`
`326`		`- return createTokensInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());`
	`326`	`+ return createTokensFromBufferInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`//---------------------------------------------------------------------------`
`330`	`330`
`331`		`-bool TokenList::createTokensInternal(const std::string& file0)`
	`331`	`+bool TokenList::createTokensFromFileInternal(const std::string& file0)`
`332`	`332`	`{`
`333`	`333`	`simplecpp::OutputList outputList;`
`334`	`334`	`simplecpp::TokenList tokens(file0, mFiles, &outputList);`
`@@ -340,7 +340,7 @@ bool TokenList::createTokensInternal(const std::string& file0)`
`340`	`340`
`341`	`341`	`//---------------------------------------------------------------------------`
`342`	`342`
`343`		`-bool TokenList::createTokensInternal(const uint8_t* data, size_t size, const std::string& file0)`
	`343`	`+bool TokenList::createTokensFromBufferInternal(const uint8_t* data, size_t size, const std::string& file0)`
`344`	`344`	`{`
`345`	`345`	`simplecpp::OutputList outputList;`
`346`	`346`	`simplecpp::TokenList tokens(data, size, mFiles, file0, &outputList);`