Changeset 3ed994e

Timestamp:

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

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• Common/PassVisitor.h (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (1 diff)
• Parser/InitializerNode.cc (modified) (4 diffs)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/parser.yy (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SynTree/Declaration.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -171 +171 @@
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( functionDecl->isDeleted && genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -184 +186 @@
                         functionDecl->get_statements()->accept( *visitor );
                 } // if
+                if ( functionDecl->isDeleted ) {
+                        output << " = void";
+                }
         }
 
         void CodeGenerator::postvisit( ObjectDecl * objectDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( objectDecl->isDeleted && genC ) return;
                 if (objectDecl->get_name().empty() && genC ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
@@ -205 +212 @@
                         objectDecl->get_init()->accept( *visitor );
                 } // if
+                if ( objectDecl->isDeleted ) {
+                        output << " = void";
+                }
 
                 if ( objectDecl->get_bitfieldWidth() ) {

src/Common/PassVisitor.h

@@ -313 +313 @@
         void indexerAddUnionFwd ( UnionDecl                 * node  ) { indexer_impl_addUnionFwd ( pass, 0, node ); }
         void indexerAddTrait    ( TraitDecl                 * node  ) { indexer_impl_addTrait    ( pass, 0, node ); }
-        void indexerAddWith     ( std::list< Expression * > & exprs, BaseSyntaxNode * withStmt ) { indexer_impl_addWith     ( pass, 0, exprs, withStmt ); }
+        void indexerAddWith     ( std::list< Expression * > & exprs, BaseSyntaxNode * withStmt ) { indexer_impl_addWith( pass, 0, exprs, withStmt ); }
 
 

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 ); }

src/SymTab/Indexer.cc

@@ -471 +471 @@
         void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
                 // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr );
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr, decl->isDeleted ? decl : nullptr );
         }
 

src/SynTree/Declaration.cc

@@ -104 +104 @@
 }
 
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Declaration.h

@@ -84 +84 @@
         Expression *asmName;
         std::list< Attribute * > attributes;
+        bool isDeleted = false;
 
         DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs );