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

File:

• src/main.cc (modified) (14 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 : Peter A. Buhr
-// Last Modified On : Wed Jan 27 22:20:20 2016
-// Update Count     : 199
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jan 19 16:28:13 2016
+// Update Count     : 194
 //
 
@@ -42 +42 @@
 #include "InitTweak/Mutate.h"
 #include "InitTweak/RemoveInit.h"
+#include "InitTweak/FixInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
 
-#include "Common/SemanticError.h"
-#include "Common/UnimplementedError.h"
+#include "SemanticError.h"
+#include "UnimplementedError.h"
 
 #include "../config.h"
@@ -61 +62 @@
         astp = false,
         bresolvep = false,
+        ctorinitp = false,
         exprp = false,
         expraltp = false,
@@ -70 +72 @@
         resolvep = false,                                                                       // used in AlternativeFinder
         symtabp = false,
-        treep = false,
         validp = false,
         errorp = false,
         codegenp = false;
 
-enum { Ast, Bresolver, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
+enum { Ast, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, 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 },
@@ -89 +91 @@
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
-        { "tree", no_argument, 0, Tree },
         { "validate", no_argument, 0, Validate },
         { 0, 0, 0, 0 }
@@ -101 +102 @@
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
-        
+
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abcefFglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -113 +114 @@
                         bresolvep = true;
                         break;
+                        case CtorInitFix:
+                        case 'c':
+                        ctorinitp = true;
+                        break;
                   case Expr:
                   case 'e':                                                                             // dump AST after expression analysis
@@ -148 +153 @@
                   case 's':                                                                             // print symbol table events
                         symtabp = true;
-                        break;
-                  case Tree:
-                  case 't':                                                                             // build in tree
-                        treep = true;
                         break;
                   case 'v':                                                                             // dump AST after decl validation pass
@@ -188 +189 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-        
+
                 Parser::get_parser().set_debug( grammarp );
 
@@ -194 +195 @@
                 if ( ! nopreludep ) {                                                   // include gcc builtins
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins.cf" << std::endl;
+                                std::cerr << "Error: can't open builtins" << std::endl;
                                 exit( 1 );
                         } // if
@@ -204 +205 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
+                                        std::cerr << "Error: can't open prelude" << std::endl;
                                         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 );
@@ -250 +251 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" ) 
+                OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "tweak" )
+                OPTPRINT( "tweakInit" )
                 InitTweak::tweak( translationUnit );
 
@@ -269 +270 @@
                 if ( exprp ) {
                         dump( translationUnit );
+                        return 0;
+                }
+
+                OPTPRINT( "fixInit" )
+                // fix ObjectDecl - replaces ConstructorInit nodes
+                InitTweak::fix( translationUnit );
+                if ( ctorinitp ) {
+                        dump ( translationUnit );
+                        return 0;
                 }
 
@@ -337 +347 @@
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), 
+                filter( translationUnit.begin(), translationUnit.end(),
                                 std::back_inserter( decls ), notPrelude );
         } else {