Changeset 67cf18c for src/Parser

Timestamp:

May 26, 2017, 6:37:49 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

01b9928

Parents:

ff03f5c

git-author:

Rob Schluntz <rschlunt@…> (05/26/17 18:34:50)

git-committer:

Rob Schluntz <rschlunt@…> (05/26/17 18:37:49)

Message:

implement default type arguments for generic types [closes #13]

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (5 diffs)
• ParseNode.h (modified) (2 diffs)
• parser.yy (modified) (3 diffs)

src/Parser/DeclarationNode.cc

@@ -57 +57 @@
         variable.tyClass = NoTypeClass;
         variable.assertions = nullptr;
+        variable.initializer = nullptr;
 
 //      attr.name = nullptr;
@@ -70 +71 @@
 //      delete variable.name;
         delete variable.assertions;
+        delete variable.initializer;
 
         delete type;
@@ -101 +103 @@
         newnode->variable.tyClass = variable.tyClass;
         newnode->variable.assertions = maybeClone( variable.assertions );
+        newnode->variable.initializer = maybeClone( variable.initializer );
 
 //      newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
@@ -857 +860 @@
 }
 
+DeclarationNode * DeclarationNode::addTypeInitializer( DeclarationNode * init ) {
+        assertf( variable.tyClass != NoTypeClass, "Called addTypeInitializer on something that isn't a type variable." );
+        variable.initializer = init;
+        return this;
+}
+
 DeclarationNode * DeclarationNode::cloneType( string * newName ) {
         DeclarationNode * newnode = new DeclarationNode;
@@ -1014 +1023 @@
                 assertf( sizeof(kindMap)/sizeof(kindMap[0] == NoTypeClass-1), "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ] );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;

src/Parser/ParseNode.h

@@ -274 +274 @@
         DeclarationNode * addIdList( DeclarationNode * list ); // old-style functions
         DeclarationNode * addInitializer( InitializerNode * init );
+        DeclarationNode * addTypeInitializer( DeclarationNode * init );
 
         DeclarationNode * cloneType( std::string * newName );
@@ -301 +302 @@
                 DeclarationNode::TypeClass tyClass;
                 DeclarationNode * assertions;
+                DeclarationNode * initializer;
         };
         Variable_t variable;

src/Parser/parser.yy

@@ -1606 +1606 @@
 
 typegen_name:                                                                                   // CFA
-        TYPEGENname '(' type_list ')'
+        TYPEGENname '(' ')'
+                { $$ = DeclarationNode::newFromTypeGen( $1, nullptr ); }
+        | TYPEGENname '(' type_list ')'
                 { $$ = DeclarationNode::newFromTypeGen( $1, $3 ); }
         ;
@@ -1983 +1985 @@
 
 type_parameter_list:                                                                    // CFA
-        type_parameter type_initializer_opt
-        | type_parameter_list ',' type_parameter type_initializer_opt
+        type_parameter
+                { $$ = $1; }
+        | type_parameter_list ',' type_parameter
                 { $$ = $1->appendList( $3 ); }
         ;
@@ -1998 +2001 @@
         type_class no_attr_identifier_or_type_name
                 { typedefTable.addToEnclosingScope( *$2, TypedefTable::TD ); }
-          assertion_list_opt
-                { $$ = DeclarationNode::newTypeParam( $1, $2 )->addAssertions( $4 ); }
+          type_initializer_opt assertion_list_opt
+                { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
         | type_specifier identifier_parameter_declarator
         ;