Changeset 8024bc8 for src/GenPoly

Timestamp:

Sep 18, 2017, 11:02:23 AM (9 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, stuck-waitfor-destruct, with_gc

Children:

6994d8c

Parents:

ed235b6 (diff), 5f782f7 (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/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -628 +628 @@
                                         } else {
                                                 // xxx - should this be an assertion?
-                                                std::string x = env ? toString( *env ) : "missing env";
-                                                throw SemanticError( x + "\n" + "unbound type variable: " + tyParm->first + " in application ", appExpr );
+                                                throw SemanticError( toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ), appExpr );
                                         } // if
                                 } // if
@@ -706 +705 @@
                                 if ( concrete == 0 ) {
                                         return typeInst;
-                                        // xxx - should this be an assertion?
-//                                      std::string x = env ? toString( *env ) : "missing env";
-//                                      throw SemanticError( x + "\n" + "Unbound type variable " + typeInst->get_name() + " in ", appExpr );
                                 } // if
                                 return concrete;