Changeset d63eeb0 for src/SynTree/Mutator.cc

Timestamp:

Feb 9, 2016, 3:25:05 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

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

src/SynTree/Mutator.cc

@@ -22 +22 @@
 #include "Expression.h"
 #include "Constant.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 Mutator::Mutator() {}
@@ -259 +259 @@
         }
         return alignofExpr;
+}
+
+Expression *Mutator::mutate( UntypedOffsetofExpr *offsetofExpr ) {
+        mutateAll( offsetofExpr->get_results(), *this );
+        offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
+        return offsetofExpr;
+}
+
+Expression *Mutator::mutate( OffsetofExpr *offsetofExpr ) {
+        mutateAll( offsetofExpr->get_results(), *this );
+        offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
+        offsetofExpr->set_member( maybeMutate( offsetofExpr->get_member(), *this ) );
+        return offsetofExpr;
 }