Changeset 67fa9f9 for src/main.cc

Timestamp:

Jul 5, 2017, 10:50:22 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0614d14

Parents:

11dbfe1 (diff), 307a732 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/main.cc

@@ -11 +11 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:56:47 2017
-// Update Count     : 440
+// Last Modified On : Thu Jun 29 12:46:50 2017
+// Update Count     : 441
 //
 
@@ -39 +39 @@
 #include "CodeTools/TrackLoc.h"
 #include "ControlStruct/Mutate.h"
+#include "ControlStruct/ExceptTranslate.h"
 #include "SymTab/Validate.h"
 #include "ResolvExpr/AlternativePrinter.h"
@@ -290 +291 @@
                 Tuples::expandUniqueExpr( translationUnit );
 
+                OPTPRINT( "translateEHM" );
+                ControlStruct::translateEHM( translationUnit );
+
                 OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
                 GenPoly::convertSpecializations( translationUnit );
@@ -481 +485 @@
                         break;
                   case '?':
-                        assertf( false, "Unknown option: '%c'\n", (char)optopt );
+                        if ( optopt ) {                                                         // short option ?
+                                assertf( false, "Unknown option: -%c\n", (char)optopt );
+                        } else {
+                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
+                        } // if
                   default:
                         abort();