Changes in src/Parser/DeclarationNode.cc [409433da:67cf18c]

File:

• src/Parser/DeclarationNode.cc (modified) (5 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;