Changes in src/main.cc [cbd1ba8:64b3cda]

File:

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

src/main.cc

@@ -228 +228 @@
         ostream * output = & cout;
         list< Declaration * > translationUnit;
+        ast::TranslationUnit transUnit;
 
         Signal( SIGSEGV, sigSegvBusHandler, SA_SIGINFO );
@@ -294 +295 @@
                 parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
 
-                if ( parsep ) {
-                        dumpParseTree( cout );
-                        return EXIT_SUCCESS;
-                } // if
-
-                translationUnit = buildUnit();
+                transUnit = buildUnit();
 
                 if ( astp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                // Temporary: fill locations after parsing so that every node has a location, for early error messages.
-                // Eventually we should pass the locations from the parser to every node, but this quick and dirty solution
-                // works okay for now.
-                CodeTools::fillLocations( translationUnit );
+                        dump( std::move( transUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+
                 Stats::Time::StopBlock();
 
@@ -316 +308 @@
                         ast::pass_visitor_stats.max = Stats::Counters::build<Stats::Counters::MaxCounter<double>>("Max depth - New");
                 }
-                auto transUnit = convert( std::move( translationUnit ) );
-
-                forceFillCodeLocations( transUnit );
-
-                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
-                if ( exdeclp ) {
-                        dump( std::move( transUnit ) );
-                        return EXIT_SUCCESS;
-                }
-
-                PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
+
                 PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
                 // Hoist Type Decls pulls some declarations out of contexts where
@@ -333 +315 @@
                 forceFillCodeLocations( transUnit );
 
+                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
+                if ( exdeclp ) {
+                        dump( std::move( transUnit ) );
+                        return EXIT_SUCCESS;
+                }
+
+                PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
                 PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
                 PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
@@ -474 +463 @@
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
-                        dump( translationUnit, cerr );
+                        // We check which section the errors came from without looking at
+                        // transUnit because std::move means it could look like anything.
+                        if ( !translationUnit.empty() ) {
+                                dump( translationUnit, cerr );
+                        } else {
+                                dump( std::move( transUnit ), cerr );
+                        }
                         cerr << endl << "---End of AST, begin error message:---\n" << endl;
                 } // if
@@ -578 +573 @@
         { "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" },