Changes in src/Tuples/Explode.h [0b5d871:6bbce58]

File:

• src/Tuples/Explode.h (modified) (2 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 * );
+
+        static inline CastExpr * isReferenceCast( Expression * expr ) {
+                if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                        if ( dynamic_cast< ReferenceType * >( castExpr->result ) ) {
+                                return castExpr;
+                        }
+                }
+                return nullptr;
+        }
 
         /// helper function used by explode
@@ -33 +44 @@
                 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 ) ) {
+                        if ( CastExpr * castExpr = isReferenceCast( expr ) ) {
                                 ResolvExpr::AltList alts;
                                 explodeUnique( castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );