Changeset 28307be for src/Parser/DeclarationNode.cc

Timestamp:

Aug 29, 2016, 10:52:33 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

3403534

Parents:

8f6f47d7

Message:

more refactoring of parser code

File:

• src/Parser/DeclarationNode.cc (modified) (9 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 Aug 29 15:55:12 2016
-// Update Count     : 311
+// Last Modified On : Mon Aug 29 22:30:56 2016
+// Update Count     : 327
 //
 
@@ -42 +42 @@
 
 extern LinkageSpec::Spec linkage;                                               // defined in parser.yy
+
+DeclarationNode::DeclarationNode()
+                : type( 0 )
+                , storageClass( NoStorageClass )
+                , isInline( false )
+                , isNoreturn( false )
+                , bitfieldWidth( 0 )
+                , initializer( 0 )
+                , hasEllipsis( false )
+                , linkage( ::linkage )
+                , extension( false )
+                , error() {
+        attr.expr = nullptr;
+        attr.type = nullptr;
+
+        variable.tyClass = DeclarationNode::Type;
+        variable.assertions = nullptr;
+}
+
+DeclarationNode::~DeclarationNode() {
+        delete attr.expr;
+        delete attr.type;
+        delete type;
+        delete bitfieldWidth;
+        delete initializer;
+}
 
 DeclarationNode *DeclarationNode::clone() const {
@@ -55 +81 @@
         newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
+
+        newnode->variable.assertions = maybeClone( variable.assertions );
+        newnode->variable.name = variable.name;
+        newnode->variable.tyClass = variable.tyClass;
+
+        newnode->attr.expr = maybeClone( attr.expr );
+        newnode->attr.type = maybeClone( attr.type );
         return newnode;
 } // DeclarationNode::clone
-
-DeclarationNode::DeclarationNode()
-        : type( 0 )
-        , storageClass( NoStorageClass )
-        , isInline( false )
-        , isNoreturn( false )
-        , bitfieldWidth( 0 )
-        , initializer( 0 )
-        , hasEllipsis( false )
-        , linkage( ::linkage )
-        , extension( false )
-        , error() {
-}
-
-DeclarationNode::~DeclarationNode() {
-        delete type;
-        delete bitfieldWidth;
-        delete initializer;
-}
 
 bool DeclarationNode::get_hasEllipsis() const {
@@ -248 +262 @@
         newnode->name = assign_strptr( name );
         newnode->type = new TypeData( TypeData::Variable );
-        newnode->type->variable.tyClass = tc;
-        newnode->type->variable.name = newnode->name;
+        newnode->variable.tyClass = tc;
+        newnode->variable.name = newnode->name;
         return newnode;
 } // DeclarationNode::newTypeParam
@@ -341 +355 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Attr );
-        newnode->type->attr.name = assign_strptr( name );
-        newnode->type->attr.expr = expr;
+        newnode->attr.name = assign_strptr( name );
+        newnode->attr.expr = expr;
         return newnode;
 }
@@ -349 +363 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Attr );
-        newnode->type->attr.name = assign_strptr( name );
-        newnode->type->attr.type = type;
+        newnode->attr.name = assign_strptr( name );
+        newnode->attr.type = type;
         return newnode;
 }
@@ -542 +556 @@
                 break;
           case TypeData::Variable:
-                if ( type->variable.assertions ) {
-                        type->variable.assertions->appendList( assertions );
+                if ( variable.assertions ) {
+                        variable.assertions->appendList( assertions );
                 } else {
-                        type->variable.assertions = assertions;
+                        variable.assertions = assertions;
                 } // if
                 break;
@@ -896 +910 @@
         if ( ! error.empty() ) throw SemanticError( error, this );
         if ( type ) {
-                return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                if ( type->kind == TypeData::Variable ) {
+                        static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype };
+                        TypeDecl * ret = new TypeDecl( variable.name, DeclarationNode::NoStorageClass, 0, kindMap[ variable.tyClass ] );
+                        buildList( variable.assertions, ret->get_assertions() );
+                        return ret;
+                } else {
+                        return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                } // if
         } // if
         if ( ! isInline && ! isNoreturn ) {
@@ -933 +954 @@
                   return ret;
           }
+          case TypeData::Attr: {
+                  assert( type->kind == TypeData::Attr );
+                  // assert( type->attr );
+                  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;
+          }
           default:
                 return typebuild( type );