Changeset 81da3da4 for src/ResolvExpr/Resolver.cc

Timestamp:

Dec 11, 2023, 4:18:13 AM (23 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/ResolvExpr/Resolver.cc (modified) (7 diffs)

src/ResolvExpr/Resolver.cc

@@ -25 +25 @@
 #include "Resolver.h"
 #include "ResolveTypeof.h"
-#include "ResolvMode.h"                  // for ResolvMode
+#include "ResolveMode.hpp"               // for ResolveMode
 #include "typeops.h"                     // for extractResultType
 #include "Unify.h"                       // for unify
 #include "CompilationState.h"
-#include "AST/Chain.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Init.hpp"
@@ -104 +103 @@
                                                                 }
                                                         }
-                                                } 
-                                        } 
+                                                }
+                                        }
                                         visit_children = false;
                                 }
@@ -123 +122 @@
                 CandidateRef findUnfinishedKindExpression(
                         const ast::Expr * untyped, const ResolveContext & context, const std::string & kind,
-                        std::function<bool(const Candidate &)> pred = anyCandidate, ResolvMode mode = {}
+                        std::function<bool(const Candidate &)> pred = anyCandidate, ResolveMode mode = {}
                 ) {
                         if ( ! untyped ) return nullptr;
@@ -263 +262 @@
                 ast::ptr< ast::CastExpr > untyped = new ast::CastExpr{ expr };
                 CandidateRef choice = findUnfinishedKindExpression(
-                        untyped, context, "", anyCandidate, ResolvMode::withAdjustment() );
+                        untyped, context, "", anyCandidate, ResolveMode::withAdjustment() );
 
                 // a cast expression has either 0 or 1 interpretations (by language rules);
@@ -292 +291 @@
                         const ast::Expr * untyped, const ResolveContext & context,
                         std::function<bool(const Candidate &)> pred = anyCandidate,
-                        const std::string & kind = "", ResolvMode mode = {}
+                        const std::string & kind = "", ResolveMode mode = {}
                 ) {
                         if ( ! untyped ) return {};
@@ -607 +606 @@
                                 ( objectDecl->get_type() )->base->base ) {
                                 objectDecl = fixObjectType( objectDecl, context );
-                                currentObject = ast::CurrentObject{ 
-                                        objectDecl->location, 
+                                currentObject = ast::CurrentObject{
+                                        objectDecl->location,
                                         enumBase
                                 };
@@ -860 +859 @@
 
                         // Find all candidates for a function in canonical form
-                        funcFinder.find( clause.target, ResolvMode::withAdjustment() );
+                        funcFinder.find( clause.target, ResolveMode::withAdjustment() );
 
                         if ( funcFinder.candidates.empty() ) {