Changes in src/main.cc [ea5daeb:35f9114]

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 15:23:11 2016
-// Update Count     : 209
+// Last Modified On : Sat Aug  6 16:17:41 2016
+// Update Count     : 210
 //
 
@@ -43 +43 @@
 #include "InitTweak/GenInit.h"
 #include "InitTweak/FixInit.h"
-#include "InitTweak/FixGlobalInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
@@ -194 +193 @@
                         input = fopen( argv[ optind ], "r" );
                         if ( ! input ) {
-                                std::cout << "Error: can't open " << argv[ optind ] << std::endl;
+                                std::cout << "Error: cannot open " << argv[ optind ] << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -220 +219 @@
                         FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins.cf" << std::endl;
+                                std::cerr << "Error: cannot open builtins.cf" << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -228 +227 @@
                         FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         if ( extras == NULL ) {
-                                std::cerr << "Error: can't open extras.cf" << std::endl;
+                                std::cerr << "Error: cannot open extras.cf" << std::endl;
                                 exit( EXIT_FAILURE );
                         } // if
@@ -237 +236 @@
                                 FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
+                                        std::cerr << "Error: cannot open prelude.cf" << std::endl;
                                         exit( EXIT_FAILURE );
                                 } // if
@@ -283 +282 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "fixGlobalInit" );
-                InitTweak::fixGlobalInit( translationUnit, filename, libcfap || treep );
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
@@ -305 +302 @@
                 }
 
+                // fix ObjectDecl - replaces ConstructorInit nodes
                 OPTPRINT( "fixInit" )
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                InitTweak::fix( translationUnit );
+                InitTweak::fix( translationUnit, filename, libcfap || treep );
                 if ( ctorinitp ) {
                         dump ( translationUnit );