Changeset 90152a4 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/ResolvExpr/AlternativeFinder.h (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.h

@@ -38 +38 @@
         using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
 
-        class AlternativeFinder : public Visitor {
+        class AlternativeFinder {
           public:
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
@@ -94 +94 @@
                 void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out );
           private:
-                virtual void visit( ApplicationExpr *applicationExpr );
-                virtual void visit( UntypedExpr *untypedExpr );
-                virtual void visit( AddressExpr *addressExpr );
-                virtual void visit( LabelAddressExpr *labelExpr );
-                virtual void visit( CastExpr *castExpr );
-                virtual void visit( VirtualCastExpr *castExpr );
-                virtual void visit( UntypedMemberExpr *memberExpr );
-                virtual void visit( MemberExpr *memberExpr );
-                virtual void visit( NameExpr *variableExpr );
-                virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr );
-                virtual void visit( SizeofExpr *sizeofExpr );
-                virtual void visit( AlignofExpr *alignofExpr );
-                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
-                virtual void visit( OffsetofExpr *offsetofExpr );
-                virtual void visit( OffsetPackExpr *offsetPackExpr );
-                virtual void visit( AttrExpr *attrExpr );
-                virtual void visit( LogicalExpr *logicalExpr );
-                virtual void visit( ConditionalExpr *conditionalExpr );
-                virtual void visit( CommaExpr *commaExpr );
-                virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
-                virtual void visit( ConstructorExpr * ctorExpr );
-                virtual void visit( RangeExpr * rangeExpr );
-                virtual void visit( UntypedTupleExpr *tupleExpr );
-                virtual void visit( TupleExpr *tupleExpr );
-                virtual void visit( TupleIndexExpr *tupleExpr );
-                virtual void visit( TupleAssignExpr *tupleExpr );
-                virtual void visit( UniqueExpr *unqExpr );
-                virtual void visit( StmtExpr *stmtExpr );
-                virtual void visit( UntypedInitExpr *initExpr );
-
-                /// Adds alternatives for anonymous members
-                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, Expression * member );
-                /// 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 );
-                /// 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 );
-                /// Takes a final result and checks if its assertions can be satisfied
-                template<typename OutputIterator>
-                void validateFunctionAlternative( const Alternative &func, ArgPack& result, const std::vector<ArgPack>& results, OutputIterator out );
-                /// Finds matching alternatives for a function, given a set of arguments
-                template<typename OutputIterator>
-                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const ExplodedArgs& args, OutputIterator out );
-                /// Checks if assertion parameters match for a new alternative
-                template< typename OutputIterator >
-                void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
-
+                struct Finder;
                 const SymTab::Indexer &indexer;
                 AltList alternatives;
@@ -174 +126 @@
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
 
+        /// Adds type variables to the open variable set and marks their assertions
+        void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions );
+
         template< typename InputIterator >
         void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {