Changeset b1e63ac5 for src/SynTree/Mutator.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

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

src/SynTree/Mutator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:45:19 2017
-// Update Count     : 22
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:43:00 2017
+// Update Count     : 24
 //
 
@@ -77 +77 @@
 TypeDecl *Mutator::mutate( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( typeDecl );
+        typeDecl->set_init( maybeMutate( typeDecl->get_init(), *this ) );
         return typeDecl;
 }
@@ -152 +153 @@
 }
 
+Statement *Mutator::mutate( ThrowStmt *throwStmt ) {
+        throwStmt->set_expr( maybeMutate( throwStmt->get_expr(), *this ) );
+        throwStmt->set_target( maybeMutate( throwStmt->get_target(), *this ) );
+        return throwStmt;
+}
+
 Statement *Mutator::mutate( TryStmt *tryStmt ) {
         tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
         mutateAll( tryStmt->get_catchers(), *this );
+        tryStmt->set_finally( maybeMutate( tryStmt->get_finally(), *this ) );
         return tryStmt;
 }
@@ -160 +168 @@
 Statement *Mutator::mutate( CatchStmt *catchStmt ) {
         catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
+        catchStmt->set_cond( maybeMutate( catchStmt->get_cond(), *this ) );
         catchStmt->set_body( maybeMutate( catchStmt->get_body(), *this ) );
         return catchStmt;
@@ -373 +382 @@
 }
 
-Expression *Mutator::mutate( UntypedValofExpr *valofExpr ) {
-        valofExpr->set_env( maybeMutate( valofExpr->get_env(), *this ) );
-        valofExpr->set_result( maybeMutate( valofExpr->get_result(), *this ) );
-        return valofExpr;
-}
-
 Expression *Mutator::mutate( RangeExpr *rangeExpr ) {
         rangeExpr->set_env( maybeMutate( rangeExpr->get_env(), *this ) );
@@ -404 +407 @@
         tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
         tupleExpr->set_tuple( maybeMutate( tupleExpr->get_tuple(), *this ) );
-        return tupleExpr;
-}
-
-Expression *Mutator::mutate( MemberTupleExpr *tupleExpr ) {
-        tupleExpr->set_env( maybeMutate( tupleExpr->get_env(), *this ) );
-        tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
-        tupleExpr->set_member( maybeMutate( tupleExpr->get_member(), *this ) );
-        tupleExpr->set_aggregate( maybeMutate( tupleExpr->get_aggregate(), *this ) );
         return tupleExpr;
 }
@@ -438 +433 @@
 }
 
+Expression *Mutator::mutate( UntypedInitExpr * initExpr ) {
+        initExpr->set_env( maybeMutate( initExpr->get_env(), *this ) );
+        initExpr->set_result( maybeMutate( initExpr->get_result(), *this ) );
+        initExpr->set_expr( maybeMutate( initExpr->get_expr(), *this ) );
+        // not currently mutating initAlts, but this doesn't matter since this node is only used in the resolver.
+        return initExpr;
+}
+
+Expression *Mutator::mutate( InitExpr * initExpr ) {
+        initExpr->set_env( maybeMutate( initExpr->get_env(), *this ) );
+        initExpr->set_result( maybeMutate( initExpr->get_result(), *this ) );
+        initExpr->set_expr( maybeMutate( initExpr->get_expr(), *this ) );
+        initExpr->set_designation( maybeMutate( initExpr->get_designation(), *this ) );
+        return initExpr;
+}
+
 
 Type *Mutator::mutate( VoidType *voidType ) {
@@ -510 +521 @@
         mutateAll( tupleType->get_forall(), *this );
         mutateAll( tupleType->get_types(), *this );
+        mutateAll( tupleType->get_members(), *this );
         return tupleType;
 }
@@ -546 +558 @@
 
 
+Designation *Mutator::mutate( Designation * designation ) {
+        mutateAll( designation->get_designators(), *this );
+        return designation;
+}
+
 Initializer *Mutator::mutate( SingleInit *singleInit ) {
         singleInit->set_value( singleInit->get_value()->acceptMutator( *this ) );
@@ -552 +569 @@
 
 Initializer *Mutator::mutate( ListInit *listInit ) {
-        mutateAll( listInit->get_designators(), *this );
+        mutateAll( listInit->get_designations(), *this );
         mutateAll( listInit->get_initializers(), *this );
         return listInit;