Changeset 29702ad for src/AST/Decl.hpp

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

src/AST/Decl.hpp

@@ -315 +315 @@
         // enum (type_optional) Name {...} 
         ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
-
-        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false, 
+        enum class EnumHiding { Visible, Hide } hide;
+
+        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,
+                Type const * base = nullptr, EnumHiding hide = EnumHiding::Hide,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), hide(hide), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -397 +398 @@
 };
 
+/// Static Assertion `_Static_assert( ... , ... );`
 class StaticAssertDecl : public Decl {
 public:
@@ -411 +413 @@
 };
 
-class InlineValueDecl final : public DeclWithType {
+/// Inline Member Declaration `inline TypeName;`
+class InlineMemberDecl final : public DeclWithType {
 public:
         ptr<Type> type;
 
-        InlineValueDecl( const CodeLocation & loc, const std::string & name, const Type * type,
+        InlineMemberDecl( const CodeLocation & loc, const std::string & name, const Type * type,
                 Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
@@ -425 +428 @@
         const DeclWithType * accept( Visitor& v ) const override { return v.visit( this ); }
 private:
-        InlineValueDecl * clone() const override { return new InlineValueDecl{ *this }; }
-        MUTATE_FRIEND
-};
+        InlineMemberDecl * clone() const override { return new InlineMemberDecl{ *this }; }
+        MUTATE_FRIEND
+};
+
 }