Ready for Release 0.35.1

Author: cpp-tutor

README.md

@@ -78,6 +78,8 @@ Windows needs Internet Information Services (IIS) Manager to be enabled and set
 
 Note that inputs to the running program have to be entered into the text field bottom-right **before** the program is run, these being separated by commas. Also the user is prompted to clear the output window when it is full. These are the only significant differences to running the Javascript in a console window.
 
+![Screenshot](https://raw.githubusercontent.com/cpp-tutor/pseudocode-compiler/main/screenshot.png)
+
 ## License
 
 This software is released under the highly permissive MIT License. If you do modify or improve parts of this software, especially the web front-end, I hope you would want to share your efforts, but this is not a requirement.

Tree.hpp

@@ -12,6 +12,9 @@ class Tree {
         return right = next;
     }
     virtual void emit() = 0;
+    static void setOutput(std::ostream *os) {
+        Output::out = os;
+    }
 protected:
     Tree *left{ nullptr }, *right{ nullptr };
     class Indenter {
@@ -25,7 +28,18 @@ class Tree {
         friend inline std::ostream& operator<<(std::ostream&, const Indenter&);
     };
     inline static Indenter indent{};
-    inline static std::ostream& output = std::cout;
+    class Output {
+        inline static std::ostream *out = nullptr;
+        friend void Tree::setOutput(std::ostream  *os);
+    public:
+        Output() = default;
+        Output(std::ostream *os) { out = os; }
+        template<typename T>
+        std::ostream& operator<<(const T& v) {
+            return *out << v;
+        }
+    };
+    inline static Output output{};
 public:
     friend inline std::ostream& operator<<(std::ostream&, const Tree::Indenter&);
 };

main.cpp

@@ -120,31 +120,33 @@ int main(const int argc, const char *argv[]) {
         }
     }
     if (infile && *infile) {
-        std::cin.rdbuf(infile->rdbuf());
         if (args.size() == 1) {
             std::string outfilename{ args.front() };
             outfile = new std::ofstream{ outfilename.replace(outfilename.find('.'), std::string::npos, ".js") };
         }
         else if (args.size() == 2) {
             outfile = new std::ofstream{ args.back() };
         }
-        if (outfile && *outfile) {
-            std::cout.rdbuf(outfile->rdbuf());
-        }
         else if (!cgi_program) {
             std::cerr << "Error: could not open file for writing: " << args.back() << '\n';
             return returncode;
         }
     }
-    yy::Lexer scanner{};
+    yy::Lexer scanner{ (infile && *infile) ? infile : &std::cin, &std::cerr };
     Symbol table{};
     Decls start{ &table };
     yy::Parser parser{ &scanner, &table, &start, &error_stream };
+    Tree::setOutput((outfile && *outfile) ? outfile : &std::cout);
 
     try {
         if (!parser.parse()) {
             if (support_nodejs) {
-                std::cout << support_nodejs_code;
+                if (outfile && *outfile) {
+                    *outfile << support_nodejs_code;
+                }
+                else {
+                    std::cout << support_nodejs_code;
+                }
             }
             start.emit();
             returncode = 0;
@@ -169,5 +171,7 @@ int main(const int argc, const char *argv[]) {
             std::cerr << error_stream.str();
         }
     }
+    delete infile;
+    delete outfile;
     return returncode;
 }