Changeset 44b4114 for src/SynTree

Timestamp:

Feb 14, 2018, 4:18:37 PM (8 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/SynTree

Files:

• Expression.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

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