Changeset 41c19b4 for src/ResolvExpr/ResolvMode.h

Timestamp:

Nov 30, 2020, 2:42:35 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4a8f150, 6d1790c

Parents:

d738aeb (diff), 4f0c520 (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/ResolvMode.h (modified) (1 diff)

src/ResolvExpr/ResolvMode.h

@@ -22 +22 @@
                 const bool prune;            ///< Prune alternatives to min-cost per return type? [true]
                 const bool failFast;         ///< Fail on no resulting alternatives? [true]
-                const bool satisfyAssns;     ///< Satisfy assertions? [false]
 
         private:
-                constexpr ResolvMode(bool a, bool p, bool ff, bool sa) 
-                : adjust(a), prune(p), failFast(ff), satisfyAssns(sa) {}
+                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), satisfyAssns(false) {}
+                constexpr ResolvMode() : adjust(false), prune(true), failFast(true) {}
                 
                 /// With adjust flag set; turns array and function types into equivalent pointers
-                static constexpr ResolvMode withAdjustment() { return { true, true, true, false }; }
+                static constexpr ResolvMode withAdjustment() { return { true, true, true }; }
 
                 /// With adjust flag set but prune unset; pruning ensures there is at least one alternative 
                 /// per result type
-                static constexpr ResolvMode withoutPrune() { return { true, false, true, false }; }
+                static constexpr ResolvMode withoutPrune() { return { true, false, true }; }
 
                 /// With adjust and prune flags set but failFast unset; failFast ensures there is at least 
                 /// one resulting alternative
-                static constexpr ResolvMode withoutFailFast() { return { true, true, false, false }; }
+                static constexpr ResolvMode withoutFailFast() { return { true, true, false }; }
 
                 /// The same mode, but with satisfyAssns turned on; for top-level calls
-                ResolvMode atTopLevel() const { return { adjust, prune, failFast, true }; }
+                ResolvMode atTopLevel() const { return { adjust, true, failFast }; }
         };
 } // namespace ResolvExpr