Changeset aefcc3b for src/ResolvExpr/Alternative.h

Timestamp:

Sep 20, 2016, 4:14:13 PM (10 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, stuck-waitfor-destruct, with_gc

Children:

23b6643f

Parents:

8c49c0e

Message:

major change to instantiateFunction to match arguments against the formal parameter's structure rather than the reverse

File:

• src/ResolvExpr/Alternative.h (modified) (5 diffs)

src/ResolvExpr/Alternative.h

@@ -32 +32 @@
                 Alternative( const Alternative &other );
                 Alternative &operator=( const Alternative &other );
+                Alternative( Alternative && other );
+                Alternative &operator=( Alternative && other );
                 ~Alternative();
 
@@ -49 +51 @@
                 Type * res = expr->get_result();
                 if ( TupleType * tupleType = dynamic_cast< TupleType * > ( res ) ) {
-                        if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( alt.expr ) ) {
+                        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++ ) {
@@ -63 +68 @@
                         }
                 } 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 );
                 }
@@ -69 +75 @@
         /// expands a tuple-valued alternative into multiple alternatives, each with a non-tuple-type
         template< typename OutputIterator >
-        void explode( Alternative &alt, OutputIterator out ) {
+        void explode( const Alternative &alt, OutputIterator out ) {
                 explodeUnique( alt.expr, alt, out );
         }
@@ -75 +81 @@
         // explode list of alternatives
         template< typename OutputIterator >
-        void explode( AltList & alts, OutputIterator out ) {
-                for ( Alternative & alt : alts ) {
+        void explode( const AltList & alts, OutputIterator out ) {
+                for ( const Alternative & alt : alts ) {
                         explode( alt, out );
                 }