Changeset d36c117 for src/GenPoly

Timestamp:

May 15, 2017, 12:04:49 PM (7 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:

9c951e3

Parents:

ce8c12f (diff), fae2cf8 (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' into references

File:

• src/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:06:37 2017
-// Update Count     : 339
+// Last Modified On : Sat May 13 09:26:38 2017
+// Update Count     : 341
 //
 
@@ -706 +706 @@
                                 Type *concrete = env->lookup( typeInst->get_name() );
                                 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 );
+//                                      std::string x = env ? toString( *env ) : "missing env";
+//                                      throw SemanticError( x + "\n" + "Unbound type variable " + typeInst->get_name() + " in ", appExpr );
                                 } // if
                                 return concrete;