Pass options to translators

Implement enhancement #7

src/CLIOptions.hpp

@@ -0,0 +1,14 @@
+#if ! defined(YALR_CLIOPTIONS_HPP)
+#define YALR_CLIOPTIONS_HPP
+
+#include <string>
+
+struct CLIOptions {
+    std::string output_file;
+    std::string translate;
+    std::string state_file;
+    std::string input_file;
+    bool help = false;
+};
+
+#endif

src/main.cpp

@@ -1,3 +1,4 @@
+#include "CLIOptions.hpp"
 #include "parser.hpp"
 #include "analyzer.hpp"
 #include "tablegen.hpp"
@@ -22,13 +23,6 @@
 // } catch ...
 
 
-struct CLIOptions {
-    std::string output_file;
-    std::string translate;
-    std::string state_file;
-    std::string input_file;
-    bool help = false;
-};
 
 CLIOptions parse_commandline(int argc, char**argv) {
 
@@ -159,8 +153,7 @@ int main(int argc, char* argv[]) {
         const auto format = clopts.translate;
 
         if (format == "grammophone") {
-            std::ofstream code_out(outfilename, std::ios_base::out);
-            yalr::translate::grammophone(*ana_tree).output(code_out);
+            yalr::translate::grammophone().output(*ana_tree, clopts);
         } else {
             std::cerr << "Unknown format '" << format << "'\n";
             exit(1);

src/translate.cpp

@@ -1,5 +1,8 @@
 #include "translate.hpp"
 
+#include <fstream>
+#include <ios>
+
 namespace yalr::translate {
 
 void output_prod(const analyzer::production& p, std::ostream& strm) {
@@ -10,12 +13,23 @@ void output_prod(const analyzer::production& p, std::ostream& strm) {
     strm << " .\n";
 
 }
-void grammophone::output(std::ostream& strm) const {
+void grammophone::output(const analyzer::grammar& gr, CLIOptions &clopts) const {
+
+    std::string outfilename;
+    if (not clopts.output_file.empty()) {
+        outfilename = clopts.output_file;
+    } else {
+        outfilename = gr.parser_class + ".txt";
+    }
+
+    std::ofstream code_out(outfilename, std::ios_base::out);
 
-    output_prod(g.productions[g.target_prod], strm);
-    for (const auto& p : g.productions) {
-        if (p.prod_id != g.target_prod) {
-            output_prod(p, strm);
+    // grammophone uses the first production as the target
+    // So, be sure to our target out first.
+    output_prod(gr.productions[gr.target_prod], code_out);
+    for (const auto& p : gr.productions) {
+        if (p.prod_id != gr.target_prod) {
+            output_prod(p, code_out);
         }
     }
 

src/translate.hpp

@@ -2,15 +2,13 @@
 #define YALR_TRANSLATE_HPP
 
 #include "analyzer.hpp"
+#include "CLIOptions.hpp"
 
 namespace yalr::translate {
 
     struct grammophone {
-        const analyzer::grammar& g;
 
-        grammophone(const analyzer::grammar& gr) : g(gr) {};
-
-        void output(std::ostream& strm) const;
+        void output(const analyzer::grammar& gr, CLIOptions &opts) const;
     };
 
 } // namespace yalr::translate