Changeset 71806e0 for src/SynTree

Timestamp:

Nov 10, 2022, 8:21:54 PM (20 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

7491f97, e4d7c1c

Parents:

639e4fc

Message:

Rename InlineValueDecl? to InlineMemberDecl?

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• InlineMemberDecl.cc (moved) (moved from src/SynTree/InlineValueDecl.cc) (2 diffs)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/SynTree/Declaration.h

@@ -450 +450 @@
 
 
-class InlineValueDecl : public DeclarationWithType {
+class InlineMemberDecl : public DeclarationWithType {
         typedef DeclarationWithType Parent;
   public:
         Type * type;
 
-        InlineValueDecl( const std::string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Type * type,
+        InlineMemberDecl( const std::string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Type * type,
                                 const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
-        InlineValueDecl( const InlineValueDecl & other );
-        virtual ~InlineValueDecl();
+        InlineMemberDecl( const InlineMemberDecl & other );
+        virtual ~InlineMemberDecl();
 
         virtual Type * get_type() const override { return type; }
         virtual void set_type(Type * newType) override { type = newType; }
 
-        static InlineValueDecl * newInlineValueDecl( const std::string & name, Type * type );
-
-        virtual InlineValueDecl * clone() const override { return new InlineValueDecl( *this ); }
+        static InlineMemberDecl * newInlineMemberDecl( const std::string & name, Type * type );
+
+        virtual InlineMemberDecl * clone() const override { return new InlineMemberDecl( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
         virtual void accept( Visitor & v ) const override { v.visit( this ); }

src/SynTree/InlineMemberDecl.cc

@@ -9 +9 @@
 #include "Type.h"                // for Type, Type::StorageClasses, Type::Fu...
 
-InlineValueDecl::InlineValueDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage,
+InlineMemberDecl::InlineMemberDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage,
 Type * type, const std::list< Attribute * >attributes, Type::FuncSpecifiers fs) 
     : Parent( name, scs, linkage, attributes, fs ), type( type ) {}
 
-InlineValueDecl::InlineValueDecl( const InlineValueDecl &other) 
+InlineMemberDecl::InlineMemberDecl( const InlineMemberDecl &other) 
     : Parent( other), type( maybeClone( other.type ) ) {}
 
-InlineValueDecl::~InlineValueDecl() { delete type; }
+InlineMemberDecl::~InlineMemberDecl() { delete type; }
 
-InlineValueDecl * InlineValueDecl::newInlineValueDecl( const std::string &name, Type * type ) {
-    return new InlineValueDecl( name, Type::StorageClasses(), LinkageSpec::C, type );
+InlineMemberDecl * InlineMemberDecl::newInlineMemberDecl( const std::string &name, Type * type ) {
+    return new InlineMemberDecl( name, Type::StorageClasses(), LinkageSpec::C, type );
 }
 
-void InlineValueDecl::print( std::ostream &os, Indenter indent ) const {
+void InlineMemberDecl::print( std::ostream &os, Indenter indent ) const {
     if ( name != "" ) os << name << ": ";
 
@@ -44 +44 @@
 }
 
-void InlineValueDecl::printShort( std::ostream &os, Indenter indent ) const {
+void InlineMemberDecl::printShort( std::ostream &os, Indenter indent ) const {
     if ( name != "" ) os << name << ": ";
 

src/SynTree/Mutator.h

@@ -36 +36 @@
         virtual DirectiveDecl * mutate( DirectiveDecl * directiveDecl ) = 0;
         virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) = 0;
-        virtual DeclarationWithType * mutate( InlineValueDecl * inlineValueDecl ) = 0;
+        virtual DeclarationWithType * mutate( InlineMemberDecl * InlineMemberDecl ) = 0;
 
         virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) = 0;

src/SynTree/SynTree.h

@@ -38 +38 @@
 class DirectiveDecl;
 class StaticAssertDecl;
-class InlineValueDecl;
+class InlineMemberDecl;
 
 class Statement;

src/SynTree/Visitor.h

@@ -49 +49 @@
         virtual void visit( StaticAssertDecl * node ) { visit( const_cast<const StaticAssertDecl *>(node) ); }
         virtual void visit( const StaticAssertDecl * assertDecl ) = 0;
-        virtual void visit( InlineValueDecl * node ) { visit( const_cast<const InlineValueDecl *>(node) ); }
-        virtual void visit( const InlineValueDecl * valueDecl ) = 0;
+        virtual void visit( InlineMemberDecl * node ) { visit( const_cast<const InlineMemberDecl *>(node) ); }
+        virtual void visit( const InlineMemberDecl * valueDecl ) = 0;
 
         virtual void visit( CompoundStmt * node ) { visit( const_cast<const CompoundStmt *>(node) ); }

src/SynTree/module.mk

@@ -42 +42 @@
       SynTree/Initializer.cc \
       SynTree/Initializer.h \
-      SynTree/InlineValueDecl.cc \
+      SynTree/InlineMemberDecl.cc \
       SynTree/Label.h \
       SynTree/LinkageSpec.cc \