Changes in src/main.cc [3e9de01:490fb92e]

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct  8 18:17:46 2020
-// Update Count     : 637
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue May 19 12:03:00 2020
+// Update Count     : 634
 //
 
@@ -343 +343 @@
                         auto transUnit = convert( move( translationUnit ) );
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
+                        if ( exprp ) {
+                                translationUnit = convert( move( transUnit ) );
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
                         translationUnit = convert( move( transUnit ) );
                 } else {
                         PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
+                        if ( exprp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        }
+
+                        PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 }
 
-                if ( exprp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -451 +458 @@
 
 
-static const char optstring[] = ":c:ghlLmNnpdOAP:S:twW:D:";
+static const char optstring[] = ":c:ghlLmNnpdP:S:twW:D:";
 
 enum { PreludeDir = 128 };
@@ -478 +485 @@
 
 static const char * description[] = {
-        "diagnostic color: never, always, or auto.",            // -c
-        "wait for gdb to attach",                                                       // -g
-        "print help message",                                                           // -h
-        "generate libcfa.c",                                                            // -l
-        "generate line marks",                                                          // -L
-        "do not replace main",                                                          // -m
-        "do not generate line marks",                                           // -N
-        "do not read prelude",                                                          // -n
+        "diagnostic color: never, always, or auto.",          // -c
+        "wait for gdb to attach",                             // -g
+        "print help message",                                 // -h
+        "generate libcfa.c",                                  // -l
+        "generate line marks",                                // -L
+        "do not replace main",                                // -m
+        "do not generate line marks",                         // -N
+        "do not read prelude",                                // -n
         "generate prototypes for prelude functions",            // -p
-        "only print deterministic output",                  // -d
-        "Use the old-ast",                                                                      // -O
-        "Use the new-ast",                                                                      // -A
-        "print",                                                                                        // -P
+        "don't print output that isn't deterministic",        // -d
+        "Use the old-ast",                                    // -O
+        "Use the new-ast",                                    // -A
+        "print",                                              // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
         "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
-        "building cfa standard lib",                                            // -t
-        "",                                                                                                     // -w
-        "",                                                                                                     // -W
-        "",                                                                                                     // -D
+        "building cfa standard lib",                          // -t
+        "",                                                   // -w
+        "",                                                   // -W
+        "",                                                   // -D
 }; // description