Changeset e61a35e for src/main.cc

Timestamp:

Mar 14, 2017, 4:57:49 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

572547c, f841241

Parents:

e496303 (diff), 4da6a6c (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 plg2:software/cfa/cfa-cc

File:

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

src/main.cc

@@ -32 +32 @@
 #include "GenPoly/CopyParams.h"
 #include "GenPoly/InstantiateGeneric.h"
+#include "Concurrency/Keywords.h"
 #include "CodeGen/Generate.h"
 #include "CodeGen/FixNames.h"
@@ -236 +237 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
+                OPTPRINT( "Concurrency" )
+                Concurrency::applyKeywords( translationUnit );
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );