Changes in src/main.cc [7b937575:711eee5]

File:

• src/main.cc (modified) (10 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 May  4 23:32:59 2016
-// Update Count     : 203
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed May 04 16:54:52 2016
+// Update Count     : 199
 //
 
@@ -41 +41 @@
 #include "InitTweak/Mutate.h"
 #include "InitTweak/RemoveInit.h"
+#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -97 +98 @@
         std::ostream *output = &std::cout;
         int long_index;
-        std::list< Declaration * > translationUnit;
-        const char *filename = NULL;;
+        std::list< Declaration* > translationUnit;
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
-        
+
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -163 +163 @@
                         break;
                   case 'D':                                                                             // ignore -Dxxx
-                        break;
-                  case 'F':                                                                             // source file-name without suffix
-                        filename = optarg;
                         break;
                   case '?':
@@ -176 +173 @@
 
         try {
+                std::string fileName;
+
                 // choose to read the program from a file or stdin
                 if ( optind < argc ) {
                         input = fopen( argv[ optind ], "r" );
                         if ( ! input ) {
-                                std::cout << "Error: can't open " << argv[optind] << std::endl;
+                                std::cout << "Error: can't open " << argv[ optind ] << std::endl;
                                 exit( 1 );
                         } // if
                         optind += 1;
+
+                        // assert( optind < argc );
+                        fileName = argv[ optind-1 ]; // placeholder
+                        // optind += 1;
                 } else {
                         input = stdin;
@@ -191 +194 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-        
+
                 Parser::get_parser().set_debug( grammarp );
 
@@ -212 +215 @@
                                         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 );
@@ -253 +256 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" ) 
+                OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
+                OPTPRINT( "fixGlobalInit" );
+                InitTweak::fixGlobalInit( translationUnit, fileName );
                 OPTPRINT( "tweak" )
                 InitTweak::tweak( translationUnit );
@@ -282 +287 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
-                
+
                 // print tree right before code generation
                 if ( codegenp ) {
@@ -338 +343 @@
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), 
+                filter( translationUnit.begin(), translationUnit.end(),
                                 std::back_inserter( decls ), notPrelude );
         } else {