Changeset 3982384 for src/ResolvExpr/Resolver.cc

Timestamp:

May 17, 2023, 1:35:09 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

f11010e

Parents:

6e4c44d (diff), 8db4708 (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) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -1730 +1730 @@
 
                         // Find all candidates for a function in canonical form
-                        funcFinder.find( clause.target_func, ResolvMode::withAdjustment() );
+                        funcFinder.find( clause.target, ResolvMode::withAdjustment() );
 
                         if ( funcFinder.candidates.empty() ) {
                                 stringstream ss;
                                 ss << "Use of undeclared indentifier '";
-                                ss << clause.target_func.strict_as< ast::NameExpr >()->name;
+                                ss << clause.target.strict_as< ast::NameExpr >()->name;
                                 ss << "' in call to waitfor";
                                 SemanticError( stmt->location, ss.str() );
@@ -1922 +1922 @@
                         auto clause2 = new ast::WaitForClause( clause.location );
 
-                        clause2->target_func = funcCandidates.front()->expr;
+                        clause2->target = funcCandidates.front()->expr;
 
                         clause2->target_args.reserve( clause.target_args.size() );
@@ -1945 +1945 @@
 
                         // Resolve the conditions as if it were an IfStmt, statements normally
-                        clause2->cond = findSingleExpression( clause.cond, context );
+                        clause2->when_cond = findSingleExpression( clause.when_cond, context );
                         clause2->stmt = clause.stmt->accept( *visitor );