Changeset 81da3da4 for src/Tuples/TupleAssignment.cc

Timestamp:

Dec 11, 2023, 4:18:13 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (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/Tuples/TupleAssignment.cc (modified) (3 diffs)

src/Tuples/TupleAssignment.cc

@@ -13 +13 @@
 // Update Count     : 10
 //
+
+#include "Tuples.h"
 
 #include <algorithm>                       // for transform
@@ -224 +226 @@
                                 // by the cast type as needed, and transfer the resulting environment.
                                 ResolvExpr::CandidateFinder finder( spotter.crntFinder.context, env );
-                                finder.find( rhsCand->expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                finder.find( rhsCand->expr, ResolvExpr::ResolveMode::withAdjustment() );
                                 assert( 1 == finder.candidates.size() );
                                 env = std::move( finder.candidates.front()->env );
@@ -345 +347 @@
 
                         try {
-                                finder.find( expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                finder.find( expr, ResolvExpr::ResolveMode::withAdjustment() );
                         } catch (...) {
                                 // No match is not failure, just that this tuple assignment is invalid.