Changes in src/Tuples/Explode.h [7870799:417117e]

File:

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

src/Tuples/Explode.h

@@ -51 +51 @@
         template<typename OutputIterator>
         void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
-                        const ResolvExpr::OpenVarSet& openVars, const ResolvExpr::AssertionList& need,
+                        const ResolvExpr::OpenVarSet& openVars, const ResolvExpr::AssertionList& need, 
                         const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
                 *out++ = ResolvExpr::Alternative{ expr, env, openVars, need, cost, cvtCost };
@@ -58 +58 @@
         /// Append alternative to an ExplodedActual
         static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
-                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::OpenVarSet&,
+                        const ResolvExpr::TypeEnvironment&, const ResolvExpr::OpenVarSet&, 
                         const ResolvExpr::AssertionList&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
@@ -111 +111 @@
                 } 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.openVars, alt.need,
+                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.openVars, alt.need,  
                                 alt.cost, alt.cvtCost );
                 }
@@ -174 +174 @@
 template< typename Output >
 void explodeRecursive(
-        const ast::CastExpr *, const ResolvExpr::Candidate &,
-        const ast::SymbolTable &, Output &&
+        const ast::CastExpr * expr, const ResolvExpr::Candidate & arg,
+        const ast::SymbolTable & symtab, Output && out
 ) {
 }
@@ -210 +210 @@
                         }
                         // Cast a reference away to a value-type to allow further explosion.
-                        if ( dynamic_cast< const ast::ReferenceType *>( local->result.get() ) ) {
+                        if ( local->result.as< ast::ReferenceType >() ) {
                                 local = new ast::CastExpr{ local, tupleType };
                         }
@@ -220 +220 @@
                                 // delete idx;
                         }
-                        // delete local;
                 }
         } else {
@@ -240 +239 @@
 /// explode list of candidates into flattened list of candidates
 template< typename Output >
-void explode(
-        const ResolvExpr::CandidateList & cands, const ast::SymbolTable & symtab, Output && out,
+void explode( 
+        const ResolvExpr::CandidateList & cands, const ast::SymbolTable & symtab, Output && out, 
         bool isTupleAssign = false
 ) {