Changes in src/main.cc [01d433e:1622af5]

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:27:35 2021
-// Update Count     : 658
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Nov  9 11:10:00 2021
+// Update Count     : 657
 //
 
@@ -43 +43 @@
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Common/CompilerError.h"           // for CompilerError
+#include "Common/DeclStats.hpp"             // for printDeclStats
+#include "Common/ResolvProtoDump.hpp"       // for dumpAsResolverProto
 #include "Common/Stats.h"
 #include "Common/PassVisitor.h"
@@ -51 +53 @@
 #include "ControlStruct/ExceptDecl.h"       // for translateExcept
 #include "ControlStruct/ExceptTranslate.h"  // for translateEHM
+#include "ControlStruct/FixLabels.hpp"      // for fixLabels
 #include "ControlStruct/Mutate.h"           // for mutate
 #include "GenPoly/Box.h"                    // for box
@@ -62 +65 @@
 #include "Parser/TypedefTable.h"            // for TypedefTable
 #include "ResolvExpr/AlternativePrinter.h"  // for AlternativePrinter
+#include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates
 #include "ResolvExpr/Resolver.h"            // for resolve
 #include "SymTab/Validate.h"                // for validate
@@ -315 +319 @@
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "Validate", SymTab::validate( translationUnit, symtabp ) );
-                if ( symtabp ) {
-                        deleteAll( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( expraltp ) {
-                        PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
-                        acceptAll( translationUnit, printer );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( validp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) );
-                PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );
-                PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
-                PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
-                PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
-                if ( libcfap ) {
-                        // generate the bodies of cfa library functions
-                        LibCfa::makeLibCfa( translationUnit );
-                } // if
-
-                if ( declstatsp ) {
-                        CodeTools::printDeclStats( translationUnit );
-                        deleteAll( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( bresolvep ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
 
                 CodeTools::fillLocations( translationUnit );
-
-                if ( resolvprotop ) {
-                        CodeTools::dumpAsResolvProto( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
 
                 if( useNewAST ) {
@@ -365 +328 @@
                         }
                         auto transUnit = convert( move( translationUnit ) );
+
+                        forceFillCodeLocations( transUnit );
+
+                        if ( symtabp ) {
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( expraltp ) {
+                                ResolvExpr::printCandidates( transUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( validp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Translate Throws", ControlStruct::translateThrows( transUnit ) );
+                        PASS( "Fix Labels", ControlStruct::fixLabels( transUnit ) );
+                        PASS( "Fix Names", CodeGen::fixNames( transUnit ) );
+                        PASS( "Gen Init", InitTweak::genInit( transUnit ) );
+                        PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
+
+                        if ( libcfap ) {
+                                // Generate the bodies of cfa library functions.
+                                LibCfa::makeLibCfa( transUnit );
+                        } // if
+
+                        if ( declstatsp ) {
+                                printDeclStats( transUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( bresolvep ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( resolvprotop ) {
+                                dumpAsResolverProto( transUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
                         if ( exprp ) {
@@ -375 +381 @@
                         PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
 
-                        // fix ObjectDecl - replaces ConstructorInit nodes
-                        if ( ctorinitp ) {
-                                dump( move( transUnit ) );
-                                return EXIT_SUCCESS;
-                        } // if
-
-                        // Currently not working due to unresolved issues with UniqueExpr
-                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        if ( symtabp ) {
+                                deleteAll( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( expraltp ) {
+                                PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
+                                acceptAll( translationUnit, printer );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( validp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) );
+                        PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );
+                        PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
+                        PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
+                        PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
+                        if ( libcfap ) {
+                                // Generate the bodies of cfa library functions.
+                                LibCfa::makeLibCfa( translationUnit );
+                        } // if
+
+                        if ( declstatsp ) {
+                                CodeTools::printDeclStats( translationUnit );
+                                deleteAll( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( bresolvep ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        CodeTools::fillLocations( translationUnit );
+
+                        if ( resolvprotop ) {
+                                CodeTools::dumpAsResolvProto( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
                         if ( exprp ) {
@@ -392 +435 @@
 
                         PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
-
-                        // fix ObjectDecl - replaces ConstructorInit nodes
-                        if ( ctorinitp ) {
-                                dump ( translationUnit );
-                                return EXIT_SUCCESS;
-                        } // if
-
-                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
                 }
+
+                // fix ObjectDecl - replaces ConstructorInit nodes
+                if ( ctorinitp ) {
+                        dump ( translationUnit );
+                        return EXIT_SUCCESS;
+                } // if
+
+                PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
 
                 PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
@@ -447 +490 @@
                 PASS( "Code Gen", CodeGen::generate( translationUnit, *output, ! genproto, prettycodegenp, true, linemarks ) );
 
-                CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::FixMain::fix( translationUnit, *output,
+                                (PreludeDirector + "/bootloader.c").c_str() );
                 if ( output != &cout ) {
                         delete output;