Changes in src/main.cc [0e464f6:9ea38de]

File:

• src/main.cc (modified) (3 diffs)

src/main.cc

@@ -29 +29 @@
 #include <string>                           // for char_traits, operator<<
 
+#include "AST/Convert.hpp"
 #include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
@@ -302 +303 @@
                 } // if
 
-                PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
+                // PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
+                {
+                        auto transUnit = convert( move( translationUnit ) );
+                        PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
+                        translationUnit = convert( move( transUnit ) );
+                }
                 if ( exprp ) {
                         dump( translationUnit );
@@ -454 +460 @@
         const char * descript;
 } printopts[] = {
-        { "ascodegen", codegenp, true, "print AST as codegen rather than AST" },
-        { "asterr", errorp, true, "print AST on error" },
+        { "altexpr", expraltp, true, "alternatives for expressions" },
+        { "ascodegen", codegenp, true, "as codegen rather than AST" },
+        { "ast", astp, true, "AST after parsing" },
+        { "astdecl", validp, true, "AST after declaration validation pass" },
+        { "asterr", errorp, true, "AST on error" },
+        { "astexpr", exprp, true, "AST after expression analysis" },
+        { "astgen", genericsp, true, "AST after instantiate generics" },
+        { "box", bboxp, true, "before box step" },
+        { "ctordtor", ctorinitp, true, "after ctor/dtor are replaced" },
+        { "codegen", bcodegenp, true, "before code generation" },
         { "declstats", declstatsp, true, "code property statistics" },
         { "parse", yydebug, true, "yacc (parsing) debug information" },
         { "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
+        { "resolver", bresolvep, true, "before resolver step" },
         { "rproto", resolvprotop, true, "resolver-proto instance" },
-        { "rsteps", resolvep, true, "print resolver steps" },
-        { "tree", parsep, true, "print parse tree" },
-        // code dumps
-        { "ast", astp, true, "print AST after parsing" },
-        { "symevt", symtabp, true, "print AST after symbol table events" },
-        { "altexpr", expraltp, true, "print alternatives for expressions" },
-        { "astdecl", validp, true, "print AST after declaration validation pass" },
-        { "resolver", bresolvep, true, "print AST before resolver step" },
-        { "astexpr", exprp, true, "print AST after expression analysis" },
-        { "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
-        { "tuple", tuplep, true, "print AST after tuple expansion" },
-        { "astgen", genericsp, true, "print AST after instantiate generics" },
-        { "box", bboxp, true, "print AST before box step" },
-        { "codegen", bcodegenp, true, "print AST before code generation" },
+        { "rsteps", resolvep, true, "resolver steps" },
+        { "symevt", symtabp, true, "symbol table events" },
+        { "tree", parsep, true, "parse tree" },
+        { "tuple", tuplep, true, "after tuple expansion" },
 };
 enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };