Changes in / [f3152ab:779a4a3]

File:

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

src/main.cc

@@ -63 +63 @@
 using namespace std;
 
-#define PASS(name, pass)                   \
-        if ( errorp ) { cerr << #name << endl; } \
-        HeapStats::newPass(#name);               \
-        pass;
+#define OPTPRINT(x) if ( errorp ) cerr << x << endl;
+
 
 LinkageSpec::Spec linkage = LinkageSpec::Cforall;
@@ -247 +245 @@
 
                 // add the assignment statement after the initialization of a type parameter
-                PASS( "validate", SymTab::validate( translationUnit, symtabp ) );
+                OPTPRINT( "validate" )
+                SymTab::validate( translationUnit, symtabp );
                 if ( symtabp ) {
                         deleteAll( translationUnit );
@@ -264 +263 @@
                 } // if
 
-                PASS( "mutate", ControlStruct::mutate( translationUnit ) );
-                PASS( "fixNames", CodeGen::fixNames( translationUnit ) );
-                PASS( "genInit", InitTweak::genInit( translationUnit ) );
-                PASS( "expandMemberTuples" , Tuples::expandMemberTuples( translationUnit ) );
+                OPTPRINT( "mutate" )
+                ControlStruct::mutate( translationUnit );
+                OPTPRINT( "fixNames" )
+                CodeGen::fixNames( translationUnit );
+                OPTPRINT( "genInit" )
+                InitTweak::genInit( translationUnit );
+                OPTPRINT( "expandMemberTuples" );
+                Tuples::expandMemberTuples( translationUnit );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -286 +289 @@
                 CodeTools::fillLocations( translationUnit );
 
-                PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
+                OPTPRINT( "resolve" )
+                ResolvExpr::resolve( translationUnit );
                 if ( exprp ) {
                         dump( translationUnit );
@@ -293 +297 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                OPTPRINT( "fixInit" )
+                InitTweak::fix( translationUnit, filename, libcfap || treep );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -299 +304 @@
                 } // if
 
-                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
+                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
                 Tuples::expandUniqueExpr( 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?
-
+                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 );
                 if ( tuplep ) {
                         dump( translationUnit );
@@ -315 +323 @@
                 }
 
-                PASS( "virtual expandCasts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
-
-                PASS( "instantiateGenerics", GenPoly::instantiateGeneric( translationUnit ) );
+                OPTPRINT( "virtual expandCasts" ) // Must come after translateEHM
+                Virtual::expandCasts( translationUnit );
+
+                OPTPRINT("instantiateGenerics")
+                GenPoly::instantiateGeneric( translationUnit );
                 if ( genericsp ) {
                         dump( translationUnit );
                         return 0;
                 }
-                PASS( "convertLvalue", GenPoly::convertLvalue( translationUnit ) );
+                OPTPRINT( "convertLvalue" )
+                GenPoly::convertLvalue( translationUnit );
 
 
@@ -329 +340 @@
                         return 0;
                 } // if
-                PASS( "box", GenPoly::box( translationUnit ) );
+                OPTPRINT( "box" )
+                GenPoly::box( translationUnit );
 
                 if ( bcodegenp ) {
@@ -341 +353 @@
 
                 CodeTools::fillLocations( translationUnit );
-                PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
+                OPTPRINT( "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;