Changes in / [7ff3e522:f8d05ee]

Files:

• Jenkinsfile (added)
• Jenkinsfile_disabled (deleted)
• configure.ac (modified) (1 diff)
• src/CompilationState.cc (modified) (2 diffs)
• src/CompilationState.h (modified) (1 diff)
• src/config.h.in (modified) (1 diff)
• src/main.cc (modified) (4 diffs)

configure.ac

@@ -24 +24 @@
 #Trasforming cc1 will break compilation
 M4CFA_PROGRAM_NAME
+
+#==============================================================================
+# New AST toggling support
+AH_TEMPLATE([CFA_USE_NEW_AST],[Sets whether or not to use the new-ast, this is adefault value and can be overrided by --old-ast and --new-ast])
+AC_ARG_ENABLE(new-ast,
+        [  --enable-new-ast     whether or not to use new ast as the default AST algorithm],
+        [case "${enableval}" in
+                yes) newast=true ;;
+                no)  newast=false ;;
+                *) AC_MSG_ERROR([bad value ${enableval} for --enable-new-ast]) ;;
+        esac],[newast=false])
+AC_DEFINE_UNQUOTED([CFA_USE_NEW_AST], $newast)
 
 #==============================================================================

src/CompilationState.cc

@@ -14 +14 @@
 //
 
+#include "config.h"
+
 int
         astp = false,
@@ -28 +30 @@
         genproto = false,
         deterministic_output = false,
+        useNewAST = CFA_USE_NEW_AST,
         nomainp = false,
         parsep = false,

src/CompilationState.h

@@ -29 +29 @@
         genproto,
         deterministic_output,
+        useNewAST,
         nomainp,
         parsep,

src/config.h.in

@@ -27 +27 @@
 /* Location of cfa install. */
 #undef CFA_PREFIX
+
+/* Sets whether or not to use the new-ast, this is adefault value and can be
+   overrided by --old-ast and --new-ast */
+#undef CFA_USE_NEW_AST
 
 /* Major.Minor */

src/main.cc

@@ -340 +340 @@
                 } // if
 
-                // PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
-                {
+                if( useNewAST) {
                         auto transUnit = convert( move( translationUnit ) );
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
                         translationUnit = convert( move( transUnit ) );
+                } else {
+                        PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
                 }
 
@@ -464 +465 @@
         { "prototypes", no_argument, nullptr, 'p' },
         { "deterministic-out", no_argument, nullptr, 'd' },
+        { "old-ast", no_argument, nullptr, 'O'},
+        { "new-ast", no_argument, nullptr, 'A'},
         { "print", required_argument, nullptr, 'P' },
         { "prelude-dir", required_argument, nullptr, PreludeDir },
@@ -485 +488 @@
         "generate prototypes for prelude functions",            // -p
         "don't print output that isn't deterministic",        // -d
+        "Use the old-ast",                                    // -O
+        "Use the new-ast",                                    // -A
         "print",                                              // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
@@ -590 +595 @@
                         break;
                   case 'd':                                     // don't print non-deterministic output
-                    deterministic_output = true;
+                        deterministic_output = true;
+                        break;
+                  case 'O':                                     // don't print non-deterministic output
+                        useNewAST = false;
+                        break;
+                  case 'A':                                     // don't print non-deterministic output
+                        useNewAST = true;
                         break;
                   case 'P':                                                                             // print options