Changeset fa2c005 for src/Parser

Timestamp:

Jun 8, 2023, 3:19:43 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Parents:

044ae62

Message:

Finish Adt POC

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (5 diffs)
• DeclarationNode.h (modified) (1 diff)
• TypeData.cc (modified) (4 diffs)
• TypeData.h (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -1104 +1104 @@
         std::back_insert_iterator<std::vector<ast::ptr<ast::StructDecl>>> out( outputList );
         for ( const DeclarationNode * cur = firstNode; cur; cur = strict_next( cur ) ) {
-                // td->kind == TypeData::Symbolic
+
                 assert( cur->type->kind == TypeData::Symbolic );
                 const std::string * name = cur->name;
@@ -1125 +1125 @@
                         member->name = "field_" + std::to_string(i);
                 }
+
                 *out++ = ctor;          
         }
@@ -1130 +1131 @@
 }
 
-ast::UnionDecl * buildDataUnion( const CodeLocation & loc, const std::vector<ast::ptr<ast::StructDecl>> & typeList ) {
+void buildDataConstructorsAsMember( DeclarationNode * firstNode, ast::AdtDecl * adtDecl ) {
+        std::back_insert_iterator<std::vector<ast::ptr<ast::Decl>>> out( adtDecl->members );
+        for ( const DeclarationNode * cur = firstNode; cur; cur = strict_next( cur ) ) {
+
+                assert( cur->type->kind == TypeData::Symbolic );
+                const std::string * name = cur->name;
+                auto ctor = new ast::StructDecl( cur->location,
+                        std::string(*name),
+                        ast::AggregateDecl::Aggregate::Struct
+                );
+                ctor->set_body(true);
+                TypeData * td = cur->type;
+                TypeData::Symbolic_t st = td->symbolic;
+                DeclarationNode * params = st.params;
+                
+                if ( params ) {
+                        buildList( params, ctor->members );
+                }
+
+                for ( std::size_t i = 0; i < ctor->members.size(); ++i ) {
+                        assert(ctor->members[i]->name == "");
+                        ast::Decl * member = ctor->members[i].get_and_mutate();
+                        member->name = "field_" + std::to_string(i);
+                }
+
+                *out++ = ctor;          
+        }
+}
+
+ast::UnionDecl * buildDataUnion( const CodeLocation & loc, const std::vector<ast::ptr<ast::Decl>> & typeList ) {
         ast::UnionDecl * out = new ast::UnionDecl( loc, "temp_data_union" );
         // size_t index = 0;
         if ( typeList.size() > 0 ) out->set_body( true );
         size_t i = 0;
-        for (const ast::ptr<ast::StructDecl> structDecl : typeList ) {
-                ast::StructInstType * inst = new ast::StructInstType(structDecl);
+        for (const ast::ptr<ast::Decl> structDecl : typeList ) {
+                ast::StructInstType * inst = new ast::StructInstType( structDecl.as< ast::StructDecl >() );
                 ast::ObjectDecl * instObj = new ast::ObjectDecl(
                         structDecl->location,
@@ -1149 +1179 @@
 }
 
-ast::EnumDecl * buildTag( const CodeLocation & loc, std::vector<ast::ptr<ast::StructDecl>> & typeList ) {
+ast::EnumDecl * buildTag( const CodeLocation & loc, std::vector<ast::ptr<ast::Decl>> & typeList ) {
         ast::EnumDecl * out = new ast::EnumDecl( loc, "temp_data_tag" );
         if ( typeList.size() > 0 ) out->set_body( true );
-        for ( const ast::ptr<ast::StructDecl> structDecl : typeList ) {
+        for ( const ast::ptr<ast::Decl> structDecl : typeList ) {
                 ast::EnumInstType * inst = new ast::EnumInstType( out );
                 assert( inst->base != nullptr );
@@ -1167 +1197 @@
 ast::StructDecl * buildTaggedUnions( const TypeData * data, const ast::EnumDecl * tags, const ast::UnionDecl * data_union ) {
         assert( tags->members.size() == data_union->members.size() );
-        ast::StructDecl * out = new ast::StructDecl( data->location, *(data->adt.name) );
+        ast::StructDecl * out = new ast::StructDecl( data->location, (*(data->adt.name)) + "_tag_union" );
         out->kind = ast::AggregateDecl::Adt;
 

src/Parser/DeclarationNode.h

@@ -218 +218 @@
 
 std::vector<ast::ptr<ast::StructDecl>> buildDataConstructors( DeclarationNode * firstNode );
-ast::UnionDecl * buildDataUnion( const CodeLocation & loc, const std::vector<ast::ptr<ast::StructDecl>> & typeList );
-ast::EnumDecl * buildTag( const CodeLocation & loc, std::vector<ast::ptr<ast::StructDecl>> & typeList );
+void buildDataConstructorsAsMember( DeclarationNode * firstNode, ast::AdtDecl * adtDecl );
+ast::UnionDecl * buildDataUnion( const CodeLocation & loc, const std::vector<ast::ptr<ast::Decl>> & typeList );
+ast::EnumDecl * buildTag( const CodeLocation & loc, std::vector<ast::ptr<ast::Decl>> & typeList );
 ast::StructDecl * buildTaggedUnions( const TypeData * data, const ast::EnumDecl * tag, const ast::UnionDecl * data_union );
 

src/Parser/TypeData.cc

@@ -81 +81 @@
         case Symbolic:
         case SymbolicInst:
+                aggregate.kind =  ast::AggregateDecl::Aggregate::Undecided;
+                
                 symbolic.name = nullptr;
                 symbolic.params = nullptr;
@@ -225 +227 @@
                 newtype->enumeration.body = enumeration.body;
                 newtype->enumeration.anon = enumeration.anon;
-                newtype->enumeration.data_constructors = maybeClone( enumeration.data_constructors );
                 break;
         case Adt:
-                newtype->adt.data_constructors = maybeClone( enumeration.data_constructors );
+                newtype->adt.data_constructors = maybeClone( adt.data_constructors );
                 newtype->adt.name = new string ( *adt.name );
                 break;
@@ -1276 +1277 @@
         );
         buildList( td->enumeration.constants, ret->members );
-        if ( td->enumeration.data_constructors != nullptr ) {
-                assert( false );
-                // ret->data_constructors = buildDataConstructors( td->enumeration.data_constructors );
-                // ret->data_union = buildDataUnion( td->location, ret->data_constructors );
-                // ret->tag = buildTag( td->location, ret->data_constructors );
-                // ret->tag_union = buildTaggedUnions( td, ret->tag.get(), ret->data_union.get() );
-        }
-
-        // if ( ret->data_constructors.size() > 0 ) ret->isData = true;
+
         auto members = ret->members.begin();
         ret->hide = td->enumeration.hiding == EnumHiding::Hide ? ast::EnumDecl::EnumHiding::Hide : ast::EnumDecl::EnumHiding::Visible;
@@ -1317 +1310 @@
         assert( td->kind == TypeData::Adt );
         ast::AdtDecl * ret = new ast::AdtDecl( td->location, *(td->adt.name) );
-        ret->data_constructors = buildDataConstructors( td->adt.data_constructors );
-        ret->data_union = buildDataUnion( td->location, ret->data_constructors );
-        ret->tag = buildTag( td->location, ret->data_constructors );
+
+        buildDataConstructorsAsMember( td->adt.data_constructors, ret );
+
+        ret->data_union = buildDataUnion( td->location, ret->members );
+        ret->tag = buildTag( td->location, ret->members );
         ret->tag_union = buildTaggedUnions( td, ret->tag.get(), ret->data_union.get() );
         return ret;

src/Parser/TypeData.h

@@ -25 +25 @@
 struct TypeData {
         enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
-                                SymbolicInst, Tuple, Basetypeof, Typeof, Vtable, Builtin, GlobalScope, Qualified, Adt, Ctor, Unknown };
+                                SymbolicInst, Tuple, Basetypeof, Typeof, Vtable, Builtin, GlobalScope, Qualified, Adt, Unknown };
 
         struct Aggregate_t {
@@ -59 +59 @@
                 EnumHiding hiding;
                 bool isData = false;
-
-                DeclarationNode * data_constructors = nullptr;
         };