Changeset 1518b39 for src/ResolvExpr

Timestamp:

May 1, 2018, 2:43:15 PM (8 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, stuck-waitfor-destruct, with_gc

Children:

5da5a96

Parents:

b9c432f (diff), 4c80a75 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -583 +583 @@
                                                                         ss << "' to '";
                                                                         arg.expr->get_result()->print( ss );
+                                                                        ss << "' with env '";
+                                                                        resultEnv.print(ss);
                                                                         ss << "'\n";
                                                                         SemanticError( function, ss.str() );