Changeset 3ed994e for src/Parser

Timestamp:

May 29, 2018, 2:02:47 PM (7 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, with_gc

Children:

96812c0

Parents:

d807ca28

git-author:

Rob Schluntz <rschlunt@…> (05/29/18 12:29:01)

git-committer:

Rob Schluntz <rschlunt@…> (05/29/18 14:02:47)

Message:

Push deleted decls through the system

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• InitializerNode.cc (modified) (4 diffs)
• ParseNode.h (modified) (3 diffs)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -1067 +1067 @@
                         SemanticError( this, "invalid function specifier for " );
                 } // if
-                return buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
+                bool isDelete = initializer && initializer->get_isDelete();
+                Declaration * decl = buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, isDelete ? nullptr : maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
+                if ( isDelete ) {
+                        DeclarationWithType * dwt = strict_dynamic_cast<DeclarationWithType *>( decl );
+                        dwt->isDeleted = true;
+                }
+                return decl;
         } // if
 

src/Parser/InitializerNode.cc

@@ -27 +27 @@
 
 InitializerNode::InitializerNode( ExpressionNode * _expr, bool aggrp, ExpressionNode * des )
-                : expr( _expr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
+                : expr( _expr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ), isDelete( false ) {
         if ( aggrp )
                 kids = dynamic_cast< InitializerNode * >( get_next() );
@@ -36 +36 @@
 
 InitializerNode::InitializerNode( InitializerNode * init, bool aggrp, ExpressionNode * des )
-                : expr( nullptr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
+                : expr( nullptr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ), isDelete( false ) {
         if ( init )
                 set_last( init );
@@ -46 +46 @@
                 set_next( nullptr );
 } // InitializerNode::InitializerNode
+
+InitializerNode::InitializerNode( bool isDelete ) : expr( nullptr ), aggregate( false ), designator( nullptr ), kids( nullptr ), maybeConstructed( false ), isDelete( isDelete ) {}
 
 InitializerNode::~InitializerNode() {
@@ -84 +86 @@
 
 Initializer * InitializerNode::build() const {
+        assertf( ! isDelete, "Should not build delete stmt InitializerNode" );
         if ( aggregate ) {
                 // steal designators from children

src/Parser/ParseNode.h

@@ -87 +87 @@
         InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = nullptr );
         InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = nullptr );
+        InitializerNode( bool isDelete );
         ~InitializerNode();
         virtual InitializerNode * clone() const { assert( false ); return nullptr; }
@@ -97 +98 @@
         InitializerNode * set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
         bool get_maybeConstructed() const { return maybeConstructed; }
+
+        bool get_isDelete() const { return isDelete; }
 
         InitializerNode * next_init() const { return kids; }
@@ -110 +113 @@
         InitializerNode * kids;
         bool maybeConstructed;
+        bool isDelete;
 }; // InitializerNode
 

src/Parser/parser.yy

@@ -2113 +2113 @@
                 { $$ = $2; }
         | '=' VOID
-                { $$ = nullptr; }
+                { $$ = new InitializerNode( true ); }
         | ATassign initializer
                 { $$ = $2->set_maybeConstructed( false ); }