Refactoring: tokens_back and TypeSize are no longer global variables

CheckBufferOverrun.cpp

@@ -341,7 +341,7 @@ void CheckBufferOverrunClass::CheckBufferOverrun_LocalVariable()
                 continue;
             }
 
-            int total_size = size * Tokenizer::SizeOfType(type);
+            int total_size = size * _tokenizer->SizeOfType(type);
             if (total_size == 0)
                 continue;
 
@@ -397,7 +397,7 @@ void CheckBufferOverrunClass::CheckBufferOverrun_StructVariable()
             const char *varname[3] = {0,0,0};
             varname[1] = Tokenizer::getstr(tok2, ivar);
             int arrsize = atoi(Tokenizer::getstr(tok2, ivar+2));
-            int total_size = arrsize * Tokenizer::SizeOfType(tok2->next->str);
+            int total_size = arrsize * _tokenizer->SizeOfType(tok2->next->str);
             if (total_size == 0)
                 continue;
 

main.cpp

@@ -165,7 +165,6 @@ static void CppCheck(const std::string &code, const char FileName[], unsigned in
     OnlyReportUniqueErrors = true;
 
     // Tokenize the file
-    tokens = tokens_back = NULL;
     Files.clear();
     {
     std::istringstream istr(code);

testbufferoverrun.cpp

@@ -38,9 +38,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         tokenizer.SimplifyTokenList();
 

testcharvar.cpp

@@ -44,9 +44,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
 
         // Fill function list

testconstructors.cpp

@@ -36,9 +36,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         tokenizer.SimplifyTokenList();
 

testdivision.cpp

@@ -40,9 +40,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         //SimplifyTokenList();  <- this can't be used as it removes 'unsigned'
 

testincompletestatement.cpp

@@ -38,9 +38,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         tokenizer.SimplifyTokenList();
 

testmemleak.cpp

@@ -39,9 +39,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         tokenizer.SimplifyTokenList();
 

testtokenize.cpp

@@ -59,9 +59,8 @@ private:
                                 "            \"def\"\n";
 
         // tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(filedata);
         Tokenizer tokenizer;
+        std::istringstream istr(filedata);
         tokenizer.TokenizeCode(istr, 0);
 
         // Expected result..
@@ -85,9 +84,8 @@ private:
         std::string filedata(10000,'a');
 
         // tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(filedata);
         Tokenizer tokenizer;
+        std::istringstream istr(filedata);
         tokenizer.TokenizeCode(istr, 0);
 
         // Expected result..
@@ -109,9 +107,8 @@ private:
                                 "}\n";
 
         // tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(filedata);
         Tokenizer tokenizer;
+        std::istringstream istr(filedata);
         tokenizer.TokenizeCode(istr, 0);
 
         // Expected result..

testunusedprivfunc.cpp

@@ -45,9 +45,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
 
         // Clear the error buffer..

testunusedvar.cpp

@@ -38,9 +38,8 @@ private:
     void check( const char code[] )
     {
         // Tokenize..
-        tokens = tokens_back = NULL;
-        std::istringstream istr(code);
         Tokenizer tokenizer;
+        std::istringstream istr(code);
         tokenizer.TokenizeCode( istr );
         tokenizer.SimplifyTokenList();
 

tokenize.cpp

@@ -25,7 +25,7 @@
 #include <locale>
 #include <fstream>
 
-#include <map>
+
 #include <string>
 #include <cstring>
 
@@ -60,12 +60,20 @@ TOKEN *Tokenizer::_gettok(TOKEN *tok, int index)
 //---------------------------------------------------------------------------
 
 std::vector<std::string> Files;
-TOKEN *tokens, *tokens_back;
+TOKEN *tokens;
 
 //---------------------------------------------------------------------------
 
+Tokenizer::Tokenizer()
+{
+    tokens = 0;
+    tokens_back = 0;
+}
 
+Tokenizer::~Tokenizer()
+{
 
+}
 
 //---------------------------------------------------------------------------
 // Defined symbols.
@@ -211,7 +219,7 @@ void Tokenizer::combine_2tokens(TOKEN *tok, const char str1[], const char str2[]
 // SizeOfType - gives the size of a type
 //---------------------------------------------------------------------------
 
-std::map<std::string, unsigned int> TypeSize;
+
 
 int Tokenizer::SizeOfType(const char type[])
 {

tokenize.h

@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include <string>
+#include <map>
 #include <vector>
 #include <cstdlib>
 #include <cstring>
@@ -65,6 +66,8 @@ extern TOKEN *tokens, *tokens_back;
 class Tokenizer
 {
 public:
+    Tokenizer();
+    ~Tokenizer();
 
     void Tokenize(std::istream &code, const char FileName[]);
 
@@ -83,27 +86,32 @@ public:
     static const char *getstr(const TOKEN *tok, int index);
 
     // Return size.
-    static int SizeOfType(const char type[]);
+    int SizeOfType(const char type[]);
+
+    void initTokens();
 
     std::vector<std::string> _files;
     TOKEN *_tokens;
-    TOKEN *_tokens_back;
+
 private:
 
 
 
 
-    static void Define(const char Name[], const char Value[]);
+    void Define(const char Name[], const char Value[]);
 
-    static void addtoken(const char str[], const unsigned int lineno, const unsigned int fileno);
+    void addtoken(const char str[], const unsigned int lineno, const unsigned int fileno);
 
-    static void combine_2tokens(TOKEN *tok, const char str1[], const char str2[]);
+    void combine_2tokens(TOKEN *tok, const char str1[], const char str2[]);
 
-    static void DeleteNextToken(TOKEN *tok);
+    void DeleteNextToken(TOKEN *tok);
 
-    static TOKEN *_gettok(TOKEN *tok, int index);
+    TOKEN *_gettok(TOKEN *tok, int index);
 
-    static void InsertTokens(TOKEN *dest, TOKEN *src, unsigned int n);
+    void InsertTokens(TOKEN *dest, TOKEN *src, unsigned int n);
+
+    TOKEN *tokens_back;
+    std::map<std::string, unsigned int> TypeSize;
 };