Changeset 90152a4 for src/Tuples/Explode.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

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

src/Tuples/Explode.h

@@ -43 +43 @@
         /// Append alternative to an OutputIterator of Alternatives
         template<typename OutputIterator>
-        void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env, 
+        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 };
@@ -49 +49 @@
 
         /// Append alternative to an ExplodedActual
-        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr, 
+        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
                         const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
@@ -57 +57 @@
         /// helper function used by explode
         template< typename Output >
-        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, 
+        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt,
                         const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign ) {
                 if ( isTupleAssign ) {
@@ -63 +63 @@
                         if ( CastExpr * castExpr = isReferenceCast( expr ) ) {
                                 ResolvExpr::AltList alts;
-                                explodeUnique( 
+                                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() ), 
+                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
                                                 alt.env, alt.cost, alt.cvtCost );
                                 }
@@ -108 +108 @@
         /// 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, 
+        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 );
@@ -115 +115 @@
         // explode list of alternatives
         template< typename AltIterator, typename Output >
-        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, 
+        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer,
                         Output&& out, bool isTupleAssign = false ) {
                 for ( ; altBegin != altEnd; ++altBegin ) {
@@ -123 +123 @@
 
         template< typename Output >
-        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out, 
+        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 );