Changeset 7f6a7c9 for src/SynTree/Declaration.h

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

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

src/SynTree/Declaration.h

@@ -145 +145 @@
         virtual void printShort( std::ostream & os, Indenter indent = {} ) const override;
 
-        // TODO: Move to the right place
         void checkAssignedValue() const;
 };
@@ -338 +337 @@
         typedef AggregateDecl Parent;
   public:
+        bool isTyped;
+        Type * base;
+
         EnumDecl( const std::string & name,
          const std::list< Attribute * > & attributes = std::list< class Attribute * >(),
-          LinkageSpec::Spec linkage = LinkageSpec::Cforall,
-          Type * baseType = nullptr ) : Parent( name, attributes, linkage ) , base( baseType ){}
-        EnumDecl( const EnumDecl & other ) : Parent( other ), base( other.base ) {}
-
+          bool isTyped = false, LinkageSpec::Spec linkage = LinkageSpec::Cforall,
+          Type * baseType = nullptr ) 
+          : Parent( name, attributes, linkage ),isTyped(isTyped), base( baseType ) {}
+        EnumDecl( const EnumDecl & other ) 
+          : Parent( other ), isTyped( other.isTyped), base( other.base ) {}
         bool valueOf( Declaration * enumerator, long long int & value );
-
         virtual EnumDecl * clone() const override { return new EnumDecl( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
         virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
-        Type * base;
-        std::unordered_map< std::string, long long int > enumValues;
+
+        std::unordered_map< std::string, long long int > enumValues; // This attribute is unused
         virtual void print( std::ostream & os, Indenter indent = {} ) const override final;
   private: