Changeset 65660bd for src/ResolvExpr

Timestamp:

Sep 22, 2016, 8:14:56 AM (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:

ac9ca96

Parents:

1132b62

git-author:

Rob Schluntz <rschlunt@…> (09/21/16 23:43:37)

git-committer:

Rob Schluntz <rschlunt@…> (09/22/16 08:14:56)

Message:

replace multiple-returning functions with tuple-returning functions, implement tuple ctor/dtor, allow N-arg tuple assignment

Location:

src/ResolvExpr

Files:

• Alternative.h (modified) (1 diff)
• AlternativeFinder.cc (modified) (1 diff)
• Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Alternative.h ¶

@@ -45 +45 @@
                 TypeEnvironment env;
         };
-
-        /// helper function used by explode
-        template< typename OutputIterator >
-        void explodeUnique( Expression * expr, const Alternative & alt, OutputIterator out ) {
-                Type * res = expr->get_result();
-                if ( TupleType * tupleType = dynamic_cast< TupleType * > ( res ) ) {
-                        if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( expr ) ) {
-                                // can open tuple expr and dump its exploded components
-                                for ( Expression * expr : tupleExpr->get_exprs() ) {
-                                        explodeUnique( expr, alt, out );
-                                }
-                        } else {
-                                // tuple type, but not tuple expr - need to refer to single instance of the argument
-                                // expression and index into its components
-                                UniqueExpr * unq = new UniqueExpr( expr->clone() );
-                                for ( unsigned int i = 0; i < tupleType->size(); i++ ) {
-                                        TupleIndexExpr * idx = new TupleIndexExpr( unq->clone(), i );
-                                        explodeUnique( idx, alt, out );
-                                        delete idx;
-                                }
-                                delete unq;
-                        }
-                } else {
-                        // atomic (non-tuple) type - output a clone of the expression in a new alternative
-                        *out++ = Alternative( expr->clone(), alt.env, alt.cost, alt.cvtCost );
-                }
-        }
-
-        /// expands a tuple-valued alternative into multiple alternatives, each with a non-tuple-type
-        template< typename OutputIterator >
-        void explode( const Alternative &alt, OutputIterator out ) {
-                explodeUnique( alt.expr, alt, out );
-        }
-
-        // explode list of alternatives
-        template< typename OutputIterator >
-        void explode( const AltList & alts, OutputIterator out ) {
-                for ( const Alternative & alt : alts ) {
-                        explode( alt, out );
-                }
-        }
 } // namespace ResolvExpr
 

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -435 +435 @@
                 // flatten actuals so that each actual has an atomic (non-tuple) type
                 AltList exploded;
-                explode( actuals, back_inserter( exploded ) );
+                Tuples::explode( actuals, back_inserter( exploded ) );
 
                 AltList::iterator actualExpr = exploded.begin();

src/ResolvExpr/Resolver.cc ¶

@@ -38 +38 @@
 
                 virtual void visit( FunctionDecl *functionDecl );
-                virtual void visit( ObjectDecl *functionDecl );
+                virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( TypeDecl *typeDecl );
                 virtual void visit( EnumDecl * enumDecl );
@@ -442 +442 @@
                                 (*iter)->accept( *this );
                         } // for
+                } else if ( TupleType * tt = dynamic_cast< TupleType * > ( initContext ) ) {
+                        for ( Type * t : *tt ) {
+                                if ( iter == end ) break;
+                                initContext = t;
+                                (*iter++)->accept( *this );
+                        }
                 } else if ( StructInstType * st = dynamic_cast< StructInstType * >( initContext ) ) {
                         resolveAggrInit( st->get_baseStruct(), iter, end );