Changeset c7d8100c for src

Timestamp:

May 17, 2018, 4:37:58 PM (7 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, with_gc

Children:

4a333d35, d142ec5, ff29f08

Parents:

ca54499 (diff), 4358c1e (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

Location:

src/Common

Files:

• SemanticError.cc (modified) (3 diffs)
• SemanticError.h (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 18:13:37 2018
-// Update Count     : 8
+// Last Modified On : Wed May 16 15:01:20 2018
+// Update Count     : 9
 //
 
@@ -70 +70 @@
 //-----------------------------------------------------------------------------
 // Semantic Error
+bool SemanticErrorThrow = false;
+
 SemanticErrorException::SemanticErrorException( CodeLocation location, std::string error ) {
         append( location, error );
@@ -94 +96 @@
 
 void SemanticError( CodeLocation location, std::string error ) {
+        SemanticErrorThrow = true;
         throw SemanticErrorException(location, error);
 }

src/Common/SemanticError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 18:13:15 2018
-// Update Count     : 29
+// Last Modified On : Wed May 16 15:01:23 2018
+// Update Count     : 30
 //
 
@@ -21 +21 @@
 //-----------------------------------------------------------------------------
 // Errors
+
+extern bool SemanticErrorThrow;
 
 __attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );