Changeset a5de33e for src/main.cc

Timestamp:

Jul 5, 2017, 5:00:46 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

55a68c3, 5805d15

Parents:

f7cb0bc (diff), 1ce2189 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/main.cc

@@ -25 +25 @@
 using namespace std;
 
-#include "Parser/parser.hh"
+#include "Parser/ParserTypes.h"
 #include "Parser/TypedefTable.h"
 #include "GenPoly/Lvalue.h"
@@ -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 );