Changeset dcbb03b for src/GenPoly

Timestamp:

Mar 1, 2018, 9:29:03 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:

1f37ed02

Parents:

b002261 (diff), 446ffa3 (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/GenPoly

Files:

• Box.cc (modified) (4 diffs)
• FindFunction.cc (modified) (1 diff)
• InstantiateGeneric.cc (modified) (1 diff)
• Lvalue.cc (modified) (1 diff)
• Specialize.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -215 +215 @@
         inline void mutateTranslationUnit( std::list< Declaration* > &translationUnit, MutatorType &mutator ) {
                 bool seenIntrinsic = false;
-                SemanticError errors;
+                SemanticErrorException errors;
                 for ( typename std::list< Declaration* >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
                         try {
@@ -228 +228 @@
                                         assert( *i );
                                 } // if
-                        } catch( SemanticError &e ) {
+                        } catch( SemanticErrorException &e ) {
                                 errors.append( e );
                         } // try
@@ -575 +575 @@
                                                 }
                                         } else {
-                                                throw SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " );
+                                                SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " );
                                         }
                                 }
@@ -597 +597 @@
                                         } else {
                                                 // xxx - should this be an assertion?
-                                                throw SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) );
+                                                SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) );
                                         } // if
                                 } // if

src/GenPoly/FindFunction.cc

@@ -19 +19 @@
 
 #include "Common/PassVisitor.h"         // for PassVisitor
-#include "Common/SemanticError.h"       // for SemanticError
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::iterator
 #include "GenPoly/GenPoly.h"            // for TyVarMap

src/GenPoly/InstantiateGeneric.cc

@@ -24 +24 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for deleteAll, cloneAll

src/GenPoly/Lvalue.cc

@@ -18 +18 @@
 
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "GenPoly.h"                     // for isPolyType
 #include "Lvalue.h"

src/GenPoly/Specialize.cc

@@ -23 +23 @@
 
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "Common/UniqueName.h"           // for UniqueName
 #include "Common/utility.h"              // for group_iterate