Changeset d60ccbf for src/SynTree/Mutator.h

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 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, string, with_gc

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/SynTree/Mutator.h (modified) (4 diffs)

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 29 16:34:08 2015
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 23 23:24:18 2015
+// Update Count     : 7
 //
 #include <cassert>
@@ -26 +26 @@
         virtual ~Mutator();
   public:
-        virtual ObjectDecl* mutate( ObjectDecl *objectDecl );
+        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
         virtual DeclarationWithType* mutate( FunctionDecl *functionDecl );
         virtual Declaration* mutate( StructDecl *aggregateDecl );
@@ -37 +37 @@
         virtual CompoundStmt* mutate( CompoundStmt *compoundStmt );
         virtual Statement* mutate( ExprStmt *exprStmt );
+        virtual Statement* mutate( AsmStmt *asmStmt );
         virtual Statement* mutate( IfStmt *ifStmt );
         virtual Statement* mutate( WhileStmt *whileStmt );
@@ -70 +71 @@
         virtual Expression* mutate( SolvedTupleExpr *tupleExpr );
         virtual Expression* mutate( TypeExpr *typeExpr );
+        virtual Expression* mutate( AsmExpr *asmExpr );
         virtual Expression* mutate( UntypedValofExpr *valofExpr );