Changeset 6d6e829 for src

Timestamp:

Oct 12, 2018, 3:19:35 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

da48183

Parents:

59cf83b

Message:

First compiling draft of deferred assertions (build failure)

Location:

src

Files:

• Common/FilterCombos.h (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• ResolvExpr/Alternative.cc (modified) (4 diffs)
• ResolvExpr/Alternative.h (modified) (3 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (37 diffs)
• ResolvExpr/Cost.h (modified) (4 diffs)
• ResolvExpr/ResolvMode.h (modified) (3 diffs)
• ResolvExpr/ResolveAssertions.cc (added)
• ResolvExpr/ResolveAssertions.h (added)
• ResolvExpr/Resolver.cc (modified) (12 diffs)
• ResolvExpr/TypeEnvironment.h (modified) (1 diff)
• ResolvExpr/module.mk (modified) (1 diff)
• Tuples/Explode.h (modified) (3 diffs)
• Tuples/TupleAssignment.cc (modified) (4 diffs)

src/Makefile.am

@@ -126 +126 @@
   ResolvExpr/PtrsCastable.cc \
   ResolvExpr/RenameVars.cc \
+  ResolvExpr/ResolveAssertions.cc \
   ResolvExpr/Resolver.cc \
   ResolvExpr/ResolveTypeof.cc \

src/Makefile.in

@@ -203 +203 @@
         ResolvExpr/PtrsAssignable.$(OBJEXT) \
         ResolvExpr/PtrsCastable.$(OBJEXT) \
-        ResolvExpr/RenameVars.$(OBJEXT) ResolvExpr/Resolver.$(OBJEXT) \
+        ResolvExpr/RenameVars.$(OBJEXT) \
+        ResolvExpr/ResolveAssertions.$(OBJEXT) \
+        ResolvExpr/Resolver.$(OBJEXT) \
         ResolvExpr/ResolveTypeof.$(OBJEXT) \
         ResolvExpr/SpecCost.$(OBJEXT) \
@@ -261 +263 @@
         ResolvExpr/CurrentObject.$(OBJEXT) \
         ResolvExpr/ExplodedActual.$(OBJEXT) \
-        ResolvExpr/SpecCost.$(OBJEXT) SymTab/Indexer.$(OBJEXT) \
-        SymTab/Mangler.$(OBJEXT) SymTab/ManglerCommon.$(OBJEXT) \
-        SymTab/Validate.$(OBJEXT) SymTab/FixFunction.$(OBJEXT) \
-        SymTab/Autogen.$(OBJEXT) SynTree/Type.$(OBJEXT) \
-        SynTree/VoidType.$(OBJEXT) SynTree/BasicType.$(OBJEXT) \
-        SynTree/PointerType.$(OBJEXT) SynTree/ArrayType.$(OBJEXT) \
-        SynTree/ReferenceType.$(OBJEXT) SynTree/FunctionType.$(OBJEXT) \
+        ResolvExpr/SpecCost.$(OBJEXT) \
+        ResolvExpr/ResolveAssertions.$(OBJEXT) \
+        SymTab/Indexer.$(OBJEXT) SymTab/Mangler.$(OBJEXT) \
+        SymTab/ManglerCommon.$(OBJEXT) SymTab/Validate.$(OBJEXT) \
+        SymTab/FixFunction.$(OBJEXT) SymTab/Autogen.$(OBJEXT) \
+        SynTree/Type.$(OBJEXT) SynTree/VoidType.$(OBJEXT) \
+        SynTree/BasicType.$(OBJEXT) SynTree/PointerType.$(OBJEXT) \
+        SynTree/ArrayType.$(OBJEXT) SynTree/ReferenceType.$(OBJEXT) \
+        SynTree/FunctionType.$(OBJEXT) \
         SynTree/ReferenceToType.$(OBJEXT) SynTree/TupleType.$(OBJEXT) \
         SynTree/TypeofType.$(OBJEXT) SynTree/AttrType.$(OBJEXT) \
@@ -549 +553 @@
         ResolvExpr/Occurs.cc ResolvExpr/TypeEnvironment.cc \
         ResolvExpr/CurrentObject.cc ResolvExpr/ExplodedActual.cc \
-        ResolvExpr/SpecCost.cc SymTab/Indexer.cc SymTab/Mangler.cc \
-        SymTab/ManglerCommon.cc SymTab/Validate.cc \
-        SymTab/FixFunction.cc SymTab/Autogen.cc SynTree/Type.cc \
-        SynTree/VoidType.cc SynTree/BasicType.cc \
+        ResolvExpr/SpecCost.cc ResolvExpr/ResolveAssertions.cc \
+        SymTab/Indexer.cc SymTab/Mangler.cc SymTab/ManglerCommon.cc \
+        SymTab/Validate.cc SymTab/FixFunction.cc SymTab/Autogen.cc \
+        SynTree/Type.cc SynTree/VoidType.cc SynTree/BasicType.cc \
         SynTree/PointerType.cc SynTree/ArrayType.cc \
         SynTree/ReferenceType.cc SynTree/FunctionType.cc \
@@ -657 +661 @@
   ResolvExpr/PtrsCastable.cc \
   ResolvExpr/RenameVars.cc \
+  ResolvExpr/ResolveAssertions.cc \
   ResolvExpr/Resolver.cc \
   ResolvExpr/ResolveTypeof.cc \
@@ -908 +913 @@
 ResolvExpr/RenameVars.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
         ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ResolveAssertions.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
 ResolvExpr/Resolver.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
         ResolvExpr/$(DEPDIR)/$(am__dirstamp)
@@ -1164 +1171 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/PtrsCastable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/RenameVars.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveAssertions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveTypeof.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Resolver.Po@am__quote@

src/ResolvExpr/Alternative.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:44:23 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 23:54:23 2015
-// Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Oct 11 10:55:00 2018
+// Update Count     : 3
 //
 
@@ -27 +27 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
+        Alternative::Alternative() 
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ), env(), openVars(), need() {}
 
-        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
-                : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env )
+        : cost( Cost::zero ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars(), need() {}
+        
+        Alternative::Alternative( const Alternative &o, Expression *expr, const Cost &cost ) 
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( o.env ), openVars( o.openVars ), 
+          need( o.need ) {}
 
-        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost )
-                : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost )
+        : cost( cost ), cvtCost( Cost::zero ), expr( expr ), env( env ), openVars( openVars ), 
+          need( need ) {}
 
-        Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) {
-        }
+        Alternative::Alternative( Expression *expr, const TypeEnvironment &env, 
+                const OpenVarSet& openVars, const AssertionList& need, const Cost& cost, 
+                const Cost &cvtCost )
+        : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ), openVars( openVars ), 
+          need( need ) {}
+
+        Alternative::Alternative( const Alternative &other ) 
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), 
+          env( other.env ), openVars( other.openVars ), need( other.need ) {}
 
         Alternative &Alternative::operator=( const Alternative &other ) {
@@ -45 +59 @@
                 expr = maybeClone( other.expr );
                 env = other.env;
+                openVars = other.openVars;
+                need = other.need;
                 return *this;
         }
 
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
+        Alternative::Alternative( Alternative && other ) 
+        : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), 
+          env( std::move( other.env ) ), openVars( std::move( other.openVars ) ), 
+          need( std::move( other.need ) ) {
                 other.expr = nullptr;
         }
@@ -59 +78 @@
                 expr = other.expr;
                 env = std::move( other.env );
+                openVars = std::move( other.openVars );
+                need = std::move( other.need );
                 other.expr = nullptr;
                 return *this;

src/ResolvExpr/Alternative.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:45:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:36:36 2017
-// Update Count     : 3
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Oct 11 10:55:00 2018
+// Update Count     : 4
 //
 
@@ -20 +20 @@
 
 #include "Cost.h"             // for Cost
-#include "TypeEnvironment.h"  // for TypeEnvironment
+#include "TypeEnvironment.h"  // for TypeEnvironment, AssertionSetValue
 
 class Expression;
 
 namespace ResolvExpr {
+        /// One assertion to resolve
+        struct AssertionItem {
+                DeclarationWithType* decl;
+                AssertionSetValue info;
+                
+                AssertionItem() = default;
+                AssertionItem( DeclarationWithType* decl, const AssertionSetValue& info ) 
+                : decl(decl), info(info) {}
+                AssertionItem( const AssertionSet::value_type& e ) : decl(e.first), info(e.second) {}
+                operator AssertionSet::value_type () const { return { decl, info }; }
+        };
+        /// A list of unresolved assertions
+        using AssertionList = std::vector<AssertionItem>;
+
+        /// One option for resolution of an expression
         struct Alternative {
                 Alternative();
-                Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost );
-                Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost, const Cost &cvtCost );
+                Alternative( Expression *expr, const TypeEnvironment &env );
+                Alternative( const Alternative &o, Expression *expr, const Cost &cost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet& openVars, 
+                        const AssertionList& need, const Cost &cost );
+                Alternative( Expression *expr, const TypeEnvironment &env, const OpenVarSet& openVars, 
+                        const AssertionList& need, const Cost &cost, const Cost &cvtCost );
                 Alternative( const Alternative &other );
                 Alternative &operator=( const Alternative &other );
@@ -44 +63 @@
                 }
 
-                Cost cost;
-                Cost cvtCost;
-                Expression *expr;
-                TypeEnvironment env;
+                /// Sorts by cost
+                bool operator< ( const Alternative& o ) const { return cost < o.cost; }
+
+                Cost cost;            ///< Cost of the whole expression
+                Cost cvtCost;         ///< Cost of conversions to the satisfying expression
+                Expression *expr;     ///< Satisfying expression
+                TypeEnvironment env;  ///< Containing type environment
+                OpenVarSet openVars;  ///< Open variables for environment
+                AssertionList need;   ///< Assertions which need to be resolved
         };
 

src/ResolvExpr/AlternativeFinder.cc

@@ -34 +34 @@
 #include "InitTweak/InitTweak.h"   // for getFunctionName
 #include "RenameVars.h"            // for RenameVars, global_renamer
+#include "ResolveAssertions.h"     // for resolveAssertions
 #include "ResolveTypeof.h"         // for resolveTypeof
 #include "Resolver.h"              // for resolveStmtExpr
@@ -102 +103 @@
                 void addAnonConversions( const Alternative & alt );
                 /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
-                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name );
+                template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Alternative &alt, const Cost &newCost, const std::string & name );
                 /// Adds alternatives for member expressions where the left side has tuple type
-                void addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member );
+                void addTupleMembers( TupleType *tupleType, Expression *expr, const Alternative &alt, const Cost &newCost, Expression *member );
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
@@ -253 +254 @@
                         SemanticError( expr, "No reasonable alternatives for expression " );
                 }
+                if ( mode.resolveAssns ) {
+                        // trim candidates just to those where the assertions resolve
+                        AltList candidates;
+                        for ( unsigned i = 0; i < alternatives.size(); ++i ) {
+                                resolveAssertions( alternatives[i], indexer, candidates );
+                        }
+                        // fail early if none such
+                        if ( mode.failFast && candidates.empty() ) {
+                                std::ostringstream stream;
+                                stream << "No resolvable alternatives for expression " << expr << "\n"
+                                       << "Alternatives with failing assertions are:\n";
+                                printAlts( alternatives, stream, 1 );
+                                SemanticError( expr->location, stream.str() );
+                        }
+                        // reset alternatives
+                        alternatives = std::move( candidates );
+                }
                 if ( mode.prune ) {
                         auto oldsize = alternatives.size();
@@ -317 +335 @@
 
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
-                        addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
+                        addAggMembers( structInst, aggrExpr.get(), alt, alt.cost+Cost::safe, "" );
                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
-                        addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, "" );
+                        addAggMembers( unionInst, aggrExpr.get(), alt, alt.cost+Cost::safe, "" );
                 } // if
         }
 
         template< typename StructOrUnionType >
-        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name ) {
+        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Alternative& alt, const Cost &newCost, const std::string & name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
@@ -332 +350 @@
                                 // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
                                 // can't construct in place and use vector::back
-                                Alternative newAlt( new MemberExpr( dwt, expr->clone() ), env, newCost );
+                                Alternative newAlt{ alt, new MemberExpr{ dwt, expr->clone() }, newCost };
                                 renameTypes( newAlt.expr );
                                 addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
@@ -342 +360 @@
         }
 
-        void AlternativeFinder::Finder::addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+        void AlternativeFinder::Finder::addTupleMembers( TupleType *tupleType, Expression *expr,                        const Alternative &alt, const Cost &newCost, Expression *member ) {
                 if ( ConstantExpr * constantExpr = dynamic_cast< ConstantExpr * >( member ) ) {
                         // get the value of the constant expression as an int, must be between 0 and the length of the tuple type to have meaning
@@ -348 +366 @@
                         std::string tmp;
                         if ( val >= 0 && (unsigned long long)val < tupleType->size() ) {
-                                alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                                alternatives.push_back( Alternative{ 
+                                        alt, new TupleIndexExpr( expr->clone(), val ), newCost } );
                         } // if
                 } // if
@@ -354 +373 @@
 
         void AlternativeFinder::Finder::postvisit( ApplicationExpr *applicationExpr ) {
-                alternatives.push_back( Alternative( applicationExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ applicationExpr->clone(), env } );
         }
 
@@ -484 +503 @@
         }
 
-        static const int recursionLimit = /*10*/ 4;  ///< Limit to depth of recursion satisfaction
-
-        void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
-                for ( AssertionSet::iterator i = assertSet.begin(); i != assertSet.end(); ++i ) {
-                        if ( i->second.isUsed ) {
-                                indexer.addId( i->first );
-                        }
-                }
-        }
-
-        template< typename ForwardIterator, typename OutputIterator >
-        void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
-                if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
-                if ( begin == end ) {
-                        if ( newNeed.empty() ) {
-                                PRINT(
-                                        std::cerr << "all assertions satisfied, output alternative: ";
-                                        newAlt.print( std::cerr );
-                                        std::cerr << std::endl;
-                                );
-                                *out++ = newAlt;
-                                return;
-                        } else if ( level >= recursionLimit ) {
-                                SemanticError( newAlt.expr->location, "Too many recursive assertions" );
-                        } else {
-                                AssertionSet newerNeed;
-                                PRINT(
-                                        std::cerr << "recursing with new set:" << std::endl;
-                                        printAssertionSet( newNeed, std::cerr, 8 );
-                                )
-                                inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
-                                return;
-                        }
-                }
-
-                ForwardIterator cur = begin++;
-                if ( ! cur->second.isUsed ) {
-                        inferRecursive( begin, end, newAlt, openVars, decls, newNeed, level, indexer, out );
-                        return; // xxx - should this continue? previously this wasn't here, and it looks like it should be
-                }
-                DeclarationWithType *curDecl = cur->first;
-
-                PRINT(
-                        std::cerr << "inferRecursive: assertion is ";
-                        curDecl->print( std::cerr );
-                        std::cerr << std::endl;
-                )
-                std::list< SymTab::Indexer::IdData > candidates;
-                decls.lookupId( curDecl->get_name(), candidates );
-///   if ( candidates.empty() ) { std::cerr << "no candidates!" << std::endl; }
-                for ( const auto & data : candidates ) {
-                        DeclarationWithType * candidate = data.id;
-                        PRINT(
-                                std::cerr << "inferRecursive: candidate is ";
-                                candidate->print( std::cerr );
-                                std::cerr << std::endl;
-                        )
-
-                        AssertionSet newHave, newerNeed( newNeed );
-                        TypeEnvironment newEnv( newAlt.env );
-                        OpenVarSet newOpenVars( openVars );
-                        Type *adjType = candidate->get_type()->clone();
-                        adjustExprType( adjType, newEnv, indexer );
-                        renameTyVars( adjType );
-                        PRINT(
-                                std::cerr << "unifying ";
-                                curDecl->get_type()->print( std::cerr );
-                                std::cerr << " with ";
-                                adjType->print( std::cerr );
-                                std::cerr << std::endl;
-                        )
-                        if ( unify( curDecl->get_type(), adjType, newEnv, newerNeed, newHave, newOpenVars, indexer ) ) {
-                                PRINT(
-                                        std::cerr << "success!" << std::endl;
-                                )
-                                SymTab::Indexer newDecls( decls );
-                                addToIndexer( newHave, newDecls );
-                                Alternative newerAlt( newAlt );
-                                newerAlt.env = newEnv;
-                                assertf( candidate->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
-
-                                // everything with an empty idChain was pulled in by the current assertion.
-                                // add current assertion's idChain + current assertion's ID so that the correct inferParameters can be found.
-                                for ( auto & a : newerNeed ) {
-                                        if ( a.second.idChain.empty() ) {
-                                                a.second.idChain = cur->second.idChain;
-                                                a.second.idChain.push_back( curDecl->get_uniqueId() );
-                                        }
-                                }
-
-                                Expression *varExpr = data.combine( newerAlt.cvtCost );
-                                delete varExpr->get_result();
-                                varExpr->set_result( adjType->clone() );
-                                PRINT(
-                                        std::cerr << "satisfying assertion " << curDecl->get_uniqueId() << " ";
-                                        curDecl->print( std::cerr );
-                                        std::cerr << " with declaration " << candidate->get_uniqueId() << " ";
-                                        candidate->print( std::cerr );
-                                        std::cerr << std::endl;
-                                )
-                                // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
-                                InferredParams * inferParameters = &newerAlt.expr->get_inferParams();
-                                for ( UniqueId id : cur->second.idChain ) {
-                                        inferParameters = (*inferParameters)[ id ].inferParams.get();
-                                }
-                                // XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
-                                (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( candidate->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
-                                inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
-                        } else {
-                                delete adjType;
-                        }
-                }
-        }
+//      template< typename ForwardIterator, typename OutputIterator >
+//      void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+//              if ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
+//              if ( begin == end ) {
+//                      if ( newNeed.empty() ) {
+//                              PRINT(
+//                                      std::cerr << "all assertions satisfied, output alternative: ";
+//                                      newAlt.print( std::cerr );
+//                                      std::cerr << std::endl;
+//                              );
+//                              *out++ = newAlt;
+//                              return;
+//                      } else if ( level >= recursionLimit ) {
+//                              SemanticError( newAlt.expr->location, "Too many recursive assertions" );
+//                      } else {
+//                              AssertionSet newerNeed;
+//                              PRINT(
+//                                      std::cerr << "recursing with new set:" << std::endl;
+//                                      printAssertionSet( newNeed, std::cerr, 8 );
+//                              )
+//                              inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, level+1, indexer, out );
+//                              return;
+//                      }
+//              }
+
+//              ForwardIterator cur = begin++;
+//              if ( ! cur->second.isUsed ) {
+//                      inferRecursive( begin, end, newAlt, openVars, decls, newNeed, level, indexer, out );
+//                      return; // xxx - should this continue? previously this wasn't here, and it looks like it should be
+//              }
+//              DeclarationWithType *curDecl = cur->first;
+
+//              PRINT(
+//                      std::cerr << "inferRecursive: assertion is ";
+//                      curDecl->print( std::cerr );
+//                      std::cerr << std::endl;
+//              )
+//              std::list< SymTab::Indexer::IdData > candidates;
+//              decls.lookupId( curDecl->get_name(), candidates );
+// ///   if ( candidates.empty() ) { std::cerr << "no candidates!" << std::endl; }
+//              for ( const auto & data : candidates ) {
+//                      DeclarationWithType * candidate = data.id;
+//                      PRINT(
+//                              std::cerr << "inferRecursive: candidate is ";
+//                              candidate->print( std::cerr );
+//                              std::cerr << std::endl;
+//                      )
+
+//                      AssertionSet newHave, newerNeed( newNeed );
+//                      TypeEnvironment newEnv( newAlt.env );
+//                      OpenVarSet newOpenVars( openVars );
+//                      Type *adjType = candidate->get_type()->clone();
+//                      adjustExprType( adjType, newEnv, indexer );
+//                      renameTyVars( adjType );
+//                      PRINT(
+//                              std::cerr << "unifying ";
+//                              curDecl->get_type()->print( std::cerr );
+//                              std::cerr << " with ";
+//                              adjType->print( std::cerr );
+//                              std::cerr << std::endl;
+//                      )
+//                      if ( unify( curDecl->get_type(), adjType, newEnv, newerNeed, newHave, newOpenVars, indexer ) ) {
+//                              PRINT(
+//                                      std::cerr << "success!" << std::endl;
+//                              )
+//                              SymTab::Indexer newDecls( decls );
+//                              addToIndexer( newHave, newDecls );
+//                              Alternative newerAlt( newAlt );
+//                              newerAlt.env = newEnv;
+//                              assertf( candidate->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
+
+//                              // everything with an empty idChain was pulled in by the current assertion.
+//                              // add current assertion's idChain + current assertion's ID so that the correct inferParameters can be found.
+//                              for ( auto & a : newerNeed ) {
+//                                      if ( a.second.idChain.empty() ) {
+//                                              a.second.idChain = cur->second.idChain;
+//                                              a.second.idChain.push_back( curDecl->get_uniqueId() );
+//                                      }
+//                              }
+
+//                              Expression *varExpr = data.combine( newerAlt.cvtCost );
+//                              delete varExpr->get_result();
+//                              varExpr->set_result( adjType->clone() );
+//                              PRINT(
+//                                      std::cerr << "satisfying assertion " << curDecl->get_uniqueId() << " ";
+//                                      curDecl->print( std::cerr );
+//                                      std::cerr << " with declaration " << candidate->get_uniqueId() << " ";
+//                                      candidate->print( std::cerr );
+//                                      std::cerr << std::endl;
+//                              )
+//                              // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
+//                              InferredParams * inferParameters = &newerAlt.expr->get_inferParams();
+//                              for ( UniqueId id : cur->second.idChain ) {
+//                                      inferParameters = (*inferParameters)[ id ].inferParams.get();
+//                              }
+//                              // XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
+//                              (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( candidate->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
+//                              inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
+//                      } else {
+//                              delete adjType;
+//                      }
+//              }
+//      }
 
         template< typename OutputIterator >
-        void AlternativeFinder::Finder::inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out ) {
-//      PRINT(
-//          std::cerr << "inferParameters: assertions needed are" << std::endl;
-//          printAll( need, std::cerr, 8 );
-//          )
-                SymTab::Indexer decls( indexer );
+        void AlternativeFinder::Finder::inferParameters( const AssertionSet &, AssertionSet &, const Alternative &newAlt, OpenVarSet &, OutputIterator out ) {
+                // SymTab::Indexer decls( indexer );
+                // addToIndexer( have, decls );
+                // AssertionSet newNeed;
                 // PRINT(
-                //      std::cerr << "============= original indexer" << std::endl;
-                //      indexer.print( std::cerr );
-                //      std::cerr << "============= new indexer" << std::endl;
-                //      decls.print( std::cerr );
+                //      std::cerr << "env is: " << std::endl;
+                //      newAlt.env.print( std::cerr, 0 );
+                //      std::cerr << std::endl;
                 // )
-                addToIndexer( have, decls );
-                AssertionSet newNeed;
-                PRINT(
-                        std::cerr << "env is: " << std::endl;
-                        newAlt.env.print( std::cerr, 0 );
-                        std::cerr << std::endl;
-                )
-
-                inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
-//      PRINT(
-//          std::cerr << "declaration 14 is ";
-//          Declaration::declFromId
-//          *out++ = newAlt;
-//          )
+
+                // inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
+
+                // add to output list, assertion resolution is defered
+                *out++ = newAlt;
         }
 
@@ -965 +962 @@
                 }
                 // build and validate new alternative
-                Alternative newAlt( appExpr, result.env, cost );
+                Alternative newAlt{ 
+                        appExpr, result.env, result.openVars, 
+                        AssertionList( result.need.begin(), result.need.end() ), cost };
                 PRINT(
                         std::cerr << "instantiate function success: " << appExpr << std::endl;
@@ -1248 +1247 @@
                         if ( isLvalue( alt.expr ) ) {
                                 alternatives.push_back(
-                                        Alternative{ new AddressExpr( alt.expr->clone() ), alt.env, alt.cost } );
+                                        Alternative{ alt, new AddressExpr( alt.expr->clone() ), alt.cost } );
                         } // if
                 } // for
@@ -1254 +1253 @@
 
         void AlternativeFinder::Finder::postvisit( LabelAddressExpr * expr ) {
-                alternatives.push_back( Alternative{ expr->clone(), env, Cost::zero } );
+                alternatives.push_back( Alternative{ expr->clone(), env } );
         }
 
@@ -1299 +1298 @@
                 AltList candidates;
                 for ( Alternative & alt : finder.alternatives ) {
-                        AssertionSet needAssertions, haveAssertions;
-                        OpenVarSet openVars;
+                        AssertionSet needAssertions( alt.need.begin(), alt.need.end() );
+                        AssertionSet haveAssertions;
+                        OpenVarSet openVars{ alt.openVars };
 
                         alt.env.extractOpenVars( openVars );
@@ -1328 +1328 @@
                                 // count one safe conversion for each value that is thrown away
                                 thisCost.incSafe( discardedValues );
-                                Alternative newAlt( restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), alt.env,
-                                        alt.cost, thisCost );
+                                Alternative newAlt{ 
+                                        restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), 
+                                        alt.env, openVars, 
+                                        AssertionList( needAssertions.begin(), needAssertions.end() ), alt.cost, 
+                                        thisCost };
                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars,
                                         back_inserter( candidates ) );
@@ -1344 +1347 @@
 
         void AlternativeFinder::Finder::postvisit( VirtualCastExpr * castExpr ) {
-                assertf( castExpr->get_result(), "Implicate virtual cast targets not yet supported." );
+                assertf( castExpr->get_result(), "Implicit virtual cast targets not yet supported." );
                 AlternativeFinder finder( indexer, env );
                 // don't prune here, since it's guaranteed all alternatives will have the same type
                 finder.findWithoutPrune( castExpr->get_arg() );
                 for ( Alternative & alt : finder.alternatives ) {
-                        alternatives.push_back( Alternative(
-                                new VirtualCastExpr( alt.expr->clone(), castExpr->get_result()->clone() ),
-                                alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{
+                                alt, new VirtualCastExpr{ alt.expr->clone(), castExpr->get_result()->clone() },
+                                alt.cost } );
                 }
         }
@@ -1376 +1379 @@
                         // find member of the given type
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( structInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( structInst, aggrExpr, *agg, cost, get_member_name(memberExpr) );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
-                                addAggMembers( unionInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
+                                addAggMembers( unionInst, aggrExpr, *agg, cost, get_member_name(memberExpr) );
                         } else if ( TupleType * tupleType = dynamic_cast< TupleType * >( aggrExpr->get_result() ) ) {
-                                addTupleMembers( tupleType, aggrExpr, cost, agg->env, memberExpr->get_member() );
+                                addTupleMembers( tupleType, aggrExpr, *agg, cost, memberExpr->get_member() );
                         } // if
                 } // for
@@ -1386 +1389 @@
 
         void AlternativeFinder::Finder::postvisit( MemberExpr *memberExpr ) {
-                alternatives.push_back( Alternative( memberExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ memberExpr->clone(), env } );
         }
 
@@ -1399 +1402 @@
                         // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
                         // can't construct in place and use vector::back
-                        Alternative newAlt( newExpr, env, Cost::zero, cost );
+                        Alternative newAlt{ newExpr, env, OpenVarSet{}, AssertionList{}, Cost::zero, cost };
                         PRINT(
                                 std::cerr << "decl is ";
@@ -1417 +1420 @@
                 // not sufficient to clone here, because variable's type may have changed
                 // since the VariableExpr was originally created.
-                alternatives.push_back( Alternative( new VariableExpr( variableExpr->var ), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ new VariableExpr{ variableExpr->var }, env } );
         }
 
         void AlternativeFinder::Finder::postvisit( ConstantExpr *constantExpr ) {
-                alternatives.push_back( Alternative( constantExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ constantExpr->clone(), env } );
         }
 
@@ -1427 +1430 @@
                 if ( sizeofExpr->get_isType() ) {
                         Type * newType = sizeofExpr->get_type()->clone();
-                        alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
+                        alternatives.push_back( Alternative{ 
+                                new SizeofExpr{ resolveTypeof( newType, indexer ) }, env } );
                 } else {
                         // find all alternatives for the argument to sizeof
@@ -1441 +1445 @@
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
-                        alternatives.push_back( Alternative( new SizeofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative{ 
+                                choice, new SizeofExpr( choice.expr->clone() ), Cost::zero } );
                 } // if
         }
@@ -1448 +1453 @@
                 if ( alignofExpr->get_isType() ) {
                         Type * newType = alignofExpr->get_type()->clone();
-                        alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
+                        alternatives.push_back( Alternative{ 
+                                new AlignofExpr{ resolveTypeof( newType, indexer ) }, env } );
                 } else {
                         // find all alternatives for the argument to sizeof
@@ -1462 +1468 @@
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
-                        alternatives.push_back( Alternative( new AlignofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative{ 
+                                choice, new AlignofExpr{ choice.expr->clone() }, Cost::zero } );
                 } // if
         }
@@ -1472 +1479 @@
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
-                                alternatives.push_back( Alternative( new OffsetofExpr( aggInst->clone(), dwt ), env, Cost::zero ) );
+                                alternatives.push_back( Alternative{ 
+                                        new OffsetofExpr{ aggInst->clone(), dwt }, env } );
                                 renameTypes( alternatives.back().expr );
                         } else {
@@ -1491 +1499 @@
 
         void AlternativeFinder::Finder::postvisit( OffsetofExpr *offsetofExpr ) {
-                alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ offsetofExpr->clone(), env } );
         }
 
         void AlternativeFinder::Finder::postvisit( OffsetPackExpr *offsetPackExpr ) {
-                alternatives.push_back( Alternative( offsetPackExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ offsetPackExpr->clone(), env } );
         }
 
@@ -1515 +1523 @@
                                 Cost cost = Cost::zero;
                                 Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative( new AttrExpr( newExpr, argType->clone() ), env, Cost::zero, cost ) );
+                                alternatives.push_back( Alternative{ 
+                                        new AttrExpr{ newExpr, argType->clone() }, env, OpenVarSet{}, AssertionList{},  
+                                        Cost::zero, cost } );
                                 for ( DeclarationWithType * retVal : function->returnVals ) {
                                         alternatives.back().expr->result = retVal->get_type()->clone();
@@ -1554 +1564 @@
                                 Cost cost = Cost::zero;
                                 Expression * newExpr = data.combine( cost );
-                                alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
+                                alternatives.push_back( Alternative{ 
+                                        newExpr, env, OpenVarSet{}, AssertionList{}, Cost::zero, cost } );
                                 renameTypes( alternatives.back().expr );
                         } // for
@@ -1569 +1580 @@
                 for ( const Alternative & first : firstFinder.alternatives ) {
                         for ( const Alternative & second : secondFinder.alternatives ) {
-                                TypeEnvironment compositeEnv;
-                                compositeEnv.simpleCombine( first.env );
+                                TypeEnvironment compositeEnv{ first.env };
                                 compositeEnv.simpleCombine( second.env );
-
-                                LogicalExpr *newExpr = new LogicalExpr( first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() );
-                                alternatives.push_back( Alternative( newExpr, compositeEnv, first.cost + second.cost ) );
+                                OpenVarSet openVars{ first.openVars };
+                                mergeOpenVars( openVars, second.openVars );
+                                AssertionList need{ first.need };
+                                need.insert( need.end(), second.need.begin(), second.need.end() );
+
+                                LogicalExpr *newExpr = new LogicalExpr{ 
+                                        first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() };
+                                alternatives.push_back( Alternative{ 
+                                        newExpr, compositeEnv, openVars, need, first.cost + second.cost } );
                         }
                 }
@@ -1595 +1611 @@
                         for ( const Alternative & second : secondFinder.alternatives ) {
                                 for ( const Alternative & third : thirdFinder.alternatives ) {
-                                        TypeEnvironment compositeEnv;
-                                        compositeEnv.simpleCombine( first.env );
+                                        TypeEnvironment compositeEnv{ first.env };
                                         compositeEnv.simpleCombine( second.env );
                                         compositeEnv.simpleCombine( third.env );
-
+                                        OpenVarSet openVars{ first.openVars };
+                                        mergeOpenVars( openVars, second.openVars );
+                                        mergeOpenVars( openVars, third.openVars );
+                                        AssertionSet needAssertions( first.need.begin(), first.need.end() );
+                                        needAssertions.insert( second.need.begin(), second.need.end() );
+                                        needAssertions.insert( third.need.begin(), third.need.end() );
+                                        AssertionSet haveAssertions;
+                                        
                                         // unify true and false types, then infer parameters to produce new alternatives
-                                        OpenVarSet openVars;
-                                        AssertionSet needAssertions, haveAssertions;
-                                        Alternative newAlt( 0, compositeEnv, first.cost + second.cost + third.cost );
                                         Type* commonType = nullptr;
-                                        if ( unify( second.expr->result, third.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                                                ConditionalExpr *newExpr = new ConditionalExpr( first.expr->clone(), second.expr->clone(), third.expr->clone() );
+                                        if ( unify( second.expr->result, third.expr->result, compositeEnv, 
+                                                        needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                                                ConditionalExpr *newExpr = new ConditionalExpr{ 
+                                                        first.expr->clone(), second.expr->clone(), third.expr->clone() };
                                                 newExpr->result = commonType ? commonType : second.expr->result->clone();
                                                 // convert both options to the conditional result type
-                                                newAlt.cost += computeExpressionConversionCost( newExpr->arg2, newExpr->result, indexer, newAlt.env );
-                                                newAlt.cost += computeExpressionConversionCost( newExpr->arg3, newExpr->result, indexer, newAlt.env );
-                                                newAlt.expr = newExpr;
+                                                Cost cost = first.cost + second.cost + third.cost;
+                                                cost += computeExpressionConversionCost( 
+                                                        newExpr->arg2, newExpr->result, indexer, compositeEnv );
+                                                cost += computeExpressionConversionCost( 
+                                                        newExpr->arg3, newExpr->result, indexer, compositeEnv );
+                                                // output alternative
+                                                Alternative newAlt{ 
+                                                        newExpr, compositeEnv, openVars, 
+                                                        AssertionList( needAssertions.begin(), needAssertions.end() ), cost };
                                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
                                         } // if
@@ -1625 +1652 @@
                 secondFinder.findWithAdjustment( commaExpr->get_arg2() );
                 for ( const Alternative & alt : secondFinder.alternatives ) {
-                        alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{ 
+                                alt, new CommaExpr{ newFirstArg->clone(), alt.expr->clone() }, alt.cost } );
                 } // for
                 delete newFirstArg;
@@ -1640 +1668 @@
                 for ( const Alternative & first : firstFinder.alternatives ) {
                         for ( const Alternative & second : secondFinder.alternatives ) {
-                                TypeEnvironment compositeEnv;
-                                compositeEnv.simpleCombine( first.env );
+                                TypeEnvironment compositeEnv{ first.env };
                                 compositeEnv.simpleCombine( second.env );
-                                OpenVarSet openVars;
-                                AssertionSet needAssertions, haveAssertions;
-                                Alternative newAlt( 0, compositeEnv, first.cost + second.cost );
+                                OpenVarSet openVars{ first.openVars };
+                                mergeOpenVars( openVars, second.openVars );
+                                AssertionSet needAssertions( first.need.begin(), first.need.end() );
+                                needAssertions.insert( second.need.begin(), second.need.end() );
+                                AssertionSet haveAssertions;
+
                                 Type* commonType = nullptr;
-                                if ( unify( first.expr->result, second.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                                        RangeExpr * newExpr = new RangeExpr( first.expr->clone(), second.expr->clone() );
+                                if ( unify( first.expr->result, second.expr->result, compositeEnv, needAssertions, 
+                                                haveAssertions, openVars, indexer, commonType ) ) {
+                                        RangeExpr * newExpr = 
+                                                new RangeExpr{ first.expr->clone(), second.expr->clone() };
                                         newExpr->result = commonType ? commonType : first.expr->result->clone();
-                                        newAlt.expr = newExpr;
+                                        Alternative newAlt{ 
+                                                newExpr, compositeEnv, openVars, 
+                                                AssertionList( needAssertions.begin(), needAssertions.end() ), 
+                                                first.cost + second.cost };
                                         inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
                                 } // if
@@ -1669 +1704 @@
 
                         TypeEnvironment compositeEnv;
-                        simpleCombineEnvironments( alts.begin(), alts.end(), compositeEnv );
-                        alternatives.push_back(
-                                Alternative{ new TupleExpr( exprs ), compositeEnv, sumCost( alts ) } );
+                        OpenVarSet openVars;
+                        AssertionSet need;
+                        for ( const Alternative& alt : alts ) {
+                                compositeEnv.simpleCombine( alt.env );
+                                mergeOpenVars( openVars, alt.openVars );
+                                need.insert( alt.need.begin(), alt.need.end() );
+                        }
+                        
+                        alternatives.push_back( Alternative{ 
+                                new TupleExpr{ exprs }, compositeEnv, openVars, 
+                                AssertionList( need.begin(), need.end() ), sumCost( alts ) } );
                 } // for
         }
 
         void AlternativeFinder::Finder::postvisit( TupleExpr *tupleExpr ) {
-                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleExpr->clone(), env } );
         }
 
         void AlternativeFinder::Finder::postvisit( ImplicitCopyCtorExpr * impCpCtorExpr ) {
-                alternatives.push_back( Alternative( impCpCtorExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ impCpCtorExpr->clone(), env } );
         }
 
@@ -1689 +1732 @@
                 finder.findWithoutPrune( ctorExpr->get_callExpr() );
                 for ( Alternative & alt : finder.alternatives ) {
-                        alternatives.push_back( Alternative( new ConstructorExpr( alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{ 
+                                alt, new ConstructorExpr( alt.expr->clone() ), alt.cost } );
                 }
         }
 
         void AlternativeFinder::Finder::postvisit( TupleIndexExpr *tupleExpr ) {
-                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleExpr->clone(), env } );
         }
 
         void AlternativeFinder::Finder::postvisit( TupleAssignExpr *tupleAssignExpr ) {
-                alternatives.push_back( Alternative( tupleAssignExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative{ tupleAssignExpr->clone(), env } );
         }
 
@@ -1707 +1751 @@
                         // ensure that the id is passed on to the UniqueExpr alternative so that the expressions are "linked"
                         UniqueExpr * newUnqExpr = new UniqueExpr( alt.expr->clone(), unqExpr->get_id() );
-                        alternatives.push_back( Alternative( newUnqExpr, alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative{ alt, newUnqExpr, alt.cost } );
                 }
         }
@@ -1715 +1759 @@
                 ResolvExpr::resolveStmtExpr( newStmtExpr, indexer );
                 // xxx - this env is almost certainly wrong, and needs to somehow contain the combined environments from all of the statements in the stmtExpr...
-                alternatives.push_back( Alternative( newStmtExpr, env, Cost::zero ) );
+                alternatives.push_back( Alternative{ newStmtExpr, env } );
         }
 
@@ -1737 +1781 @@
                         for ( Alternative & alt : finder.get_alternatives() ) {
                                 TypeEnvironment newEnv( alt.env );
-                                AssertionSet needAssertions, haveAssertions;
-                                OpenVarSet openVars;  // find things in env that don't have a "representative type" and claim those are open vars?
+                                AssertionSet needAssertions( alt.need.begin(), alt.need.end() );
+                                AssertionSet haveAssertions;
+                                OpenVarSet openVars( alt.openVars );  
+                                // xxx - find things in env that don't have a "representative type" and claim 
+                                // those are open vars?
                                 PRINT(
                                         std::cerr << "  @ " << toType << " " << initAlt.designation << std::endl;
                                 )
-                                // It's possible that a cast can throw away some values in a multiply-valued expression.  (An example is a
-                                // cast-to-void, which casts from one value to zero.)  Figure out the prefix of the subexpression results
-                                // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
-                                // to.
+                                // It's possible that a cast can throw away some values in a multiply-valued 
+                                // expression. (An example is a cast-to-void, which casts from one value to 
+                                // zero.)  Figure out the prefix of the subexpression results that are cast 
+                                // directly.  The candidate is invalid if it has fewer results than there are 
+                                // types to cast to.
                                 int discardedValues = alt.expr->result->size() - toType->size();
                                 if ( discardedValues < 0 ) continue;
-                                // xxx - may need to go into tuple types and extract relevant types and use unifyList. Note that currently, this does not
-                                // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
+                                // xxx - may need to go into tuple types and extract relevant types and use 
+                                // unifyList. Note that currently, this does not allow casting a tuple to an 
+                                // atomic type (e.g. (int)([1, 2, 3]))
+                                
                                 // unification run for side-effects
-                                unify( toType, alt.expr->result, newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
+                                unify( toType, alt.expr->result, newEnv, needAssertions, haveAssertions, openVars, 
+                                        indexer );
+                                // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
 
                                 Cost thisCost = castCost( alt.expr->result, toType, indexer, newEnv );
@@ -1757 +1809 @@
                                         // count one safe conversion for each value that is thrown away
                                         thisCost.incSafe( discardedValues );
-                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        Alternative newAlt{ 
+                                                new InitExpr{ 
+                                                        restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() }, 
+                                                newEnv, openVars, 
+                                                AssertionList( needAssertions.begin(), needAssertions.end() ), 
+                                                alt.cost, thisCost };
                                         inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
                                 }

src/ResolvExpr/Cost.h

@@ -10 +10 @@
 // Created On       : Sun May 17 09:39:50 2015
 // Last Modified By : Aaron B. Moss
-// Last Modified On : Tue Oct 02 14:40:00 2018
-// Update Count     : 6
+// Last Modified On : Fri Oct 05 14:32:00 2018
+// Update Count     : 7
 //
 
@@ -46 +46 @@
                 bool operator!=( const Cost &other ) const;
                 friend std::ostream &operator<<( std::ostream &os, const Cost &cost );
+                // returns negative for *this < other, 0 for *this == other, positive for *this > other
+                int compare( const Cost &other ) const;
 
                 static const Cost zero;
@@ -56 +58 @@
                 static const Cost safe;
                 static const Cost reference;
+
           private:
-                int compare( const Cost &other ) const;
-
                 int unsafeCost;     ///< Unsafe (narrowing) conversions
                 int polyCost;       ///< Count of parameters and return values bound to some poly type
@@ -172 +173 @@
         }
 
+        inline int Cost::compare( const Cost &other ) const {
+                if ( *this == infinity ) return +1;
+                if ( other == infinity ) return -1;
+
+                int c = unsafeCost - other.unsafeCost; if ( c ) return c;
+                c = polyCost - other.polyCost; if ( c ) return c;
+                c = varCost - other.varCost; if ( c ) return c;
+                c = specCost - other.specCost; if ( c ) return c;
+                c = safeCost - other.safeCost; if ( c ) return c;
+                return referenceCost - other.referenceCost;
+        }
+
         inline bool Cost::operator==( const Cost &other ) const {
                 return unsafeCost == other.unsafeCost

src/ResolvExpr/ResolvMode.h

@@ -10 +10 @@
 // Created On       : Mon Jun 11 13:28:00 2018
 // Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 11 13:28:00 2018
-// Update Count     : 1
+// Last Modified On : Fri Oct 05 13:46:00 2018
+// Update Count     : 2
 //
 
@@ -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 checkAssertions;  ///< Should assertions be checked? [false]
+                const bool resolveAssns;     ///< Resolve assertions? [false]
 
         private:
-                constexpr ResolvMode(bool a, bool p, bool ff, bool ca)
-                        : adjust(a), prune(p), failFast(ff), checkAssertions(ca) {}
+                constexpr ResolvMode(bool a, bool p, bool ff, bool ra) 
+                : adjust(a), prune(p), failFast(ff), resolveAssns(ra) {}
 
         public:
                 /// Default settings
-                constexpr ResolvMode()
-                        : adjust(false), prune(true), failFast(true), checkAssertions(false) {}
+                constexpr ResolvMode() : adjust(false), prune(true), failFast(true), resolveAssns(false) {}
                 
                 /// With adjust flag set; turns array and function types into equivalent pointers
@@ -43 +42 @@
                 /// one resulting alternative
                 static constexpr ResolvMode withoutFailFast() { return { true, true, false, false }; }
+
+                /// The same mode, but with resolveAssns turned on; for top-level calls
+                ResolvMode atTopLevel() const { return { adjust, prune, failFast, true }; }
         };
 } // namespace ResolvExpr

src/ResolvExpr/Resolver.cc

@@ -14 +14 @@
 //
 
-#include <stddef.h>                      // for NULL
 #include <cassert>                       // for strict_dynamic_cast, assert
 #include <memory>                        // for allocator, allocator_traits<...
 #include <tuple>                         // for get
-#include <vector>
+#include <vector>                        // for vector
 
 #include "Alternative.h"                 // for Alternative, AltList
@@ -171 +170 @@
                 void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, ResolvMode mode = ResolvMode{} ) {
                         assertf( untyped, "expected a non-null expression." );
+
+                        // xxx - this isn't thread-safe, but should work until we parallelize the resolver
+                        static unsigned recursion_level = 0;
+
+                        ++recursion_level;
                         TypeEnvironment env;
                         AlternativeFinder finder( indexer, env );
-                        finder.find( untyped, mode );
+                        finder.find( untyped, recursion_level == 1 ? mode.atTopLevel() : mode );
+                        --recursion_level;
 
                         #if 0
@@ -186 +191 @@
                         #endif
 
+                        // produce filtered list of alternatives
                         AltList candidates;
                         for ( Alternative & alt : finder.get_alternatives() ) {
@@ -193 +199 @@
                         }
 
-                        // xxx - if > 1 alternative with same cost, ignore deleted and pick from remaining
-                        // choose the lowest cost expression among the candidates
+                        // produce invalid error if no candidates
+                        if ( candidates.empty() ) {
+                                SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
+                        }
+
+                        // search for cheapest candidate
                         AltList winners;
-                        findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
-                        if ( winners.size() == 0 ) {
-                                SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
-                        } else if ( winners.size() != 1 ) {
+                        bool seen_undeleted = false;
+                        for ( unsigned i = 0; i < candidates.size(); ++i ) {
+                                int c = winners.empty() ? -1 : candidates[i].cost.compare( winners.front().cost );
+
+                                if ( c > 0 ) continue; // skip more expensive than winner
+
+                                if ( c < 0 ) {
+                                        // reset on new cheapest
+                                        seen_undeleted = ! findDeletedExpr( candidates[i].expr );
+                                        winners.clear();
+                                } else /* if ( c == 0 ) */ {
+                                        if ( findDeletedExpr( candidates[i].expr ) ) {
+                                                // skip deleted expression if already seen one equivalent-cost not
+                                                if ( seen_undeleted ) continue;
+                                        } else if ( ! seen_undeleted ) {
+                                                // replace list of equivalent-cost deleted expressions with one non-deleted
+                                                winners.clear();
+                                                seen_undeleted = true;
+                                        }
+                                }
+
+                                winners.emplace_back( candidates[i] );
+                        }
+
+                        // promote alternative.cvtCost to .cost
+                        // xxx - I don't know why this is done, but I'm keeping the behaviour from findMinCost
+                        for ( Alternative& winner : winners ) {
+                                winner.cost = winner.cvtCost;
+                        }
+                        
+                        // produce ambiguous errors, if applicable
+                        if ( winners.size() != 1 ) {
                                 std::ostringstream stream;
                                 stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
@@ -208 +246 @@
                         }
 
-                        // there is one unambiguous interpretation - move the expression into the with statement
-                        Alternative & choice = winners.front();
-                        if ( findDeletedExpr( choice.expr ) ) {
+                        // single selected choice
+                        Alternative& choice = winners.front();
+
+                        // fail on only expression deleted
+                        if ( ! seen_undeleted ) {
                                 SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
                         }
+
+                        // xxx - check for ambiguous expressions
+                        
+                        // output selected choice
                         alt = std::move( choice );
                 }
@@ -358 +402 @@
 
         void Resolver::previsit( ObjectDecl *objectDecl ) {
-                // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that class-variable
-                // initContext is changed multiple time because the LHS is analysed twice. The second analysis changes
-                // initContext because of a function type can contain object declarations in the return and parameter types. So
-                // each value of initContext is retained, so the type on the first analysis is preserved and used for selecting
-                // the RHS.
+                // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that 
+                // class-variable initContext is changed multiple time because the LHS is analysed twice. 
+                // The second analysis changes initContext because of a function type can contain object 
+                // declarations in the return and parameter types. So each value of initContext is 
+                // retained, so the type on the first analysis is preserved and used for selecting the RHS.
                 GuardValue( currentObject );
                 currentObject = CurrentObject( objectDecl->get_type() );
@@ -398 +442 @@
 
         void Resolver::postvisit( FunctionDecl *functionDecl ) {
-                // default value expressions have an environment which shouldn't be there and trips up later passes.
-                // xxx - it might be necessary to somehow keep the information from this environment, but I can't currently
-                // see how it's useful.
+                // default value expressions have an environment which shouldn't be there and trips up 
+                // later passes.
+                // xxx - it might be necessary to somehow keep the information from this environment, but I 
+                // can't currently see how it's useful.
                 for ( Declaration * d : functionDecl->type->parameters ) {
                         if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
@@ -750 +795 @@
                 initExpr->expr = nullptr;
                 std::swap( initExpr->env, newExpr->env );
-                // InitExpr may have inferParams in the case where the expression specializes a function pointer,
-                // and newExpr may already have inferParams of its own, so a simple swap is not sufficient.
+                // InitExpr may have inferParams in the case where the expression specializes a function 
+                // pointer, and newExpr may already have inferParams of its own, so a simple swap is not 
+                // sufficient.
                 newExpr->spliceInferParams( initExpr );
                 delete initExpr;
 
-                // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
+                // get the actual object's type (may not exactly match what comes back from the resolver 
+                // due to conversions)
                 Type * initContext = currentObject.getCurrentType();
 
@@ -767 +814 @@
                                         if ( isCharType( pt->get_base() ) ) {
                                                 if ( CastExpr *ce = dynamic_cast< CastExpr * >( newExpr ) ) {
-                                                        // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
+                                                        // strip cast if we're initializing a char[] with a char *, 
+                                                        // e.g.  char x[] = "hello";
                                                         newExpr = ce->get_arg();
                                                         ce->set_arg( nullptr );
@@ -789 +837 @@
                 // move cursor into brace-enclosed initializer-list
                 currentObject.enterListInit();
-                // xxx - fix this so that the list isn't copied, iterator should be used to change current element
+                // xxx - fix this so that the list isn't copied, iterator should be used to change current 
+                // element
                 std::list<Designation *> newDesignations;
                 for ( auto p : group_iterate(listInit->get_designations(), listInit->get_initializers()) ) {
-                        // iterate designations and initializers in pairs, moving the cursor to the current designated object and resolving
-                        // the initializer against that object.
+                        // iterate designations and initializers in pairs, moving the cursor to the current 
+                        // designated object and resolving the initializer against that object.
                         Designation * des = std::get<0>(p);
                         Initializer * init = std::get<1>(p);
@@ -823 +872 @@
                 // fall back on C-style initializer
                 delete ctorInit->get_ctor();
-                ctorInit->set_ctor( NULL );
+                ctorInit->set_ctor( nullptr );
                 delete ctorInit->get_dtor();
-                ctorInit->set_dtor( NULL );
+                ctorInit->set_dtor( nullptr );
                 maybeAccept( ctorInit->get_init(), *visitor );
         }
@@ -868 +917 @@
 
                 // xxx - todo -- what about arrays?
-                // if ( dtor == NULL && InitTweak::isIntrinsicCallStmt( ctorInit->get_ctor() ) ) {
+                // if ( dtor == nullptr && InitTweak::isIntrinsicCallStmt( ctorInit->get_ctor() ) ) {
                 //      // can reduce the constructor down to a SingleInit using the
                 //      // second argument from the ctor call, since
                 //      delete ctorInit->get_ctor();
-                //      ctorInit->set_ctor( NULL );
+                //      ctorInit->set_ctor( nullptr );
 
                 //      Expression * arg =

src/ResolvExpr/TypeEnvironment.h

@@ -68 +68 @@
         typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
         typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
+
+        /// merges one set of open vars into another
+        static inline void mergeOpenVars( OpenVarSet& dst, const OpenVarSet& src ) {
+                for ( const auto& entry : src ) { dst[ entry.first ] = entry.second; }
+        }
 
         void printAssertionSet( const AssertionSet &, std::ostream &, int indent = 0 );

src/ResolvExpr/module.mk

@@ -34 +34 @@
        ResolvExpr/CurrentObject.cc \
        ResolvExpr/ExplodedActual.cc \
-       ResolvExpr/SpecCost.cc
+       ResolvExpr/SpecCost.cc \
+       ResolvExpr/ResolveAssertions.cc

src/Tuples/Explode.h

@@ -44 +44 @@
         template<typename OutputIterator>
         void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
+                        const ResolvExpr::OpenVarSet& openVars, const ResolvExpr::AssertionList& need, 
                         const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
-                *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost };
+                *out++ = ResolvExpr::Alternative{ expr, env, openVars, need, cost, cvtCost };
         }
 
         /// Append alternative to an ExplodedActual
         static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
-                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
+                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::OpenVarSet&, 
+                        const ResolvExpr::AssertionList&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
-                /// xxx -- merge environment, cost?
+                /// xxx -- merge environment, openVars, need, cost?
         }
 
@@ -68 +70 @@
                                         // distribute reference cast over all components
                                         append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
-                                                alt.env, alt.cost, alt.cvtCost );
+                                                alt.env, alt.openVars, alt.need, alt.cost, alt.cvtCost );
                                 }
                                 // in tuple assignment, still need to handle the other cases, but only if not already handled here (don't want to output too many alternatives)
@@ -102 +104 @@
                 } else {
                         // atomic (non-tuple) type - output a clone of the expression in a new alternative
-                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.cost, alt.cvtCost );
+                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.openVars, alt.need,  
+                                alt.cost, alt.cvtCost );
                 }
         }

src/Tuples/TupleAssignment.cc

@@ -62 +62 @@
                 struct Matcher {
                   public:
-                        Matcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs, const
-                                ResolvExpr::AltList& rhs );
+                        Matcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList& lhs, 
+                                const ResolvExpr::AltList& rhs );
                         virtual ~Matcher() {}
+                        
                         virtual void match( std::list< Expression * > &out ) = 0;
                         ObjectDecl * newObject( UniqueName & namer, Expression * expr );
+
+                        void combineState( const ResolvExpr::Alternative& alt ) {
+                                compositeEnv.simpleCombine( alt.env );
+                                ResolvExpr::mergeOpenVars( openVars, alt.openVars );
+                                need.insert( alt.need.begin(), alt.need.end() );
+                        }
+
+                        void combineState( const ResolvExpr::AltList& alts ) {
+                                for ( const ResolvExpr::Alternative& alt : alts ) { combineState( alt ); }
+                        }
+                        
                         ResolvExpr::AltList lhs, rhs;
                         TupleAssignSpotter &spotter;
@@ -72 +84 @@
                         std::list< ObjectDecl * > tmpDecls;
                         ResolvExpr::TypeEnvironment compositeEnv;
+                        ResolvExpr::OpenVarSet openVars;
+                        ResolvExpr::AssertionSet need;
                 };
 
@@ -245 +259 @@
                 }
 
-                // extract expressions from the assignment alternatives to produce a list of assignments that
-                // together form a single alternative
+                // extract expressions from the assignment alternatives to produce a list of assignments 
+                // that together form a single alternative
                 std::list< Expression *> solved_assigns;
                 for ( ResolvExpr::Alternative & alt : current ) {
                         solved_assigns.push_back( alt.expr->clone() );
-                }
-                // combine assignment environments into combined expression environment
-                simpleCombineEnvironments( current.begin(), current.end(), matcher->compositeEnv );
+                        matcher->combineState( alt );
+                }
+                
                 // xxx -- was push_front
-                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative(
-                        new TupleAssignExpr(solved_assigns, matcher->tmpDecls), matcher->compositeEnv,
-                        ResolvExpr::sumCost( current ) + matcher->baseCost ) );
+                currentFinder.get_alternatives().push_back( ResolvExpr::Alternative{
+                        new TupleAssignExpr{ solved_assigns, matcher->tmpDecls }, matcher->compositeEnv, 
+                        matcher->openVars, 
+                        ResolvExpr::AssertionList( matcher->need.begin(), matcher->need.end() ), 
+                        ResolvExpr::sumCost( current ) + matcher->baseCost } );
         }
 
@@ -263 +279 @@
         : lhs(lhs), rhs(rhs), spotter(spotter),
           baseCost( ResolvExpr::sumCost( lhs ) + ResolvExpr::sumCost( rhs ) ) {
-                simpleCombineEnvironments( lhs.begin(), lhs.end(), compositeEnv );
-                simpleCombineEnvironments( rhs.begin(), rhs.end(), compositeEnv );
+                combineState( lhs ); 
+                combineState( rhs );
         }