Changeset 96f9ef5

Timestamp:

Sep 12, 2017, 5:10:27 PM (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:

a0c7dc36

Parents:

93389c1

Message:

Modify TypeDecl? mutate to return a Declaration

Location:

src

Files:

• Common/PassVisitor.h (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (2 diffs)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -145 +145 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl ) override final;
         virtual Declaration* mutate( TraitDecl *aggregateDecl ) override final;
-        virtual TypeDecl* mutate( TypeDecl *typeDecl ) override final;
+        virtual Declaration* mutate( TypeDecl *typeDecl ) override final;
         virtual Declaration* mutate( TypedefDecl *typeDecl ) override final;
         virtual AsmDecl* mutate( AsmDecl *asmDecl ) override final;

src/Common/PassVisitor.impl.h

@@ -976 +976 @@
 
 template< typename pass_type >
-TypeDecl * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
-        MUTATE_BODY( TypeDecl, node );
+Declaration * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
+        MUTATE_BODY( Declaration, node );
 }
 

src/SymTab/Validate.cc

@@ -752 +752 @@
 
                 typedeclNames[ typeDecl->get_name() ] = typeDecl;
-                return Mutator::mutate( typeDecl );
+                return dynamic_cast<TypeDecl *>( Mutator::mutate( typeDecl ) );
         }
 

src/SynTree/Declaration.h

@@ -136 +136 @@
         Expression *get_bitfieldWidth() const { return bitfieldWidth; }
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
+
+        static ObjectDecl * newObject( const std::string & name, Type * type, Initializer * init );
 
         virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
@@ -230 +232 @@
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
 

src/SynTree/Mutator.cc

@@ -78 +78 @@
 }
 
-TypeDecl * Mutator::mutate( TypeDecl *typeDecl ) {
+Declaration * Mutator::mutate( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( typeDecl );
         typeDecl->set_init( maybeMutate( typeDecl->get_init(), *this ) );

src/SynTree/Mutator.h

@@ -31 +31 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl );
         virtual Declaration* mutate( TraitDecl *aggregateDecl );
-        virtual TypeDecl* mutate( TypeDecl *typeDecl );
+        virtual Declaration* mutate( TypeDecl *typeDecl );
         virtual Declaration* mutate( TypedefDecl *typeDecl );
         virtual AsmDecl* mutate( AsmDecl *asmDecl );