Changeset e67a82d for src/main.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicts

File:

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

src/main.cc

@@ -31 +31 @@
 using namespace std;
 
-
+#include "AST/Convert.hpp"
 #include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
@@ -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 ) );
+                }
+
                 if ( exprp ) {
                         dump( translationUnit );
@@ -458 +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 },
@@ -479 +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
@@ -584 +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