added TokenList::Stream class to wrap std::istream usage and implemented alternative C I/O version (#244)

Author: firewave

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          '*,-abseil-*,-altera-*,-android-*,-cert-*,-cppcoreguidelines-*,-fuchsia-*,-google-*,-hicpp-*,-linuxkernel-*,-llvm-*,-llvmlibc-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-use-default-member-init,-modernize-use-using,-readability-braces-around-statements,-readability-function-size,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-magic-numbers,-readability-simplify-boolean-expr,-readability-uppercase-literal-suffix,-modernize-use-auto,-modernize-use-trailing-return-type,-bugprone-branch-clone,-modernize-pass-by-value,-modernize-loop-convert,-modernize-use-emplace,-modernize-use-equals-default,-performance-noexcept-move-constructor,-modernize-use-equals-delete,-readability-identifier-length,-readability-function-cognitive-complexity,-modernize-return-braced-init-list,-misc-no-recursion,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-concurrency-mt-unsafe,-modernize-loop-convert,-clang-analyzer-core.NullDereference,-performance-move-constructor-init,-performance-inefficient-string-concatenation,-performance-no-automatic-move'
+Checks:          '*,-abseil-*,-altera-*,-android-*,-cert-*,-cppcoreguidelines-*,-fuchsia-*,-google-*,-hicpp-*,-linuxkernel-*,-llvm-*,-llvmlibc-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-use-default-member-init,-modernize-use-using,-readability-braces-around-statements,-readability-function-size,-readability-implicit-bool-conversion,-readability-isolate-declaration,-readability-magic-numbers,-readability-simplify-boolean-expr,-readability-uppercase-literal-suffix,-modernize-use-auto,-modernize-use-trailing-return-type,-bugprone-branch-clone,-modernize-pass-by-value,-modernize-loop-convert,-modernize-use-emplace,-modernize-use-equals-default,-performance-noexcept-move-constructor,-modernize-use-equals-delete,-readability-identifier-length,-readability-function-cognitive-complexity,-modernize-return-braced-init-list,-misc-no-recursion,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-concurrency-mt-unsafe,-modernize-loop-convert,-clang-analyzer-core.NullDereference,-performance-move-constructor-init,-performance-inefficient-string-concatenation,-performance-no-automatic-move,-modernize-use-override'
 HeaderFilterRegex: '.*'
 WarningsAsErrors: '*'
 CheckOptions:

CMakeLists.txt

@@ -10,9 +10,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 -Wno-four-char-constants)
+    # 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 -Wno-shadow-field-in-constructor)
 

main.cpp

@@ -25,9 +25,10 @@
 int main(int argc, char **argv)
 {
     bool error = false;
+    const char *filename = nullptr;
+    bool use_istream = false;
 
     // Settings..
-    const char *filename = nullptr;
     simplecpp::DUI dui;
     bool quiet = false;
     for (int i = 1; i < argc; i++) {
@@ -54,6 +55,10 @@ int main(int argc, char **argv)
                     dui.includes.push_back(arg+9);
                     found = true;
                 }
+                else if (std::strncmp(arg, "-is",3)==0) {
+                    use_istream = true;
+                    found = true;
+                }
                 break;
             case 's':
                 if (std::strncmp(arg, "-std=",5)==0) {
@@ -87,20 +92,29 @@ int main(int argc, char **argv)
         std::cout << "  -UNAME          Undefine NAME." << std::endl;
         std::cout << "  -std=STD        Specify standard." << std::endl;
         std::cout << "  -q              Quiet mode (no output)." << std::endl;
+        std::cout << "  -is             Use std::istream interface." << std::endl;
         std::exit(0);
     }
 
     // Perform preprocessing
     simplecpp::OutputList outputList;
     std::vector<std::string> files;
-    std::ifstream f(filename);
-    simplecpp::TokenList rawtokens(f,files,filename,&outputList);
-    rawtokens.removeComments();
-    std::map<std::string, simplecpp::TokenList*> included = simplecpp::load(rawtokens, files, dui, &outputList);
+    simplecpp::TokenList *rawtokens;
+    if (use_istream) {
+        std::ifstream f(filename);
+        rawtokens = new simplecpp::TokenList(f, files,filename,&outputList);
+    }
+    else {
+        rawtokens = new simplecpp::TokenList(filename,files,&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)
         i.second->removeComments();
     simplecpp::TokenList outputTokens(files);
-    simplecpp::preprocess(outputTokens, rawtokens, files, included, dui, &outputList);
+    simplecpp::preprocess(outputTokens, *rawtokens, files, included, dui, &outputList);
+    delete rawtokens;
+    rawtokens = nullptr;
 
     // Output
     if (!quiet) {