Changes in src/Tuples/Explode.h [62194cb:c43c171]

File:

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

src/Tuples/Explode.h

@@ -16 +16 @@
 #pragma once
 
-#include <iterator>                     // for back_inserter, back_insert_iterator
-#include <utility>                      // for forward
+#include <iterator>                  // for back_inserter, back_insert_iterator
 
-#include "ResolvExpr/Alternative.h"     // for Alternative, AltList
-#include "ResolvExpr/ExplodedActual.h"  // for ExplodedActual
-#include "SynTree/Expression.h"         // for Expression, UniqueExpr, AddressExpr
-#include "SynTree/Type.h"               // for TupleType, Type
-#include "Tuples.h"                     // for maybeImpure
+#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
 
 namespace SymTab {
@@ -41 +39 @@
         }
 
-        /// Append alternative to an OutputIterator of Alternatives
-        template<typename OutputIterator>
-        void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env, 
-                        const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
-                *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost };
-        }
-
-        /// Append alternative to an ExplodedActual
-        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr, 
-                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
-                ea.exprs.emplace_back( expr );
-                /// xxx -- merge environment, cost?
-        }
-
         /// helper function used by explode
-        template< typename Output >
-        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, 
-                        const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign ) {
+        template< typename OutputIterator >
+        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 = isReferenceCast( expr ) ) {
                                 ResolvExpr::AltList alts;
-                                explodeUnique( 
-                                        castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
+                                explodeUnique( castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
                                 for ( ResolvExpr::Alternative & alt : alts ) {
                                         // distribute reference cast over all components
-                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ), 
-                                                alt.env, alt.cost, alt.cvtCost );
+                                        alt.expr = distributeReference( alt.expr );
+                                        *out++ = alt;
                                 }
                                 // in tuple assignment, still need to handle the other cases, but only if not already handled here (don't want to output too many alternatives)
@@ -79 +61 @@
                                 // can open tuple expr and dump its exploded components
                                 for ( Expression * expr : tupleExpr->get_exprs() ) {
-                                        explodeUnique( expr, alt, indexer, std::forward<Output>(out), isTupleAssign );
+                                        explodeUnique( expr, alt, indexer, out, isTupleAssign );
                                 }
                         } else {
@@ -95 +77 @@
                                 for ( unsigned int i = 0; i < tupleType->size(); i++ ) {
                                         TupleIndexExpr * idx = new TupleIndexExpr( arg->clone(), i );
-                                        explodeUnique( idx, alt, indexer, std::forward<Output>(out), isTupleAssign );
+                                        explodeUnique( idx, alt, indexer, out, isTupleAssign );
                                         delete idx;
                                 }
@@ -102 +84 @@
                 } else {
                         // atomic (non-tuple) type - output a clone of the expression in a new alternative
-                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.cost, alt.cvtCost );
+                        *out++ = ResolvExpr::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 Output >
-        void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer, 
-                        Output&& out, bool isTupleAssign = false ) {
-                explodeUnique( alt.expr, alt, indexer, std::forward<Output>(out), isTupleAssign );
+        template< typename OutputIterator >
+        void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer, OutputIterator out, bool isTupleAssign = false ) {
+                explodeUnique( alt.expr, alt, indexer, out, isTupleAssign );
         }
 
         // explode list of alternatives
-        template< typename AltIterator, typename Output >
-        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, 
-                        Output&& out, bool isTupleAssign = false ) {
+        template< typename AltIterator, typename OutputIterator >
+        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, OutputIterator out, bool isTupleAssign = false ) {
                 for ( ; altBegin != altEnd; ++altBegin ) {
-                        explode( *altBegin, indexer, std::forward<Output>(out), isTupleAssign );
+                        explode( *altBegin, indexer, out, isTupleAssign );
                 }
         }
 
-        template< typename Output >
-        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out, 
-                        bool isTupleAssign = false ) {
-                explode( alts.begin(), alts.end(), indexer, std::forward<Output>(out), isTupleAssign );
+        template< typename OutputIterator >
+        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, OutputIterator out, bool isTupleAssign = false ) {
+                explode( alts.begin(), alts.end(), indexer, out, isTupleAssign );
         }
 } // namespace Tuples