Changeset 5fb6830 for src

Timestamp:

Aug 22, 2017, 7:09:33 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

fc56cdbf

Parents:

0b5d871

Message:

Simplify tuple assignment code now that explode is reference-cast-aware

File:

• src/Tuples/TupleAssignment.cc (modified) (2 diffs)

src/Tuples/TupleAssignment.cc

@@ -182 +182 @@
 
                 ResolvExpr::Alternative lhsAlt = alts.front();
-                // peel off the cast that exists on ctor/dtor expressions
-                bool isCast = false;
-                if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( lhsAlt.expr ) ) {
-                        lhsAlt.expr = castExpr->get_arg();
-                        castExpr->set_arg( nullptr );
-                        delete castExpr;
-                        isCast = true;
+                // explode is aware of casts - ensure every LHS expression is sent into explode with a reference cast
+                if ( ! dynamic_cast< CastExpr * >( lhsAlt.expr ) ) {
+                        lhsAlt.expr = new CastExpr( lhsAlt.expr, new ReferenceType( Type::Qualifiers(), lhsAlt.expr->get_result()->clone() ) );
                 }
 
@@ -194 +190 @@
                 explode( lhsAlt, spotter.currentFinder.get_indexer(), back_inserter(lhs), true );
 
-                // and finally, re-add the cast to each lhs expr, so that qualified tuple fields can be constructed
-                if ( isCast ) {
-                        for ( ResolvExpr::Alternative & alt : lhs ) {
-                                Expression *& expr = alt.expr;
-                                Type * type = expr->get_result()->clone();
-                                type->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
-                                expr = new CastExpr( expr, new ReferenceType( Type::Qualifiers(), type ) );
-                        }
-                }
-
                 for ( ResolvExpr::Alternative & alt : lhs ) {
                         // every LHS value must be a reference - some come in with a cast expression, if it doesn't just cast to reference here.
-                        // TODO: can this somehow be merge with the cast code directly above?
                         if ( ! dynamic_cast< ReferenceType * >( alt.expr->get_result() ) ) {
                                 alt.expr = new CastExpr( alt.expr, new ReferenceType( Type::Qualifiers(), alt.expr->get_result()->clone() ) );