Changeset 87b5bf0 for src/SynTree

Timestamp:

Jun 29, 2016, 2:30:12 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

e64365c

Parents:

7305915 (diff), 2fb2ad5 (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' of plg2:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• AddStmtVisitor.cc (added)
• AddStmtVisitor.h (added)
• Label.h (added)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.cc (modified) (5 diffs)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/SynTree/Statement.cc

@@ -87 +87 @@
         Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.size() == 0 )
+        if ( type == BranchStmt::Goto && target.empty() )
                 throw SemanticError("goto without target");
 }

src/SynTree/Statement.h

@@ -22 +22 @@
 #include "Common/SemanticError.h"
 #include "Type.h"
+#include "Label.h"
 
 class Statement {

src/SynTree/SynTree.h

@@ -113 +113 @@
 class Constant;
 
-typedef std::string Label;
+// typedef std::string Label;
+class Label;
 typedef unsigned int UniqueId;
 

src/SynTree/Visitor.cc

@@ -39 +39 @@
 }
 
-void Visitor::visit( AggregateDecl *aggregateDecl ) {
+void Visitor::handleAggregateDecl( AggregateDecl *aggregateDecl ) {
         acceptAll( aggregateDecl->get_parameters(), *this );
         acceptAll( aggregateDecl->get_members(), *this );
@@ -45 +45 @@
 
 void Visitor::visit( StructDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( UnionDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( EnumDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( TraitDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::visit( NamedTypeDecl *typeDecl ) {
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::handleNamedTypeDecl( NamedTypeDecl *typeDecl ) {
         acceptAll( typeDecl->get_parameters(), *this );
         acceptAll( typeDecl->get_assertions(), *this );
@@ -67 +67 @@
 
 void Visitor::visit( TypeDecl *typeDecl ) {
-        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
 void Visitor::visit( TypedefDecl *typeDecl ) {
-        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
@@ -330 +330 @@
 }
 
-void Visitor::visit( ReferenceToType *aggregateUseType ) {
+void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
         acceptAll( aggregateUseType->get_forall(), *this );
         acceptAll( aggregateUseType->get_parameters(), *this );
@@ -336 +336 @@
 
 void Visitor::visit( StructInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( UnionInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( EnumInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( TraitInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
         acceptAll( aggregateUseType->get_members(), *this );
 }
 
 void Visitor::visit( TypeInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 

src/SynTree/Visitor.h

@@ -104 +104 @@
         virtual void visit( Constant *constant );
   private:
-        virtual void visit( AggregateDecl *aggregateDecl );
-        virtual void visit( NamedTypeDecl *typeDecl );
-        virtual void visit( ReferenceToType *aggregateUseType );
+        virtual void handleAggregateDecl( AggregateDecl *aggregateDecl );
+        virtual void handleNamedTypeDecl( NamedTypeDecl *typeDecl );
+        virtual void handleReferenceToType( ReferenceToType *aggregateUseType );
 };
 

src/SynTree/module.mk

@@ -46 +46 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
+       SynTree/AddStmtVisitor.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc