Changes in src/main.cc [f77f12e2:d3b7937]

File:

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

src/main.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// main.cc --
+// main.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 17:49:38 2016
-// Update Count     : 200
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jan 27 22:20:20 2016
+// Update Count     : 199
 //
 
@@ -24 +24 @@
 #include "SynTree/Declaration.h"
 #include "SynTree/Visitor.h"
+#include "GenPoly/InstantiateGeneric.h"
 #include "GenPoly/Lvalue.h"
 #include "GenPoly/Specialize.h"
@@ -41 +42 @@
 #include "InitTweak/Mutate.h"
 #include "InitTweak/RemoveInit.h"
-#include "InitTweak/FixInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -56 +56 @@
 
 static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
-static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
+static void dump( std::list< Declaration * > & translationUnit );
 
 bool
         astp = false,
         bresolvep = false,
-        ctorinitp = false,
         exprp = false,
         expraltp = false,
@@ -76 +75 @@
         codegenp = false;
 
-enum { Ast, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
+enum { Ast, Bresolver, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
 
 static struct option long_opts[] = {
         { "ast", no_argument, 0, Ast },
         { "before-resolver", no_argument, 0, Bresolver },
-        { "ctorinitfix", no_argument, 0, CtorInitFix },
         { "expr", no_argument, 0, Expr },
         { "expralt", no_argument, 0, ExprAlt },
@@ -103 +101 @@
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
-
+        
         int c;
-        while ( (c = getopt_long( argc, argv, "abcefFglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -114 +112 @@
                   case 'b':                                                                             // print before resolver steps
                         bresolvep = true;
-                        break;
-                        case CtorInitFix:
-                        case 'c':
-                        ctorinitp = true;
                         break;
                   case Expr:
@@ -194 +188 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-
+        
                 Parser::get_parser().set_debug( grammarp );
 
@@ -215 +209 @@
                                         exit( 1 );
                                 } // if
-
+                    
                                 parse( prelude, LinkageSpec::Intrinsic );
                         } // if
                 } // if
 
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );
-
+                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );      
+  
                 if ( parsep ) {
                         Parser::get_parser().get_parseTree()->printList( std::cout );
@@ -256 +250 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" )
+                OPTPRINT( "fixNames" ) 
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "tweakInit" )
+                OPTPRINT( "tweak" )
                 InitTweak::tweak( translationUnit );
 
@@ -275 +269 @@
                 if ( exprp ) {
                         dump( translationUnit );
-                        return 0;
                 }
 
-                OPTPRINT( "fixInit" )
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                InitTweak::fix( translationUnit );
-                if ( ctorinitp ) {
-                        dump ( translationUnit );
-                        return 0;
-                }
-
+                OPTPRINT( "instantiateGeneric" )
+                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );
@@ -308 +295 @@
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        std::cerr << "---AST at error:---" << std::endl;
-                        dump( translationUnit, std::cerr );
-                        std::cerr << std::endl << "---End of AST, begin error message:---\n" << std::endl;
+                        dump( translationUnit );
                 }
                 e.print( std::cerr );
@@ -332 +317 @@
         } // try
 
-        deleteAll( translationUnit );
         return 0;
 } // main
@@ -350 +334 @@
 }
 
-static void dump( std::list< Declaration * > & translationUnit, std::ostream & out ) {
+static void dump( std::list< Declaration * > & translationUnit ) {
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(),
+                filter( translationUnit.begin(), translationUnit.end(), 
                                 std::back_inserter( decls ), notPrelude );
         } else {
@@ -359 +343 @@
         }
 
-        printAll( decls, out );
+        printAll( decls, std::cout );
         deleteAll( translationUnit );
 }