Changeset 44b4114

Timestamp:

Feb 14, 2018, 4:18:37 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, resolv-new, with_gc

Children:

f5883bd

Parents:

490ff5c3

git-author:

Rob Schluntz <rschlunt@…> (02/14/18 16:17:36)

git-committer:

Rob Schluntz <rschlunt@…> (02/14/18 16:18:37)

Message:

Add DeletedExpr? node for use of deleted identifiers

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• Common/PassVisitor.h (modified) (2 diffs)
• Common/PassVisitor.impl.h (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Visitor.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -764 +764 @@
 
         void CodeGenerator::postvisit( StmtExpr * stmtExpr ) {
-                std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                std::list< Statement * > & stmts = stmtExpr->statements->kids;
                 output << "({" << endl;
                 ++indent;
@@ -775 +775 @@
                                 // cannot cast to void, otherwise the expression statement has no value
                                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
-                                        exprStmt->get_expr()->accept( *visitor );
+                                        exprStmt->expr->accept( *visitor );
                                         output << ";" << endl;
                                         ++i;
@@ -795 +795 @@
                 assertf( ! genC, "Unique expressions should not reach code generation." );
                 expr->callExpr->accept( *visitor );
+        }
+
+        void CodeGenerator::postvisit( DeletedExpr * expr ) {
+                assertf( ! genC, "Deleted expressions should not reach code generation." );
+                expr->expr->accept( *visitor );
         }
 

src/CodeGen/CodeGenerator.h

@@ -88 +88 @@
                 void postvisit( StmtExpr * );
                 void postvisit( ConstructorExpr * );
+                void postvisit( DeletedExpr * );
 
                 //*** Statements

src/Common/PassVisitor.h

@@ -121 +121 @@
         virtual void visit( UntypedInitExpr *  initExpr ) override final;
         virtual void visit( InitExpr *  initExpr ) override final;
+        virtual void visit( DeletedExpr *  delExpr ) override final;
 
         virtual void visit( VoidType * basicType ) override final;
@@ -215 +216 @@
         virtual Expression * mutate( UntypedInitExpr *  initExpr ) override final;
         virtual Expression * mutate( InitExpr *  initExpr ) override final;
+        virtual Expression * mutate( DeletedExpr *  delExpr ) override final;
 
         virtual Type * mutate( VoidType * basicType ) override final;

src/Common/PassVisitor.impl.h

@@ -1976 +1976 @@
 }
 
+//--------------------------------------------------------------------------
+// DeletedExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DeletedExpr * node ) {
+        VISIT_START( node );
+
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->expr, *this );
+        // don't visit deleteStmt, because it is a pointer to somewhere else in the tree.
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::mutate( DeletedExpr * node ) {
+        MUTATE_START( node );
+
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->expr, *this );
+
+        MUTATE_END( Expression, node );
+}
+
+
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {

src/SynTree/Expression.cc

@@ -710 +710 @@
 }
 
+DeletedExpr::DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
+        assert( expr->result );
+        result = expr->result->clone();
+}
+DeletedExpr::DeletedExpr( const DeletedExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), deleteStmt( other.deleteStmt ) {}
+DeletedExpr::~DeletedExpr() {
+        delete expr;
+}
+
+void DeletedExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Deleted Expression" << std::endl << indent+1;
+        expr->print( os, indent+1 );
+        os << std::endl << indent+1 << "... deleted by: ";
+        deleteStmt->print( os, indent+1 );
+}
+
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Expression.h

@@ -822 +822 @@
 };
 
+/// expression that contains a deleted identifier - should never make it past the resolver.
+class DeletedExpr : public Expression {
+public:
+        Expression * expr;
+        BaseSyntaxNode * deleteStmt;
+
+        DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt );
+        DeletedExpr( const DeletedExpr & other );
+        ~DeletedExpr();
+
+        virtual DeletedExpr * clone() const { return new DeletedExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+};
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Mutator.h

@@ -55 +55 @@
         virtual Statement * mutate( ImplicitCtorDtorStmt * impCtorDtorStmt );
 
-        virtual Expression* mutate( ApplicationExpr * applicationExpr );
-        virtual Expression* mutate( UntypedExpr * untypedExpr );
-        virtual Expression* mutate( NameExpr * nameExpr );
-        virtual Expression* mutate( AddressExpr * castExpr );
-        virtual Expression* mutate( LabelAddressExpr * labAddressExpr );
-        virtual Expression* mutate( CastExpr * castExpr );
-        virtual Expression* mutate( VirtualCastExpr * castExpr );
-        virtual Expression* mutate( UntypedMemberExpr * memberExpr );
-        virtual Expression* mutate( MemberExpr * memberExpr );
-        virtual Expression* mutate( VariableExpr * variableExpr );
-        virtual Expression* mutate( ConstantExpr * constantExpr );
-        virtual Expression* mutate( SizeofExpr * sizeofExpr );
-        virtual Expression* mutate( AlignofExpr * alignofExpr );
-        virtual Expression* mutate( UntypedOffsetofExpr * offsetofExpr );
-        virtual Expression* mutate( OffsetofExpr * offsetofExpr );
-        virtual Expression* mutate( OffsetPackExpr * offsetPackExpr );
-        virtual Expression* mutate( AttrExpr * attrExpr );
-        virtual Expression* mutate( LogicalExpr * logicalExpr );
-        virtual Expression* mutate( ConditionalExpr * conditionalExpr );
-        virtual Expression* mutate( CommaExpr * commaExpr );
-        virtual Expression* mutate( TypeExpr * typeExpr );
-        virtual Expression* mutate( AsmExpr * asmExpr );
-        virtual Expression* mutate( ImplicitCopyCtorExpr * impCpCtorExpr );
-        virtual Expression* mutate( ConstructorExpr * ctorExpr );
-        virtual Expression* mutate( CompoundLiteralExpr * compLitExpr );
-        virtual Expression* mutate( RangeExpr * rangeExpr );
-        virtual Expression* mutate( UntypedTupleExpr * tupleExpr );
-        virtual Expression* mutate( TupleExpr * tupleExpr );
-        virtual Expression* mutate( TupleIndexExpr * tupleExpr );
-        virtual Expression* mutate( TupleAssignExpr * assignExpr );
-        virtual Expression* mutate( StmtExpr  * stmtExpr );
-        virtual Expression* mutate( UniqueExpr  * uniqueExpr );
-        virtual Expression* mutate( UntypedInitExpr  * initExpr );
-        virtual Expression* mutate( InitExpr  * initExpr );
+        virtual Expression * mutate( ApplicationExpr * applicationExpr );
+        virtual Expression * mutate( UntypedExpr * untypedExpr );
+        virtual Expression * mutate( NameExpr * nameExpr );
+        virtual Expression * mutate( AddressExpr * castExpr );
+        virtual Expression * mutate( LabelAddressExpr * labAddressExpr );
+        virtual Expression * mutate( CastExpr * castExpr );
+        virtual Expression * mutate( VirtualCastExpr * castExpr );
+        virtual Expression * mutate( UntypedMemberExpr * memberExpr );
+        virtual Expression * mutate( MemberExpr * memberExpr );
+        virtual Expression * mutate( VariableExpr * variableExpr );
+        virtual Expression * mutate( ConstantExpr * constantExpr );
+        virtual Expression * mutate( SizeofExpr * sizeofExpr );
+        virtual Expression * mutate( AlignofExpr * alignofExpr );
+        virtual Expression * mutate( UntypedOffsetofExpr * offsetofExpr );
+        virtual Expression * mutate( OffsetofExpr * offsetofExpr );
+        virtual Expression * mutate( OffsetPackExpr * offsetPackExpr );
+        virtual Expression * mutate( AttrExpr * attrExpr );
+        virtual Expression * mutate( LogicalExpr * logicalExpr );
+        virtual Expression * mutate( ConditionalExpr * conditionalExpr );
+        virtual Expression * mutate( CommaExpr * commaExpr );
+        virtual Expression * mutate( TypeExpr * typeExpr );
+        virtual Expression * mutate( AsmExpr * asmExpr );
+        virtual Expression * mutate( ImplicitCopyCtorExpr * impCpCtorExpr );
+        virtual Expression * mutate( ConstructorExpr * ctorExpr );
+        virtual Expression * mutate( CompoundLiteralExpr * compLitExpr );
+        virtual Expression * mutate( RangeExpr * rangeExpr );
+        virtual Expression * mutate( UntypedTupleExpr * tupleExpr );
+        virtual Expression * mutate( TupleExpr * tupleExpr );
+        virtual Expression * mutate( TupleIndexExpr * tupleExpr );
+        virtual Expression * mutate( TupleAssignExpr * assignExpr );
+        virtual Expression * mutate( StmtExpr  * stmtExpr );
+        virtual Expression * mutate( UniqueExpr  * uniqueExpr );
+        virtual Expression * mutate( UntypedInitExpr  * initExpr );
+        virtual Expression * mutate( InitExpr  * initExpr );
+        virtual Expression * mutate( DeletedExpr * delExpr ) = 0;
 
         virtual Type * mutate( VoidType * basicType );

src/SynTree/Statement.cc

@@ -468 +468 @@
 void WithStmt::print( std::ostream & os, Indenter indent ) const {
         os << "With statement" << endl;
+        os << indent << "... with expressions: " << endl;
+        printAll( exprs, os, indent+1 );
         os << indent << "... with statement:" << endl << indent+1;
         stmt->print( os, indent+1 );

src/SynTree/SynTree.h

@@ -97 +97 @@
 class UntypedInitExpr;
 class InitExpr;
+class DeletedExpr;
 
 class Type;

src/SynTree/Visitor.h

@@ -91 +91 @@
         virtual void visit( UntypedInitExpr *  initExpr );
         virtual void visit( InitExpr *  initExpr );
+        virtual void visit( DeletedExpr * delExpr ) = 0;
 
         virtual void visit( VoidType * basicType );