Changeset 561354f for src/AST/Decl.hpp

Timestamp:

May 17, 2023, 1:33:39 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

d6c464d

Parents:

28f8f15

Message:

Save progress

File:

• src/AST/Decl.hpp (modified) (5 diffs)

src/AST/Decl.hpp

@@ -248 +248 @@
 class AggregateDecl : public Decl {
 public:
-        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate, ADT };
+        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate, Adt };
         static const char * aggrString( Aggregate aggr );
 
@@ -286 +286 @@
         bool is_monitor  () const { return kind == Monitor  ; }
         bool is_thread   () const { return kind == Thread   ; }
-        bool is_adt              () const { return kind == ADT          ; }
+        bool is_adt              () const { return kind == Adt          ; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -320 +320 @@
         ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
         enum class EnumHiding { Visible, Hide } hide;
-
-        std::vector<ptr<StructDecl>> data_constructors;
-        bool isData = false;
-        ptr<UnionDecl> data_union;
-        ptr<EnumDecl> tag;
-        ptr<StructDecl> tag_union;
 
         EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false,
@@ -350 +344 @@
 };
 
+class AdtDecl final : public AggregateDecl {
+public:
+        std::vector<ptr<StructDecl>> data_constructors; // Todo: members?
+        ptr<UnionDecl> data_union;
+        ptr<EnumDecl> tag;
+        ptr<StructDecl> tag_union;
+
+        AdtDecl( const CodeLocation& loc, const std::string& name, 
+                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall )
+        : AggregateDecl( loc, name, std::move(attrs), linkage ) {}
+
+        const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        const char * typeString() const override { return aggrString( Adt ); }
+
+private:
+        AdtDecl * clone() const override { return new AdtDecl{ *this }; }
+        MUTATE_FRIEND
+};
+
 /// trait declaration `trait Foo( ... ) { ... };`
 class TraitDecl final : public AggregateDecl {
@@ -358 +372 @@
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
-
         const char * typeString() const override { return "trait"; }