Changeset 1f44196 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

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

src/ResolvExpr/AlternativeFinder.h

@@ -67 +67 @@
                 virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
                 virtual void visit( ConstructorExpr * ctorExpr );
-          public:  // xxx - temporary hack - should make Tuples::TupleAssignment a friend
+                virtual void visit( TupleIndexExpr *tupleExpr );
+                virtual void visit( TupleAssignExpr *tupleExpr );
+                virtual void visit( UniqueExpr *unqExpr );
+                /// Runs a new alternative finder on each element in [begin, end)
+                /// and writes each alternative finder to out.
                 template< typename InputIterator, typename OutputIterator >
                 void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out );
 
-          private:
                 /// 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 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 );
-                bool instantiateFunction( std::list< DeclarationWithType* >& formals, /*const*/ AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave );
+                bool instantiateFunction( std::list< DeclarationWithType* >& formals, const AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave, AltList & out );
                 template< typename OutputIterator >
-                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, AltList &actualAlt, OutputIterator out );
+                void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const AltList &actualAlt, OutputIterator out );
                 template< typename OutputIterator >
                 void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
@@ -89 +94 @@
 
         Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env );
+
+        template< typename InputIterator, typename OutputIterator >
+        void findMinCost( InputIterator begin, InputIterator end, OutputIterator out ) {
+                AltList alternatives;
+
+                // select the alternatives that have the minimum parameter cost
+                Cost minCost = Cost::infinity;
+                for ( InputIterator i = begin; i != end; ++i ) {
+                        if ( i->cost < minCost ) {
+                                minCost = i->cost;
+                                i->cost = i->cvtCost;
+                                alternatives.clear();
+                                alternatives.push_back( *i );
+                        } else if ( i->cost == minCost ) {
+                                i->cost = i->cvtCost;
+                                alternatives.push_back( *i );
+                        }
+                }
+                std::copy( alternatives.begin(), alternatives.end(), out );
+        }
+
+        Cost sumCost( const AltList &in );
+
+        template< typename InputIterator >
+        void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {
+                while ( begin != end ) {
+                        result.simpleCombine( (*begin++).env );
+                }
+        }
 } // namespace ResolvExpr