Changeset 29702ad for src/SynTree/Declaration.h

Timestamp:

Nov 22, 2022, 10:18:04 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

20cf96d

Parents:

1553a55 (diff), d41735a (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

File:

• src/SynTree/Declaration.h (modified) (3 diffs)

src/SynTree/Declaration.h

@@ -340 +340 @@
         bool isTyped;
         Type * base;
+        enum EnumHiding { Visible, Hide } hide;
 
         EnumDecl( const std::string & name,
@@ -345 +346 @@
           bool isTyped = false, LinkageSpec::Spec linkage = LinkageSpec::Cforall,
           Type * baseType = nullptr ) 
-          : Parent( name, attributes, linkage ),isTyped(isTyped), base( baseType ) {}
+          : Parent( name, attributes, linkage ), isTyped(isTyped), base( baseType ) {}
         EnumDecl( const EnumDecl & other ) 
           : Parent( other ), isTyped( other.isTyped), base( other.base ) {}
@@ -450 +451 @@
 
 
-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 ); }