Changeset 6eb8948 for src/SynTree/Mutator.cc

Timestamp:

Sep 12, 2016, 6:32:46 PM (8 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:

f006f01

Parents:

8f7cea1

git-author:

Rob Schluntz <rschlunt@…> (09/12/16 18:24:34)

git-committer:

Rob Schluntz <rschlunt@…> (09/12/16 18:32:46)

Message:

make TupleAssignment? generate temporaries, add StmtExpr? for GCC statement expressions, expand tuple assignment expressions, collapse SolvedTupleExpr?, MassAssignExpr?, and MultipleAssignExpr? into TupleAssignExpr?

File:

• src/SynTree/Mutator.cc (modified) (3 diffs)

src/SynTree/Mutator.cc

@@ -308 +308 @@
 }
 
-Expression *Mutator::mutate( TupleExpr *tupleExpr ) {
-        mutateAll( tupleExpr->get_results(), *this );
-        mutateAll( tupleExpr->get_exprs(), *this );
-        return tupleExpr;
-}
-
-Expression *Mutator::mutate( SolvedTupleExpr *tupleExpr ) {
-        mutateAll( tupleExpr->get_results(), *this );
-        mutateAll( tupleExpr->get_exprs(), *this );
-        return tupleExpr;
-}
-
 Expression *Mutator::mutate( TypeExpr *typeExpr ) {
         mutateAll( typeExpr->get_results(), *this );
@@ -364 +352 @@
 }
 
+Expression *Mutator::mutate( TupleExpr *tupleExpr ) {
+        mutateAll( tupleExpr->get_results(), *this );
+        mutateAll( tupleExpr->get_exprs(), *this );
+        return tupleExpr;
+}
+
 Expression *Mutator::mutate( TupleIndexExpr *tupleExpr ) {
         mutateAll( tupleExpr->get_results(), *this );
@@ -377 +371 @@
 }
 
-Expression *Mutator::mutate( MultipleAssignExpr *assignExpr ) {
+Expression *Mutator::mutate( TupleAssignExpr *assignExpr ) {
         mutateAll( assignExpr->get_results(), *this );
-        assignExpr->set_lhs( maybeMutate( assignExpr->get_lhs(), *this ) );
-        assignExpr->set_rhs( maybeMutate( assignExpr->get_rhs(), *this ) );
+        mutateAll( assignExpr->get_tempDecls(), *this );
+        mutateAll( assignExpr->get_assigns(), *this );
         return assignExpr;
 }
 
-Expression *Mutator::mutate( MassAssignExpr *assignExpr ) {
-        mutateAll( assignExpr->get_results(), *this );
-        assignExpr->set_lhs( maybeMutate( assignExpr->get_lhs(), *this ) );
-        assignExpr->set_rhs( maybeMutate( assignExpr->get_rhs(), *this ) );
-        return assignExpr;
+Expression *Mutator::mutate( StmtExpr *stmtExpr ) {
+        mutateAll( stmtExpr->get_results(), *this );
+        stmtExpr->set_statements( maybeMutate( stmtExpr->get_statements(), *this ) );
+        return stmtExpr;
 }