added simplecpp::TokenList::Stream implementation "FileStream" which uses C I/O functions

Author: firewave

CMakeLists.txt

@@ -8,9 +8,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # no need for c++98 compatibility
     add_compile_options(-Wno-c++98-compat-pedantic)
     # these are not really fixable
-    add_compile_options(-Wno-exit-time-destructors -Wno-global-constructors)
+    add_compile_options(-Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables)
     # we are not interested in these
     add_compile_options(-Wno-multichar)
+    # ignore C++11-specific warning
+    add_compile_options(-Wno-suggest-override -Wno-suggest-destructor-override)
     # TODO: fix these?
     add_compile_options(-Wno-padded -Wno-sign-conversion -Wno-implicit-int-conversion -Wno-shorten-64-to-32)
 

main.cpp

@@ -72,8 +72,8 @@ int main(int argc, char **argv)
     // Perform preprocessing
     simplecpp::OutputList outputList;
     std::vector<std::string> files;
-    std::ifstream f(filename);
-    simplecpp::TokenList rawtokens(f,files,filename,&outputList);
+    //std::ifstream f(filename);
+    simplecpp::TokenList rawtokens(files,filename,&outputList);
     rawtokens.removeComments();
     std::map<std::string, simplecpp::TokenList*> included = simplecpp::load(rawtokens, files, dui, &outputList);
     for (std::pair<std::string, simplecpp::TokenList *> i : included)

simplecpp.cpp

@@ -357,6 +357,40 @@ class StdIStream : public simplecpp::TokenList::Stream {
     std::istream &istr;
 };
 
+class FileStream : public simplecpp::TokenList::Stream {
+public:
+    FileStream(const std::string &filename)
+        : file(fopen(filename.c_str(), "rb"))
+    {
+        init();
+    }
+
+    ~FileStream() {
+        fclose(file);
+        file = nullptr;
+    }
+
+    virtual int get() {
+        lastCh = fgetc(file);
+        return lastCh;
+    }
+    virtual int peek() {
+        const int ch = get();
+        unget();
+        return ch;
+    }
+    virtual void unget() {
+        ungetc(lastCh, file);
+    }
+    virtual bool good() {
+        return lastCh != EOF;
+    }
+
+private:
+    FILE *file;
+    int lastCh;
+};
+
 simplecpp::TokenList::TokenList(std::vector<std::string> &filenames) : frontToken(nullptr), backToken(nullptr), files(filenames) {}
 
 simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
@@ -366,6 +400,13 @@ simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &fi
     readfile(stream,filename,outputList);
 }
 
+simplecpp::TokenList::TokenList(std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
+        : frontToken(nullptr), backToken(nullptr), files(filenames)
+{
+    FileStream stream(filename);
+    readfile(stream,filename,outputList);
+}
+
 simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(nullptr), backToken(nullptr), files(other.files)
 {
     *this = other;

simplecpp.h

@@ -198,6 +198,7 @@ namespace simplecpp {
 
         explicit TokenList(std::vector<std::string> &filenames);
         TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList = nullptr);
         TokenList(const TokenList &other);
 #if __cplusplus >= 201103L
         TokenList(TokenList &&other);