Changeset f80e0218 for src/main.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/main.cc (modified) (18 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 On : Sun Jun  5 15:57:30 2016
+// Update Count     : 205
 //
 
@@ -40 +40 @@
 #include "MakeLibCfa.h"
 #include "InitTweak/Mutate.h"
-#include "InitTweak/RemoveInit.h"
+#include "InitTweak/GenInit.h"
+#include "InitTweak/FixInit.h"
+#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -55 +57 @@
 
 static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
-static void dump( std::list< Declaration * > & translationUnit );
+static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
 
 bool
         astp = false,
         bresolvep = false,
+        bboxp = false,
+        ctorinitp = false,
         exprp = false,
         expraltp = false,
@@ -74 +78 @@
         codegenp = false;
 
-enum { Ast, Bresolver, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
+enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
 
 static struct option long_opts[] = {
         { "ast", no_argument, 0, Ast },
+        { "before-box", no_argument, 0, Bbox },
         { "before-resolver", no_argument, 0, Bresolver },
+        { "ctorinitfix", no_argument, 0, CtorInitFix },
         { "expr", no_argument, 0, Expr },
         { "expralt", no_argument, 0, ExprAlt },
@@ -97 +103 @@
         std::ostream *output = &std::cout;
         int long_index;
-        std::list< Declaration* > translationUnit;
+        std::list< Declaration * > translationUnit;
+        const char *filename = NULL;
 
         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, "abBcefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -112 +119 @@
                         bresolvep = true;
                         break;
+                  case 'B':                                                                             // print before resolver steps
+                        bboxp = true;
+                        break;
+                  case CtorInitFix:
+                  case 'c':
+                        ctorinitp = true;
+                        break;
                   case Expr:
                   case 'e':                                                                             // dump AST after expression analysis
@@ -163 +177 @@
                   case 'D':                                                                             // ignore -Dxxx
                         break;
+                  case 'F':                                                                             // source file-name without suffix
+                        filename = optarg;
+                        break;
                   case '?':
                         cout << "Unknown option: '" << (char)optopt << "'" << endl;
-                        exit(1);
+                        exit( EXIT_FAILURE );
                   default:
                         abort();
@@ -176 +193 @@
                         input = fopen( argv[ optind ], "r" );
                         if ( ! input ) {
-                                std::cout << "Error: can't open " << argv[optind] << std::endl;
-                                exit( 1 );
+                                std::cout << "Error: can't open " << argv[ optind ] << std::endl;
+                                exit( EXIT_FAILURE );
                         } // if
+                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
+                        if ( filename == NULL ) filename = argv[ optind ];
+                        // prelude filename comes in differently
+                        if ( libcfap ) filename = "prelude.cf";
                         optind += 1;
                 } else {
                         input = stdin;
+                        // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
+                        // a fake name along
+                        if ( filename == NULL ) filename = "stdin";
                 } // if
 
@@ -187 +211 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-        
+
                 Parser::get_parser().set_debug( grammarp );
 
@@ -196 +220 @@
                         if ( builtins == NULL ) {
                                 std::cerr << "Error: can't open builtins.cf" << std::endl;
-                                exit( 1 );
+                                exit( EXIT_FAILURE );
                         } // if
 
@@ -206 +230 @@
                                 if ( prelude == NULL ) {
                                         std::cerr << "Error: can't open prelude.cf" << std::endl;
-                                        exit( 1 );
+                                        exit( EXIT_FAILURE );
                                 } // 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 );
@@ -249 +273 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" ) 
+                OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "tweak" )
-                InitTweak::tweak( translationUnit );
+                OPTPRINT( "fixGlobalInit" );
+                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
+                OPTPRINT( "tweakInit" )
+                InitTweak::genInit( translationUnit );
 
                 if ( libcfap ) {
@@ -268 +294 @@
                 if ( exprp ) {
                         dump( translationUnit );
+                        return 0;
+                }
+
+                OPTPRINT( "fixInit" )
+                // fix ObjectDecl - replaces ConstructorInit nodes
+                InitTweak::fix( translationUnit );
+                if ( ctorinitp ) {
+                        dump ( translationUnit );
+                        return 0;
                 }
 
@@ -276 +311 @@
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
+
+                if ( bboxp ) {
+                        dump( translationUnit );
+                        return 0;
+                }
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
-                
+
                 // print tree right before code generation
                 if ( codegenp ) {
@@ -292 +332 @@
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        dump( translationUnit );
+                        std::cerr << "---AST at error:---" << std::endl;
+                        dump( translationUnit, std::cerr );
+                        std::cerr << std::endl << "---End of AST, begin error message:---\n" << std::endl;
                 }
                 e.print( std::cerr );
@@ -314 +356 @@
         } // try
 
+        deleteAll( translationUnit );
         return 0;
 } // main
@@ -331 +374 @@
 }
 
-static void dump( std::list< Declaration * > & translationUnit ) {
+static void dump( std::list< Declaration * > & translationUnit, std::ostream & out ) {
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), 
+                filter( translationUnit.begin(), translationUnit.end(),
                                 std::back_inserter( decls ), notPrelude );
         } else {
@@ -340 +383 @@
         }
 
-        printAll( decls, std::cout );
+        printAll( decls, out );
         deleteAll( translationUnit );
 }