Changeset add7117 for src/SynTree/Mutator.cc

Timestamp:

Sep 10, 2016, 11:08:47 AM (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:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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' into tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

File:

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

src/SynTree/Mutator.cc

@@ -340 +340 @@
 }
 
-Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
-        mutateAll( valofExpr->get_results(), *this );
-        return valofExpr;
+Expression* Mutator::mutate( ConstructorExpr *ctorExpr ) {
+        mutateAll( ctorExpr->get_results(), *this );
+        ctorExpr->set_callExpr( maybeMutate( ctorExpr->get_callExpr(), *this ) );
+        return ctorExpr;
 }
 
@@ -350 +351 @@
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;
+}
+
+Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
+        mutateAll( valofExpr->get_results(), *this );
+        return valofExpr;
 }