Changes in src/ResolvExpr/AlternativeFinder.h [b6fe7e6:8f7cea1]

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 );
+                /// 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 offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
@@ -89 +90 @@
 
         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 );
 } // namespace ResolvExpr