Changes in src/Parser/DeclarationNode.cc [faddbd8:fb114fa1]

File:

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

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct  3 18:03:08 2016
-// Update Count     : 651
+// Last Modified On : Mon Sep 26 22:18:40 2016
+// Update Count     : 640
 //
 
@@ -56 +56 @@
                 extension( false ) {
 
-//      variable.name = nullptr;
-        variable.tyClass = NoTypeClass;
+        variable.name = nullptr;
+        variable.tyClass = DeclarationNode::Otype;
         variable.assertions = nullptr;
 
-//      attr.name = nullptr;
+        attr.name = nullptr;
         attr.expr = nullptr;
         attr.type = nullptr;
@@ -66 +66 @@
 
 DeclarationNode::~DeclarationNode() {
-//      delete attr.name;
+        delete attr.name;
         delete attr.expr;
         delete attr.type;
 
-//      delete variable.name;
+        delete variable.name;
         delete variable.assertions;
 
@@ -91 +91 @@
         newnode->linkage = linkage;
 
-//      newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
+        newnode->variable.name = variable.name ? new string( *variable.name ) : nullptr;
         newnode->variable.tyClass = variable.tyClass;
         newnode->variable.assertions = maybeClone( variable.assertions );
 
-//      newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
+        newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
         newnode->attr.expr = maybeClone( attr.expr );
         newnode->attr.type = maybeClone( attr.type );
@@ -114 +114 @@
 
         if ( linkage != LinkageSpec::Cforall ) {
-                os << LinkageSpec::linkageName( linkage ) << " ";
+                os << LinkageSpec::toString( linkage ) << " ";
         } // if
 
@@ -283 +283 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
-        assert( ! newnode->name ); 
-//      newnode->variable.name = name;
-        newnode->name = name;
         newnode->variable.tyClass = tc;
-        newnode->variable.assertions = nullptr;
+        newnode->variable.name = name;
         return newnode;
 } // DeclarationNode::newTypeParam
@@ -378 +375 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
+        newnode->attr.name = name;
         newnode->attr.expr = expr;
         return newnode;
@@ -387 +383 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
-//      newnode->attr.name = name;
-        newnode->name = name;
+        newnode->attr.name = name;
         newnode->attr.type = type;
         return newnode;
@@ -609 +604 @@
 
 DeclarationNode * DeclarationNode::addAssertions( DeclarationNode * assertions ) {
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.name ) {
                 if ( variable.assertions ) {
                         variable.assertions->appendList( assertions );
@@ -627 +622 @@
                 } // if
                 break;
+          // case TypeData::Variable:
+          //    if ( variable.assertions ) {
+          //            variable.assertions->appendList( assertions );
+          //    } else {
+          //            variable.assertions = assertions;
+          //    } // if
+          //    break;
           default:
                 assert( false );
@@ -936 +938 @@
         if ( ! error.empty() ) throw SemanticError( error + " in declaration of ", this );
 
-//      if ( variable.name ) {
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.name ) {
                 static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype };
-//              TypeDecl * ret = new TypeDecl( *variable.name, DeclarationNode::NoStorageClass, nullptr, kindMap[ variable.tyClass ] );
-                TypeDecl * ret = new TypeDecl( *name, DeclarationNode::NoStorageClass, nullptr, kindMap[ variable.tyClass ] );
+                TypeDecl * ret = new TypeDecl( *variable.name, DeclarationNode::NoStorageClass, nullptr, kindMap[ variable.tyClass ] );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;
@@ -960 +960 @@
         assert( type );
 
-        if ( attr.expr ) {
-//              return new AttrType( buildQualifiers( type ), *attr.name, attr.expr->build() );
-                return new AttrType( buildQualifiers( type ), *name, attr.expr->build() );
-        } else if ( attr.type ) {
-//              return new AttrType( buildQualifiers( type ), *attr.name, attr.type->buildType() );
-                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType() );
+        if ( attr.name ) {
+                AttrType * ret;
+                if ( attr.expr ) {
+                        ret = new AttrType( buildQualifiers( type ), *attr.name, attr.expr->build() );
+                } else {
+                        assert( attr.type );
+                        ret = new AttrType( buildQualifiers( type ), *attr.name, attr.type->buildType() );
+                } // if
+                return ret;
         } // if