Changeset 4f57930

Timestamp:

Apr 11, 2017, 5:11:59 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

da1c772, eaa5043

Parents:

87c5f40 (diff), 32bcef7 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• doc/generic_types/generic_types.tex (modified) (1 diff)
• src/ResolvExpr/AlternativeFinder.cc (modified) (5 diffs)
• src/ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• src/SymTab/Autogen.cc (modified) (1 diff)
• src/SynTree/Expression.cc (modified) (1 diff)

doc/generic_types/generic_types.tex

@@ -226 +226 @@
 \end{lstlisting}
 Within the block, the nested version of @<@ performs @>@ and this local version overrides the built-in @<@ so it is passed to @qsort@.
-Hence, programmers can easily form a local environments, adding and modifying appropriate functions, to maximize reuse of other existing functions and types.
+Hence, programmers can easily form local environments, adding and modifying appropriate functions, to maximize reuse of other existing functions and types.
 
 Finally, \CFA allows variable overloading:

src/ResolvExpr/AlternativeFinder.cc

@@ -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 );
@@ -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
         }

src/ResolvExpr/AlternativeFinder.h

@@ -78 +78 @@
                 void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out );
 
+                /// Adds alternatives for anonymous members
+                void addAnonConversions( const Alternative & alt );
                 /// 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 );

src/SymTab/Autogen.cc

@@ -498 +498 @@
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
                 if ( returnVal ) {
-                        if ( isDynamicLayout ) makeUnionFieldsAssignment( srcParam, returnVal, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                        else funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                        funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
                 }
         }

src/SynTree/Expression.cc

@@ -339 +339 @@
                         return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
                 } else {
-                        assertf( false, "makeSub expects struct or union type for aggregate" );
+                        assertf( false, "makeSub expects struct or union type for aggregate, but got: %s", toString( t ).c_str() );
                 }
         }