removed unnecessary usage of std::istringstream

Author: firewave

lib/importproject.cpp

@@ -533,8 +533,7 @@ namespace {
             // TODO: improve evaluation
             const Settings s;
             TokenList tokenlist(s, Standards::Language::C);
-            std::istringstream istr(c);
-            tokenlist.createTokens(istr); // TODO: check result
+            tokenlist.createTokens(c.data(), c.size()); // TODO: check result
             // TODO: put in a helper
             // generate links
             {

test/helpers.h

@@ -61,30 +61,36 @@ class SimpleTokenizer : public Tokenizer {
     template<size_t size>
     bool tokenize(const char (&code)[size])
     {
-        std::istringstream istr(code);
-        return tokenize(istr, std::string(list.isCPP() ? "test.cpp" : "test.c"));
+        return tokenize(code, size-1, std::string(list.isCPP() ? "test.cpp" : "test.c"));
     }
 
     bool tokenize(const std::string& code)
     {
-        std::istringstream istr(code);
-        return tokenize(istr, std::string(list.isCPP() ? "test.cpp" : "test.c"));
+        return tokenize(code.data(), code.size(), std::string(list.isCPP() ? "test.cpp" : "test.c"));
     }
 
 private:
     /**
      * Tokenize code
-     * @param istr The code as stream
+     * @param code The code
      * @param filename Indicates if the code is C++
      * @return false if source code contains syntax errors
      */
-    bool tokenize(std::istream& istr,
+    template<size_t size>
+    bool tokenize(const char (&code)[size],
+                  const std::string& filename)
+    {
+        return tokenize(code, size-1, filename);
+    }
+
+    bool tokenize(const char* code,
+                  std::size_t size,
                   const std::string& filename)
     {
         if (list.front())
             throw std::runtime_error("token list is not empty");
         list.appendFileIfNew(filename);
-        if (!list.createTokens(istr))
+        if (!list.createTokens(code, size))
             return false;
 
         return simplifyTokens1("");

test/testtokenize.cpp

@@ -910,9 +910,8 @@ class TestTokenizer : public TestFixture {
         {
             TokenList tokenlist{settings1, Standards::Language::C}; // headers are treated as C files
             const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };";
-            std::istringstream istr(code);
             tokenlist.appendFileIfNew("test.h");
-            ASSERT(tokenlist.createTokens(istr));
+            ASSERT(tokenlist.createTokens(code));
             Tokenizer tokenizer(std::move(tokenlist), *this);
             ASSERT_THROW_INTERNAL(tokenizer.simplifyTokens1(""), SYNTAX);
         }

test/testtokenlist.cpp

@@ -165,11 +165,10 @@ class TestTokenList : public TestFixture {
     }
 
     void ast1() const {
-        const std::string s = "('Release|x64' == 'Release|x64');";
+        const char code[] = "('Release|x64' == 'Release|x64');";
 
         TokenList tokenlist(settingsDefault, Standards::Language::C);
-        std::istringstream istr(s);
-        ASSERT(tokenlist.createTokens(istr));
+        ASSERT(tokenlist.createTokens(code));
         // TODO: put this logic in TokenList
         // generate links
         {