Changes in src/main.cc [61efa42:cf3da24]

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov  1 21:12:58 2023
-// Update Count     : 690
+// Last Modified On : Thu Sep 28 22:28:45 2023
+// Update Count     : 687
 //
 
@@ -29 +29 @@
 #include <string>                           // for char_traits, operator<<
 
+#include "AST/Convert.hpp"
 #include "AST/Pass.hpp"                     // for pass_visitor_stats
-#include "AST/Print.hpp"                    // for printAll
 #include "AST/TranslationUnit.hpp"          // for TranslationUnit
 #include "AST/Util.hpp"                     // for checkInvariants
@@ -39 +39 @@
 #include "CodeGen/Generate.h"               // for generate
 #include "CodeGen/LinkOnce.h"               // for translateLinkOnce
+#include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Common/DeclStats.hpp"             // for printDeclStats
@@ -64 +65 @@
 #include "ResolvExpr/EraseWith.hpp"         // for eraseWith
 #include "ResolvExpr/Resolver.h"            // for resolve
+#include "SynTree/LinkageSpec.h"            // for Spec, Cforall, Intrinsic
+#include "SynTree/Declaration.h"            // for Declaration
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
@@ -91 +94 @@
         using namespace Stats::Counters;
         {
-                static auto group = build<CounterGroup>( "Pass Visitor Template" );
+                static auto group = build<CounterGroup>( "Pass Visitor" );
                 auto pass = build<CounterGroup>( name, group );
-                ast::pass_visitor_stats.depth = 0;
-                ast::pass_visitor_stats.avg = build<AverageCounter<double>>( "Average Depth", pass );
-                ast::pass_visitor_stats.max = build<MaxCounter<double>>( "Max Depth", pass );
+                pass_visitor_stats.depth = 0;
+                pass_visitor_stats.avg = build<AverageCounter<double>>( "Average Depth", pass );
+                pass_visitor_stats.max = build<MaxCounter<double>>( "Max Depth", pass );
+        }
+        {
+                static auto group = build<CounterGroup>( "Syntax Node" );
+                auto pass = build<CounterGroup>( name, group );
+                BaseSyntaxNode::new_nodes = build<SimpleCounter>( "Allocs", pass );
         }
 }
@@ -124 +132 @@
 
 static void parse_cmdline( int argc, char * argv[] );
+static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 static void dump( ast::TranslationUnit && transUnit, ostream & out = cout );
 
@@ -237 +246 @@
         FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
         ostream * output = & cout;
+        list< Declaration * > translationUnit;
         ast::TranslationUnit transUnit;
 
@@ -250 +260 @@
 
         parse_cmdline( argc, argv );                                            // process command-line arguments
+        CodeGen::FixMain::setReplaceMain( !nomainp );
 
         if ( waiting_for_gdb ) {
@@ -279 +290 @@
 
                         // Read to gcc builtins, if not generating the cfa library
-                        FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cfa").c_str(), "r" );
+                        FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cf").c_str(), "r" );
                         assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
                         parse( gcc_builtins, ast::Linkage::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( (PreludeDirector + "/extras.cfa").c_str(), "r" );
+                        FILE * extras = fopen( (PreludeDirector + "/extras.cf").c_str(), "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, ast::Linkage::BuiltinC );
@@ -295 +306 @@
 
                                 // Read to cfa builtins, if not generating the cfa library
-                                FILE * builtins = fopen( (PreludeDirector + "/builtins.cfa").c_str(), "r" );
+                                FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, ast::Linkage::BuiltinCFA );
@@ -308 +319 @@
 
                 Stats::Time::StopBlock();
+
+                if (Stats::Counters::enabled) {
+                        ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
+                        ast::pass_visitor_stats.max = Stats::Counters::build<Stats::Counters::MaxCounter<double>>("Max depth - New");
+                }
 
                 PASS( "Hoist Type Decls", Validate::hoistTypeDecls, transUnit );
@@ -393 +409 @@
                 PASS( "Translate Tries", ControlStruct::translateTries, transUnit );
                 PASS( "Gen Waitfor", Concurrency::generateWaitFor, transUnit );
-                PASS( "Fix Main Linkage", CodeGen::fixMainLinkage, transUnit, !nomainp );
 
                 // Needs to happen before tuple types are expanded.
@@ -412 +427 @@
                 PASS( "Link-Once", CodeGen::translateLinkOnce, transUnit );
 
+                translationUnit = convert( std::move( transUnit ) );
+
                 // Code has been lowered to C, now we can start generation.
 
-                DUMP( bcodegenp, std::move( transUnit ) );
+                DUMP( bcodegenp, translationUnit );
 
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
@@ -420 +437 @@
                 } // if
 
-                PASS( "Code Gen", CodeGen::generate, transUnit, *output, !genproto, prettycodegenp, true, linemarks, false );
-                CodeGen::fixMainInvoke( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
-
+                CodeTools::fillLocations( translationUnit );
+                PASS( "Code Gen", CodeGen::generate, translationUnit, *output, ! genproto, prettycodegenp, true, linemarks );
+
+                CodeGen::FixMain::fix( translationUnit, *output,
+                                (PreludeDirector + "/bootloader.c").c_str() );
                 if ( output != &cout ) {
                         delete output;
@@ -429 +448 @@
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
-                        dump( std::move( transUnit ), 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
@@ -455 +480 @@
         } // try
 
+        deleteAll( translationUnit );
         Stats::print();
         return EXIT_SUCCESS;
@@ -684 +710 @@
 } // parse_cmdline
 
-static bool notPrelude( ast::ptr<ast::Decl> & decl ) {
-        return !decl->linkage.is_builtin;
-}
-
-static void dump( ast::TranslationUnit && unit, std::ostream & out ) {
-        // May filter out all prelude declarations.
+static bool notPrelude( Declaration * decl ) {
+        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+} // notPrelude
+
+static void dump( list< Declaration * > & translationUnit, ostream & out ) {
+        list< Declaration * > decls;
+
         if ( genproto ) {
-                std::list<ast::ptr<ast::Decl>> decls;
-                std::copy_if( unit.decls.begin(), unit.decls.end(),
-                        std::back_inserter( decls ), notPrelude );
-                decls.swap( unit.decls );
-        }
-
-        // May print as full dump or as code generation.
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), notPrelude );
+        } else {
+                decls = translationUnit;
+        } // if
+
+        // depending on commandline options, either generate code or dump the AST
         if ( codegenp ) {
-                CodeGen::generate( unit, out, !genproto, prettycodegenp, false, false, false );
+                CodeGen::generate( decls, out, ! genproto, prettycodegenp );
         } else {
-                ast::printAll( out, unit.decls );
-        }
+                printAll( decls, out );
+        } // if
+        deleteAll( translationUnit );
+} // dump
+
+static void dump( ast::TranslationUnit && transUnit, ostream & out ) {
+        std::list< Declaration * > translationUnit = convert( std::move( transUnit ) );
+        dump( translationUnit, out );
 }