Changeset 28f8f15 for src/AST

Timestamp:

Apr 27, 2023, 3:13:24 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

561354f

Parents:

b110bcc

Message:

Save progress

Location:

src/AST

Files:

• Convert.cpp (modified) (1 diff)
• Decl.cpp (modified) (1 diff)
• Decl.hpp (modified) (3 diffs)
• Pass.impl.hpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -321 +321 @@
                         get<Type>().accept1(node->base)
                 );
+                decl->data_constructors = get<StructDecl>().acceptL( node->data_constructors );
+                decl->data_union = get<UnionDecl>().accept1( node->data_union );
+                decl->tags = get<EnumDecl>().accept1( node->tag );
+                decl->tag_union = get<StructDecl>().accept1( node->tag_union );
                 return aggregatePostamble( decl, node );
         }

src/AST/Decl.cpp

@@ -132 +132 @@
 
 // These must harmonize with the corresponding AggregateDecl::Aggregate enumerations.
-static const char * aggregateNames[] = { "struct", "union", "enum", "exception", "trait", "generator", "coroutine", "monitor", "thread", "NoAggregateName" };
+static const char * aggregateNames[] = { "struct", "union", "enum", "exception", "trait", "generator", "coroutine", "monitor", "thread", "NoAggregateName", "data" };
 
 const char * AggregateDecl::aggrString( AggregateDecl::Aggregate aggr ) {

src/AST/Decl.hpp

@@ -248 +248 @@
 class AggregateDecl : public Decl {
 public:
-        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate };
+        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          ; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -320 +321 @@
         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,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
-                Type const * base = nullptr, EnumHiding hide = EnumHiding::Hide,
+                Type const * base = nullptr, EnumHiding hide = EnumHiding::Visible,
                 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), hide(hide), enumValues(enumValues) {}

src/AST/Pass.impl.hpp

@@ -693 +693 @@
                         maybe_accept( node, &EnumDecl::members    );
                         maybe_accept( node, &EnumDecl::attributes );
+                        maybe_accept( node, &EnumDecl::data_constructors );
+                        maybe_accept( node, &EnumDecl::data_union );
+                        maybe_accept( node, &EnumDecl::tag );
+                        maybe_accept( node, &EnumDecl::tag_union );
                 } else {
                         maybe_accept( node, &EnumDecl::base );
@@ -698 +702 @@
                         maybe_accept( node, &EnumDecl::members    );
                         maybe_accept( node, &EnumDecl::attributes );
+                        maybe_accept( node, &EnumDecl::data_constructors );
+                        maybe_accept( node, &EnumDecl::data_union );
+                        maybe_accept( node, &EnumDecl::tag );
+                        maybe_accept( node, &EnumDecl::tag_union );
                 }
         }