Changeset 63be3387 for src/SynTree

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• InlineMemberDecl.cc (added)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/SynTree/Declaration.h

@@ -449 +449 @@
 };
 
+
+class InlineMemberDecl : public DeclarationWithType {
+        typedef DeclarationWithType Parent;
+  public:
+        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() );
+        InlineMemberDecl( const InlineMemberDecl & other );
+        virtual ~InlineMemberDecl();
+
+        virtual Type * get_type() const override { return type; }
+        virtual void set_type(Type * newType) override { type = newType; }
+
+        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 ); }
+        virtual DeclarationWithType * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream & os, Indenter indent = {} ) const override;
+
+};
+
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );
 

src/SynTree/Mutator.h

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

src/SynTree/SynTree.h

@@ -38 +38 @@
 class DirectiveDecl;
 class StaticAssertDecl;
+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( 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/InlineMemberDecl.cc \
       SynTree/Label.h \
       SynTree/LinkageSpec.cc \