Changes in src/Tuples/Explode.h [0b5d871:03321e4]

File:

• src/Tuples/Explode.h (modified) (4 diffs)

src/Tuples/Explode.h

@@ -16 +16 @@
 #pragma once
 
-#include "ResolvExpr/AlternativeFinder.h"
-#include "ResolvExpr/Resolver.h"
+#include <iterator>                  // for back_inserter, back_insert_iterator
 
-#include "SynTree/Expression.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
+#include "ResolvExpr/Alternative.h"  // for Alternative, AltList
+#include "SynTree/Expression.h"      // for Expression, UniqueExpr, AddressExpr
+#include "SynTree/Type.h"            // for TupleType, Type
+#include "Tuples.h"                  // for maybeImpure
 
-#include "Tuples.h"
+namespace SymTab {
+class Indexer;
+}  // namespace SymTab
 
 namespace Tuples {
-        Expression * distributeReference( Expression * );
+        /// helper function used by explode to properly distribute
+        /// '&' across a tuple expression
+        Expression * distributeAddr( Expression * expr );
 
         /// helper function used by explode
@@ -32 +36 @@
         void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, const SymTab::Indexer & indexer, OutputIterator out, bool isTupleAssign ) {
                 if ( isTupleAssign ) {
-                        // tuple assignment needs CastExprs to be recursively exploded to easily get at all of the components
-                        if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                        // tuple assignment needs AddressExprs to be recursively exploded to easily get at all of the components
+                        if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
                                 ResolvExpr::AltList alts;
-                                explodeUnique( castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
+                                explodeUnique( addrExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
                                 for ( ResolvExpr::Alternative & alt : alts ) {
-                                        // distribute reference cast over all components
-                                        alt.expr = distributeReference( alt.expr );
+                                        // distribute '&' over all components
+                                        alt.expr = distributeAddr( alt.expr );
                                         *out++ = alt;
                                 }
@@ -45 +49 @@
                         }
                 }
-                Type * res = expr->get_result()->stripReferences();
+                Type * res = expr->get_result();
                 if ( TupleType * tupleType = dynamic_cast< TupleType * > ( res ) ) {
                         if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * >( expr ) ) {
@@ -53 +57 @@
                                 }
                         } else {
-                                // tuple type, but not tuple expr - recursively index into its components.
-                                // if expr type is reference, convert to value type
+                                // tuple type, but not tuple expr - recursively index into its components
                                 Expression * arg = expr->clone();
-                                if ( Tuples::maybeImpureIgnoreUnique( arg ) ) {
+                                if ( Tuples::maybeImpure( arg ) && ! dynamic_cast< UniqueExpr * >( arg ) ) {
                                         // expressions which may contain side effects require a single unique instance of the expression.
                                         arg = new UniqueExpr( arg );
-                                }
-                                // cast reference to value type to facilitate further explosion
-                                if ( dynamic_cast<ReferenceType *>( arg->get_result() ) ) {
-                                        arg = new CastExpr( arg, tupleType->clone() );
                                 }
                                 for ( unsigned int i = 0; i < tupleType->size(); i++ ) {