Changes in src/ResolvExpr/AlternativeFinder.cc [64ac636:4b0f997]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (7 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 17:02:51 2016
-// Update Count     : 29
+// Last Modified On : Fri Mar 17 09:14:17 2017
+// Update Count     : 30
 //
 
@@ -211 +211 @@
         }
 
-        // std::unordered_map< Expression *, UniqueExpr * > ;
+        void AlternativeFinder::addAnonConversions( const Alternative & alt ) {
+                // adds anonymous member interpretations whenever an aggregate value type is seen.
+                Expression * expr = alt.expr->clone();
+                std::unique_ptr< Expression > manager( expr ); // RAII for expr
+                alt.env.apply( expr->get_result() );
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( expr->get_result() ) ) {
+                        NameExpr nameExpr( "" );
+                        addAggMembers( structInst, expr, alt.cost+Cost( 0, 0, 1 ), alt.env, &nameExpr );
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( expr->get_result() ) ) {
+                        NameExpr nameExpr( "" );
+                        addAggMembers( unionInst, expr, alt.cost+Cost( 0, 0, 1 ), alt.env, &nameExpr );
+                } // if
+        }
 
         template< typename StructOrUnionType >
@@ -220 +232 @@
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
+
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
                                 alternatives.push_back( Alternative( new MemberExpr( dwt, expr->clone() ), env, newCost ) );
                                 renameTypes( alternatives.back().expr );
+                                addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
                         } else {
                                 assert( false );
@@ -730 +744 @@
                 if ( candidates.empty() && ! errors.isEmpty() ) { throw errors; }
 
+                // compute conversionsion costs
                 for ( AltList::iterator withFunc = candidates.begin(); withFunc != candidates.end(); ++withFunc ) {
                         Cost cvtCost = computeConversionCost( *withFunc, indexer );
@@ -751 +766 @@
                         } // if
                 } // for
+                // function may return struct or union value, in which case we need to add alternatives for implicit conversions to each of the anonymous members
+                for ( const Alternative & alt : alternatives ) {
+                        addAnonConversions( alt );
+                }
+
                 candidates.clear();
                 candidates.splice( candidates.end(), alternatives );
@@ -772 +792 @@
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
-                return expr->has_result() && expr->get_result()->get_isLvalue();
+                return expr->has_result() && expr->get_result()->get_lvalue();
         }
 
@@ -885 +905 @@
                         )
                         renameTypes( alternatives.back().expr );
-                        if ( StructInstType *structInst = dynamic_cast< StructInstType* >( (*i)->get_type() ) ) {
-                                NameExpr 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 ), env, &nameExpr );
-                        } // if
+                        addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
                 } // for
         }