Changeset ff29f08 for src/main.cc

Timestamp:

May 18, 2018, 2:09:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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:

Merge remote-tracking branch 'origin/master' into with_gc

File:

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

src/main.cc

@@ -11 +11 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 31 12:22:40 2017
-// Update Count     : 445
+// Last Modified On : Mon May  7 14:35:57 2018
+// Update Count     : 492
 //
 
@@ -35 +35 @@
 #include "CodeTools/DeclStats.h"            // for printDeclStats
 #include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CompilerError.h"           // for CompilerError
+#include "Common/GC.h"                      // for GC
+#include "Common/Heap.h"
 #include "Common/PassVisitor.h"
-#include "Common/CompilerError.h"           // for CompilerError
-#include "Common/GC.h"                                          // for GC
 #include "Common/SemanticError.h"           // for SemanticError
 #include "Common/UnimplementedError.h"      // for UnimplementedError
@@ -65 +66 @@
 using namespace std;
 
-#define OPTPRINT(x) if ( errorp ) cerr << x << endl;
+#define PASS(name, pass)                   \
+        if ( errorp ) { cerr << name << endl; } \
+        HeapStats::newPass(name);               \
+        pass;
 
 LinkageSpec::Spec linkage = LinkageSpec::Cforall;
@@ -242 +246 @@
 
                 // add the assignment statement after the initialization of a type parameter
-                OPTPRINT( "validate" )
-                SymTab::validate( translationUnit, symtabp );
+                PASS( "validate", SymTab::validate( translationUnit, symtabp ) );
                 if ( symtabp ) return 0;
                 collect( translationUnit );
@@ -258 +261 @@
                 } // if
 
-                OPTPRINT( "mutate" )
-                ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" )
-                CodeGen::fixNames( translationUnit );
-                OPTPRINT( "genInit" )
-                InitTweak::genInit( translationUnit );
-                OPTPRINT( "expandMemberTuples" );
-                Tuples::expandMemberTuples( translationUnit );
+                PASS( "mutate", ControlStruct::mutate( translationUnit ) );
+                PASS( "fixNames", CodeGen::fixNames( translationUnit ) );
+                PASS( "genInit", InitTweak::genInit( translationUnit ) );
+                PASS( "expandMemberTuples" , Tuples::expandMemberTuples( translationUnit ) );
                 collect( translationUnit );
                 if ( libcfap ) {
@@ -284 +283 @@
                 CodeTools::fillLocations( translationUnit );
 
-                OPTPRINT( "resolve" )
-                ResolvExpr::resolve( translationUnit );
+                PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
                 collect( translationUnit );
                 if ( exprp ) {
@@ -293 +291 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                OPTPRINT( "fixInit" )
-                InitTweak::fix( translationUnit, filename, libcfap || treep );
+                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
                 collect( translationUnit );
                 if ( ctorinitp ) {
@@ -301 +298 @@
                 } // if
 
-                OPTPRINT( "expandUniqueExpr" ); // xxx - is this the right place for this? want to expand ASAP so that subsequent 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( "expandUniqueExpr", 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
                 Tuples::expandUniqueExpr( translationUnit );
 
-                OPTPRINT( "translateEHM" );
-                ControlStruct::translateEHM( translationUnit );
-
-                OPTPRINT( "generateWaitfor" );
-                Concurrency::generateWaitFor( translationUnit );
-
-                OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
-                GenPoly::convertSpecializations( translationUnit );
-
-                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
-                Tuples::expandTuples( translationUnit );
+                PASS( "translateEHM" , ControlStruct::translateEHM( translationUnit ) );
+
+                PASS( "generateWaitfor" , Concurrency::generateWaitFor( translationUnit ) );
+
+                PASS( "convertSpecializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+
+                PASS( "expandTuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
                 collect( translationUnit );
                 if ( tuplep ) {
@@ -321 +314 @@
                 }
 
-                OPTPRINT( "virtual expandCasts" ) // Must come after translateEHM
-                Virtual::expandCasts( translationUnit );
-
-                OPTPRINT("instantiateGenerics")
-                GenPoly::instantiateGeneric( translationUnit );
+                PASS( "virtual expandCasts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
+
+                PASS( "instantiateGenerics", GenPoly::instantiateGeneric( translationUnit ) );
                 collect( translationUnit );
                 if ( genericsp ) {
@@ -331 +322 @@
                         return 0;
                 }
-
-                OPTPRINT( "convertLvalue" )
-                GenPoly::convertLvalue( translationUnit );
+                PASS( "convertLvalue", GenPoly::convertLvalue( translationUnit ) );
                 collect( translationUnit );
                 if ( bboxp ) {
@@ -339 +328 @@
                         return 0;
                 } // if
-
-                OPTPRINT( "box" )
-                GenPoly::box( translationUnit );
+                PASS( "box", GenPoly::box( translationUnit ) );
                 collect( translationUnit );
                 if ( bcodegenp ) {
@@ -353 +340 @@
 
                 CodeTools::fillLocations( translationUnit );
-                OPTPRINT( "codegen" )
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
+                PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
-                OPTPRINT( "end" )
-
                 if ( output != &cout ) {
                         delete output;
@@ -386 +370 @@
                 } // if
                 return 1;
-        } // try
-
+        } catch(...) {
+                std::exception_ptr eptr = std::current_exception();
+                try {
+                        if (eptr) {
+                                std::rethrow_exception(eptr);
+                        }
+                        else {
+                                std::cerr << "Exception Uncaught and Unkown" << std::endl;
+                        }
+                } catch(const std::exception& e) {
+                        std::cerr << "Unaught Exception \"" << e.what() << "\"\n";
+                }
+                return 1;
+        }// try
+
+        if(!libcfap && !treep) HeapStats::printStats();
         return 0;
 } // main
@@ -420 +418 @@
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
+        bool Wsuppress = false, Werror = false;
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -457 +456 @@
                         yydebug = true;
                         break;
-                  case 'G':                   // dump AST after instantiate generics
+                  case 'G':                                                                             // dump AST after instantiate generics
                         genericsp = true;
                         break;
@@ -505 +504 @@
                   case 'v':                                                                             // dump AST after decl validation pass
                         validp = true;
+                        break;
+                  case 'w':
+                        Wsuppress = true;
+                        break;
+                  case 'W':
+                        if ( strcmp( optarg, "all" ) == 0 ) {
+                                SemanticWarning_EnableAll();
+                        } else if ( strcmp( optarg, "error" ) == 0 ) {
+                                Werror = true;
+                        } else {
+                                char * warning = optarg;
+                                Severity s;
+                                if ( strncmp( optarg, "no-", 3 ) == 0 ) {
+                                        warning += 3;
+                                        s = Severity::Suppress;
+                                } else {
+                                        s = Severity::Warn;
+                                } // if
+                                SemanticWarning_Set( warning, s );
+                        } // if
                         break;
                   case 'y':                                                                             // dump AST on error
@@ -526 +545 @@
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
-                        #if __GNUC__ < 7
-                        #else
+                        #if defined(__GNUC__) && __GNUC__ >= 7
                                 __attribute__((fallthrough));
                         #endif
@@ -534 +552 @@
                 } // switch
         } // while
+
+        if ( Werror ) {
+                SemanticWarning_WarningAsError();
+        } // if
+        if ( Wsuppress ) {
+                SemanticWarning_SuppressAll();
+        } // if
+        // for ( const auto w : WarningFormats ) {
+        //      cout << w.name << ' ' << (int)w.severity << endl;
+        // } // for
 } // parse_cmdline