Changeset 4dc3b8c for src/ResolvExpr/Resolver.cc

Timestamp:

Nov 30, 2023, 6:14:20 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2f8d351

Parents:

7f2bfb7 (diff), c4570af3 (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) (5 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
@@ -123 +123 @@
                 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 +263 @@
                 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 +292 @@
                         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 {};
@@ -860 +860 @@
 
                         // 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() ) {