Changeset add7117 for src/ResolvExpr

Timestamp:

Sep 10, 2016, 11:08:47 AM (8 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:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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 tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

Location:

src/ResolvExpr

Files:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -209 +209 @@
         }
 
-        void AlternativeFinder::find( Expression *expr, bool adjust ) {
+        void AlternativeFinder::find( Expression *expr, bool adjust, bool prune ) {
                 expr->accept( *this );
                 if ( alternatives.empty() ) {
@@ -219 +219 @@
                         }
                 }
-                PRINT(
-                        std::cerr << "alternatives before prune:" << std::endl;
-                        printAlts( alternatives, std::cerr );
-                )
-                AltList::iterator oldBegin = alternatives.begin();
-                pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
-                if ( alternatives.begin() == oldBegin ) {
-                        std::ostringstream stream;
-                        stream << "Can't choose between alternatives for expression ";
-                        expr->print( stream );
-                        stream << "Alternatives are:";
-                        AltList winners;
-                        findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
-                        printAlts( winners, stream, 8 );
-                        throw SemanticError( stream.str() );
-                }
-                alternatives.erase( oldBegin, alternatives.end() );
-                PRINT(
-                        std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
-                )
+                if ( prune ) {
+                        PRINT(
+                                std::cerr << "alternatives before prune:" << std::endl;
+                                printAlts( alternatives, std::cerr );
+                        )
+                        AltList::iterator oldBegin = alternatives.begin();
+                        pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
+                        if ( alternatives.begin() == oldBegin ) {
+                                std::ostringstream stream;
+                                stream << "Can't choose between alternatives for expression ";
+                                expr->print( stream );
+                                stream << "Alternatives are:";
+                                AltList winners;
+                                findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
+                                printAlts( winners, stream, 8 );
+                                throw SemanticError( stream.str() );
+                        }
+                        alternatives.erase( oldBegin, alternatives.end() );
+                        PRINT(
+                                std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
+                        )
+                }
 
                 // Central location to handle gcc extension keyword for all expression types.
@@ -246 +248 @@
         }
 
-        void AlternativeFinder::findWithAdjustment( Expression *expr ) {
-                find( expr, true );
+        void AlternativeFinder::findWithAdjustment( Expression *expr, bool prune ) {
+                find( expr, true, prune );
         }
 
         template< typename StructOrUnionType >
-        void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, Expression * member ) {
+        void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
                 NameExpr * nameExpr = safe_dynamic_cast< NameExpr * >( member );
                 const std::string & name = nameExpr->get_name();
-
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
@@ -813 +814 @@
                         if ( agg->expr->get_results().size() == 1 ) {
                                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( agg->expr->get_results().front() ) ) {
-                                        addAggMembers( structInst, agg->expr, agg->cost, memberExpr->get_member() );
+                                        addAggMembers( structInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
                                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( agg->expr->get_results().front() ) ) {
-                                        addAggMembers( unionInst, agg->expr, agg->cost, memberExpr->get_member() );
+                                        addAggMembers( unionInst, agg->expr, agg->cost, agg->env, memberExpr->get_member() );
                                 } // if
                         } // if
@@ -843 +844 @@
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( (*i)->get_type() ) ) {
                                 NameExpr nameExpr( "" );
-                                addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), &nameExpr );
+                                addAggMembers( structInst, &newExpr, Cost( 0, 0, 1 ), env, &nameExpr );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( (*i)->get_type() ) ) {
                                 NameExpr nameExpr( "" );
-                                addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), &nameExpr );
+                                addAggMembers( unionInst, &newExpr, Cost( 0, 0, 1 ), env, &nameExpr );
                         } // if
                 } // for
@@ -1067 +1068 @@
                 alternatives.push_back( Alternative( impCpCtorExpr->clone(), env, Cost::zero ) );
         }
+
+        void AlternativeFinder::visit( ConstructorExpr * ctorExpr ) {
+                AlternativeFinder finder( indexer, env );
+                // don't prune here, since it's guaranteed all alternatives will have the same type
+                // (giving the alternatives different types is half of the point of ConstructorExpr nodes)
+                finder.findWithAdjustment( ctorExpr->get_callExpr(), false );
+                for ( Alternative & alt : finder.alternatives ) {
+                        alternatives.push_back( Alternative( new ConstructorExpr( alt.expr->clone() ), alt.env, alt.cost ) );
+                }
+        }
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativeFinder.h

@@ -29 +29 @@
           public:
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
-                void find( Expression *expr, bool adjust = false );
+                void find( Expression *expr, bool adjust = false, bool prune = true );
                 /// Calls find with the adjust flag set; adjustment turns array and function types into equivalent pointer types
-                void findWithAdjustment( Expression *expr );
+                void findWithAdjustment( Expression *expr, bool prune = true );
                 AltList &get_alternatives() { return alternatives; }
 
@@ -66 +66 @@
                 virtual void visit( TupleExpr *tupleExpr );
                 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)
@@ -74 +75 @@
           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, Expression * member );
+                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 );