Changeset 83c7e3c for src/ResolvExpr

Timestamp:

Dec 23, 2020, 6:37:35 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a3a76ea, c20533ea

Parents:

4c19647 (diff), 09867ec (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

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• ResolvMode.h (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -905 +905 @@
                         // xxx - is it possible that handleTupleAssignment and main finder both produce candidates?
                         // this means there exists ctor/assign functions with a tuple as first parameter.
-                        funcFinder.find( untypedExpr->func, selfFinder.candidates.empty() ? ResolvMode::withAdjustment() : ResolvMode::withoutFailFast() );
+                        ResolvMode mode = {
+                                true, // adjust
+                                !untypedExpr->func.as<ast::NameExpr>(), // prune if not calling by name
+                                selfFinder.candidates.empty() // failfast if other options are not found
+                        };
+                        funcFinder.find( untypedExpr->func, mode );
                         // short-circuit if no candidates
                         // if ( funcFinder.candidates.empty() ) return;

src/ResolvExpr/ResolvMode.h

@@ -23 +23 @@
                 const bool failFast;         ///< Fail on no resulting alternatives? [true]
 
-        private:
                 constexpr ResolvMode(bool a, bool p, bool ff) 
                 : adjust(a), prune(p), failFast(ff) {}
 
-        public:
                 /// Default settings
                 constexpr ResolvMode() : adjust(false), prune(true), failFast(true) {}