Changeset 7f6a7c9 for src/AST/Decl.hpp

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/AST/Decl.hpp (modified) (3 diffs)

src/AST/Decl.hpp

@@ -217 +217 @@
 
         /// convenience accessor to match Type::isComplete()
-        bool isComplete() { return sized; }
+        bool isComplete() const { return sized; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -312 +312 @@
 class EnumDecl final : public AggregateDecl {
 public:
+        bool isTyped;
         ptr<Type> base;
 
-        EnumDecl( const CodeLocation& loc, const std::string& name,
-                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type const * base = nullptr,
+        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false, 
+                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
+                Type const * base = nullptr,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -327 +329 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
-        bool isTyped() {return base && base.get();}
 
 private: