Changeset 4a368547 for src/ResolvExpr/Resolver.cc

Timestamp:

May 29, 2017, 3:08:47 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, resolv-new, with_gc

Children:

2ab67b9, a029714

Parents:

ff98952 (diff), 4c5b972 (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/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -124 +124 @@
                         } // if
 #endif
-                        assert( finder.get_alternatives().size() == 1 );
+                        assertf( finder.get_alternatives().size() == 1, "findSingleExpression: must have exactly one alternative at the end." );
                         Alternative &choice = finder.get_alternatives().front();
                         Expression *newExpr = choice.expr->clone();
@@ -397 +397 @@
                         // //   cerr << type << endl;
                         // // } // for
-                        
+
                         // // O(N^2) checks of d-types with f-types
                         // // find the minimum cost