[master] add --print-expansions command line option (#36)

src/dale/Generator/Generator.cpp

@@ -245,6 +245,7 @@ Generator::run(std::vector<const char *> *file_paths,
                int no_dale_stdlib,
                int static_mods_all,
                int enable_cto,
+               int print_expansions,
                std::vector<std::string> *shared_object_paths,
                FILE *output_file)
 {
@@ -306,9 +307,10 @@ Generator::run(std::vector<const char *> *file_paths,
     }
 
     Units units(&mr);
-    units.cto            = enable_cto;
-    units.no_common      = no_common;
-    units.no_dale_stdlib = no_dale_stdlib;
+    units.cto              = enable_cto;
+    units.no_common        = no_common;
+    units.no_dale_stdlib   = no_dale_stdlib;
+    units.print_expansions = print_expansions;
 
     Context *ctx         = NULL;
     llvm::Module *mod    = NULL;

src/dale/Generator/Generator.h

@@ -53,6 +53,7 @@ class Generator
      *  @param enable_cto Whether the module being compiled is a
      *                    compile-time-only module (equivalent to (attr
      *                    cto)).
+     *  @param print_expansions Whether to print macro expansions.
      *  @param shared_object_paths The paths to shared objects against which
      *                             the output file has to be linked
      *                             (populated by this function).
@@ -74,6 +75,7 @@ class Generator
             int no_dale_stdlib,
             int static_mods_all,
             int enable_cto,
+            int print_expansions,
             std::vector<std::string> *shared_object_paths,
             FILE *output_file);
 

src/dale/MacroProcessor/MacroProcessor.cpp

@@ -68,7 +68,7 @@ MacroProcessor::setPoolfree()
 }
 
 Node *
-MacroProcessor::parseMacroCall(Node *n, Function *macro_to_call)
+MacroProcessor::parseMacroCall_(Node *n, Function *macro_to_call)
 {
     std::vector<Node *> *lst = n->list;
 
@@ -170,6 +170,23 @@ MacroProcessor::parseMacroCall(Node *n, Function *macro_to_call)
     return result_node;
 }
 
+Node *
+MacroProcessor::parseMacroCall(Node *n, Function *macro_to_call)
+{
+    Node *result = parseMacroCall_(n, macro_to_call);
+    if (result && units->print_expansions) {
+        printf("%s:%d:%d: expansion: ",
+               n->filename,
+               n->getBeginPos()->getLineNumber(),
+               n->getBeginPos()->getColumnNumber());
+        n->print();
+        printf(" -> ");
+        result->print();
+        printf("\n");
+    }
+    return result;
+}
+
 Node *
 MacroProcessor::parsePotentialMacroCall(Node *n)
 {

src/dale/MacroProcessor/MacroProcessor.h

@@ -37,6 +37,16 @@ class MacroProcessor
 private:
     Units *units;
     Context *ctx;
+    /*! Parse a macro call.
+     *  @param n The node list.
+     *  @param macro_to_call The macro to call.
+     *
+     *  parseMacroCall is a wrapper around this function: the reason
+     *  for the split is that parseMacroCall will print the macro and
+     *  the macro expansion, if the corresponding compilation option
+     *  has been enabled and the macro was able to be expanded.
+     */
+    Node* parseMacroCall_(Node *n, Function *macro_to_call);
 
 public:
     llvm::ExecutionEngine *ee;

src/dale/Node/Node.cpp

@@ -74,20 +74,23 @@ Node::print()
 {
     if (is_token) {
         if (token->type == TokenType::StringLiteral) {
-            printf("\"%s\" ", token->str_value.c_str());
+            printf("\"%s\"", token->str_value.c_str());
         } else if (token->type == TokenType::Int
                 || token->type == TokenType::String
                 || token->type == TokenType::FloatingPoint) {
-            printf("%s ", token->str_value.c_str());
+            printf("%s", token->str_value.c_str());
         } else {
-            printf("(Unknown) ");
+            printf("(Unknown)");
         }
     } else if (is_list) {
         printf("(");
         for (std::vector<Node *>::iterator b = list->begin(),
                                            e = list->end();
                 b != e; ++b) {
             (*b)->print();
+            if ((b + 1) != e) {
+                printf(" ");
+            }
         }
         printf(")");
     } else {

src/dale/Units/Units.h

@@ -37,6 +37,8 @@ class Units
     /*! Whether the standard library (libdrt) should be imported into
      *  each new unit. */
     bool no_dale_stdlib;
+    /*! Whether macro expansions should be printed to standard output. */
+    bool print_expansions;
 
     /*! Construct a new Units object.
      *  @param mr A module reader.

src/dale/dalec.cpp

@@ -135,31 +135,33 @@ main(int argc, char **argv)
     int produce  = ASM;
     int optlevel = 0;
 
-    int produce_set     = 0;
-    int no_linking      = 0;
-    int debug           = 0;
-    int no_dale_stdlib  = 0;
-    int no_stdlib       = 0;
-    int remove_macros   = 0;
-    int no_common       = 0;
-    int static_mods_all = 0;
-    int found_sm        = 0;
-    int found_ctom      = 0;
-    int enable_cto      = 0;
-    int version         = 0;
+    int produce_set      = 0;
+    int no_linking       = 0;
+    int debug            = 0;
+    int no_dale_stdlib   = 0;
+    int no_stdlib        = 0;
+    int remove_macros    = 0;
+    int no_common        = 0;
+    int static_mods_all  = 0;
+    int found_sm         = 0;
+    int found_ctom       = 0;
+    int enable_cto       = 0;
+    int version          = 0;
+    int print_expansions = 0;
 
     int option_index         = 0;
     int forced_remove_macros = 0;
 
     static struct option long_options[] = {
-        { "no-dale-stdlib", no_argument,       &no_dale_stdlib,  1 },
-        { "no-common",      no_argument,       &no_common,       1 },
-        { "no-stdlib",      no_argument,       &no_stdlib,       1 },
-        { "static-modules", no_argument,       &static_mods_all, 1 },
-        { "static-module",  required_argument, &found_sm,        1 },
-        { "cto-module",     required_argument, &found_ctom,      1 },
-        { "enable-cto",     no_argument,       &enable_cto,      1 },
-        { "version",        no_argument,       &version,         1 },
+        { "no-dale-stdlib",   no_argument,       &no_dale_stdlib,   1 },
+        { "no-common",        no_argument,       &no_common,        1 },
+        { "no-stdlib",        no_argument,       &no_stdlib,        1 },
+        { "static-modules",   no_argument,       &static_mods_all,  1 },
+        { "static-module",    required_argument, &found_sm,         1 },
+        { "cto-module",       required_argument, &found_ctom,       1 },
+        { "enable-cto",       no_argument,       &enable_cto,       1 },
+        { "version",          no_argument,       &version,          1 },
+        { "print-expansions", no_argument,       &print_expansions, 1 },
         { 0, 0, 0, 0 }
     };
 
@@ -315,6 +317,7 @@ main(int argc, char **argv)
                       no_dale_stdlib,
                       static_mods_all,
                       enable_cto,
+                      print_expansions,
                       &so_paths,
                       output_file);
     if (!generated) {