Changeset 5af62f1 for src/ResolvExpr

Timestamp:

Sep 10, 2016, 12:53:36 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

908cc83

Parents:

add7117

Message:

major refactoring of Rodolfo's tuple assignment code

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (3 diffs)
• AlternativeFinder.h (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -142 +142 @@
                 }
 
-                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 ( AltList::iterator 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 );
-                }
-
                 template< typename InputIterator >
                 void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {
@@ -254 +234 @@
         template< typename StructOrUnionType >
         void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+
+                // // member must be either a tuple expression or a name expr
+                // if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() ) ) {
+                //  addAggMembers( structInst, agg->expr, agg->cost, nameExpr->get_name() );
+                // } else {
+                //  TupleExpr * tupleExpr = safe_dynamic_cast< TupleExpr * >( memberExpr->get_member() );
+                //  // xxx - ...
+                //  assert( false );
+                // }
+                // if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( memberExpr->get_member() ) ) {
+
+                // }
                 NameExpr * nameExpr = safe_dynamic_cast< NameExpr * >( member );
                 const std::string & name = nameExpr->get_name();
@@ -639 +631 @@
                 combos( argAlternatives.begin(), argAlternatives.end(), back_inserter( possibilities ) );
 
-                Tuples::TupleAssignSpotter tassign( this );
-                if ( tassign.isTupleAssignment( untypedExpr, possibilities ) ) {
-                        // take care of possible tuple assignments, or discard expression
-                        return;
-                } // else ...
+                // take care of possible tuple assignments
+                // if not tuple assignment, assignment is taken care of as a normal function call
+                Tuples::handleTupleAssignment( *this, untypedExpr, possibilities );
 
                 AltList candidates;

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
-          /// Runs a new alternative finder on each element in [begin, end)
-          /// and writes each alternative finder to out.
+                /// 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, Expression * member );
@@ -91 +89 @@
 
         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 );
+        }
 } // namespace ResolvExpr