Changeset 7c70089 for src/Tuples

Timestamp:

Mar 17, 2017, 1:36:27 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

31ce3d6

Parents:

b32ada31 (diff), 946bcca (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Tuples

Files:

• TupleAssignment.cc (modified) (2 diffs)
• TupleExpansion.cc (modified) (3 diffs)

src/Tuples/TupleAssignment.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:04:51 2017
-// Update Count     : 7
+// Last Modified On : Fri Mar 17 09:43:03 2017
+// Update Count     : 8
 //
 
@@ -200 +200 @@
                                 assert( type );
                                 type->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
-                                type->set_isLvalue( true ); // xxx - might not need this
+                                type->set_lvalue( true ); // xxx - might not need this
                                 expr = new CastExpr( expr, castType );
                         }

src/Tuples/TupleExpansion.cc

@@ -126 +126 @@
                 /// given a expression representing the member and an expression representing the aggregate,
                 /// reconstructs a flattened UntypedMemberExpr with the right precedence
-                Expression * reconstructMemberExpr( Expression * member, Expression * aggr ) {
+                Expression * reconstructMemberExpr( Expression * member, Expression * aggr, CodeLocation & loc ) {
                         if ( UntypedMemberExpr * memberExpr = dynamic_cast< UntypedMemberExpr * >( member ) ) {
                                 // construct a new UntypedMemberExpr with the correct structure , and recursively
                                 // expand that member expression.
                                 MemberTupleExpander expander;
-                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member(), new UntypedMemberExpr( memberExpr->get_aggregate(), aggr->clone() ) );
-
+                                UntypedMemberExpr * inner = new UntypedMemberExpr( memberExpr->get_aggregate(), aggr->clone() );
+                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member(), inner );
+                                inner->location = newMemberExpr->location = loc;
                                 memberExpr->set_member(nullptr);
                                 memberExpr->set_aggregate(nullptr);
@@ -139 +140 @@
                         } else {
                                 // not a member expression, so there is nothing to do but attach and return
-                                return new UntypedMemberExpr( member, aggr->clone() );
+                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( member, aggr->clone() );
+                                newMemberExpr->location = loc;
+                                return newMemberExpr;
                         }
                 }
@@ -152 +155 @@
                         aggr = new UniqueExpr( aggr );
                         for ( Expression *& expr : tupleExpr->get_exprs() ) {
-                                expr = reconstructMemberExpr( expr, aggr );
+                                expr = reconstructMemberExpr( expr, aggr, memberExpr->location );
+                                expr->location = memberExpr->location;
                         }
                         delete aggr;
+                        tupleExpr->location = memberExpr->location;
                         return tupleExpr;
                 } else {
                         // there may be a tuple expr buried in the aggregate
                         // xxx - this is a memory leak
-                        return new UntypedMemberExpr( memberExpr->get_member()->clone(), memberExpr->get_aggregate()->acceptMutator( *this ) );
+                        UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member()->clone(), memberExpr->get_aggregate()->acceptMutator( *this ) );
+                        newMemberExpr->location = memberExpr->location;
+                        return newMemberExpr;
                 }
         }