Changeset 6803ff1 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jun 25, 2024, 12:09:43 PM (10 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d96d4f0

Parents:

f3b67b6 (diff), 5eb3f65 (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/CandidateFinder.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp ¶

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Jun 5 14:30:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Mar 16 11:58:00 2022
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jun 22 08:07:26 2024
+// Update Count     : 4
 //
 
@@ -909 +909 @@
                         auto location = expr->location;
                         auto callExpr = new ast::UntypedExpr(
-                                location, new ast::NameExpr( location, "valueE" ), {expr}
+                                location, new ast::NameExpr( location, "value" ), {expr}
                         );
                         finder.find( callExpr );
                         CandidateList winners = findMinCost( finder.candidates );
                         if (winners.size() != 1) {
-                                SemanticError( callExpr, "Ambiguous expression in valueE..." );
+                                SemanticError( callExpr, "Ambiguous expression in value..." );
                         }
                         CandidateRef & choice = winners.front();