Changes in src/Parser/DeclarationNode.cc [ce8c12f:fa4805f]

File:

• src/Parser/DeclarationNode.cc (modified) (9 diffs)

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:46:33 2017
-// Update Count     : 1018
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:27:00 2017
+// Update Count     : 1019
 //
 
@@ -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;
@@ -326 +329 @@
 } // DeclarationNode::newTypeDecl
 
-DeclarationNode * DeclarationNode::newPointer( DeclarationNode * qualifiers, OperKinds kind ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( kind == OperKinds::PointTo ? TypeData::Pointer : TypeData::Reference );
+DeclarationNode * DeclarationNode::newPointer( DeclarationNode * qualifiers ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Pointer );
         if ( qualifiers ) {
                 return newnode->addQualifiers( qualifiers );
@@ -745 +748 @@
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
-                assert( p->type->kind == TypeData::Pointer || TypeData::Reference );
+                assert( p->type->kind == TypeData::Pointer );
                 setBase( p->type );
                 p->type = nullptr;
@@ -854 +857 @@
 DeclarationNode * DeclarationNode::addInitializer( InitializerNode * init ) {
         initializer = init;
+        return this;
+}
+
+DeclarationNode * DeclarationNode::addTypeInitializer( DeclarationNode * init ) {
+        assertf( variable.tyClass != NoTypeClass, "Called addTypeInitializer on something that isn't a type variable." );
+        variable.initializer = init;
         return this;
 }
@@ -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;
@@ -1054 +1063 @@
           case TypeData::Enum:
           case TypeData::Aggregate: {
-                  ReferenceToType * ret = buildComAggInst( type, attributes );
+                  ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;