Changeset 9c23f31 for src/SynTree/Mutator.cc

Timestamp:

Sep 24, 2016, 12:19:33 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3b5e3aa

Parents:

2298f728 (diff), 7ae930a (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:

fix conflicts

File:

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

src/SynTree/Mutator.cc

@@ -339 +339 @@
 }
 
-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;
 }
 
@@ -349 +350 @@
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;
+}
+
+Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
+        mutateAll( valofExpr->get_results(), *this );
+        return valofExpr;
 }
 
@@ -447 +453 @@
 }
 
+Type *Mutator::mutate( ZeroType *zeroType ) {
+        mutateAll( zeroType->get_forall(), *this );
+        return zeroType;
+}
+
+Type *Mutator::mutate( OneType *oneType ) {
+        mutateAll( oneType->get_forall(), *this );
+        return oneType;
+}
+
 Initializer *Mutator::mutate( SingleInit *singleInit ) {
         singleInit->set_value( singleInit->get_value()->acceptMutator( *this ) );