Changeset 7042c60 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Apr 25, 2024, 3:48:17 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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:

resolve conflict

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1412 +1412 @@
         }
 
-    void Finder::postvisit(const ast::VariableExpr *variableExpr) {
-        // not sufficient to just pass `variableExpr` here, type might have changed
-
-        auto cand = new Candidate(variableExpr, tenv);
-        candidates.emplace_back(cand);
-    }
+        void Finder::postvisit(const ast::VariableExpr *variableExpr) {
+                // not sufficient to just pass `variableExpr` here, type might have changed
+
+                auto cand = new Candidate(variableExpr, tenv);
+                candidates.emplace_back(cand);
+        }
 
         void Finder::postvisit( const ast::ConstantExpr * constantExpr ) {
@@ -2133 +2133 @@
 
 // get the valueE(...) ApplicationExpr that returns the enum value
-const ast::Expr * getValueEnumCall( 
-        const ast::Expr * expr, 
+const ast::Expr * getValueEnumCall(
+        const ast::Expr * expr,
         const ResolvExpr::ResolveContext & context, const ast::TypeEnvironment & env ) {
                 auto callExpr = new ast::UntypedExpr(