Changeset 68f9c43 for src/SynTree/Expression.h

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

• src/SynTree/Expression.h (modified) (39 diffs)

src/SynTree/Expression.h

@@ -41 +41 @@
         ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
         ParamEntry( const ParamEntry & other );
-        ~ParamEntry();
         ParamEntry & operator=( const ParamEntry & other );
 
@@ -53 +52 @@
 /// Expression is the root type for all expressions
 class Expression : public BaseSyntaxNode {
+  protected:
+        virtual ~Expression();
+
   public:
         Type * result;
@@ -61 +63 @@
         Expression();
         Expression( const Expression & other );
-        virtual ~Expression();
 
         Type *& get_result() { return result; }
@@ -89 +90 @@
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
         ApplicationExpr( const ApplicationExpr & other );
-        virtual ~ApplicationExpr();
 
         Expression * get_function() const { return function; }
@@ -111 +111 @@
         UntypedExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
         UntypedExpr( const UntypedExpr & other );
-        virtual ~UntypedExpr();
 
         Expression * get_function() const { return function; }
@@ -136 +135 @@
         NameExpr( std::string name );
         NameExpr( const NameExpr & other );
-        virtual ~NameExpr();
 
         const std::string & get_name() const { return name; }
@@ -157 +155 @@
         AddressExpr( Expression * arg );
         AddressExpr( const AddressExpr & other );
-        virtual ~AddressExpr();
 
         Expression * get_arg() const { return arg; }
@@ -176 +173 @@
         LabelAddressExpr( const Label &arg );
         LabelAddressExpr( const LabelAddressExpr & other );
-        virtual ~LabelAddressExpr();
 
         virtual LabelAddressExpr * clone() const { return new LabelAddressExpr( * this ); }
@@ -192 +188 @@
         CastExpr( Expression * arg, Type * toType );
         CastExpr( const CastExpr & other );
-        virtual ~CastExpr();
 
         Expression * get_arg() const { return arg; }
@@ -210 +205 @@
         VirtualCastExpr( Expression * arg, Type * toType );
         VirtualCastExpr( const VirtualCastExpr & other );
-        virtual ~VirtualCastExpr();
 
         Expression * get_arg() const { return arg; }
@@ -229 +223 @@
         UntypedMemberExpr( Expression * member, Expression * aggregate );
         UntypedMemberExpr( const UntypedMemberExpr & other );
-        virtual ~UntypedMemberExpr();
 
         Expression * get_member() const { return member; }
@@ -251 +244 @@
         MemberExpr( DeclarationWithType * member, Expression * aggregate );
         MemberExpr( const MemberExpr & other );
-        virtual ~MemberExpr();
 
         DeclarationWithType * get_member() const { return member; }
@@ -272 +264 @@
         VariableExpr( DeclarationWithType * var );
         VariableExpr( const VariableExpr & other );
-        virtual ~VariableExpr();
 
         DeclarationWithType * get_var() const { return var; }
@@ -292 +283 @@
         ConstantExpr( Constant constant );
         ConstantExpr( const ConstantExpr & other );
-        virtual ~ConstantExpr();
 
         Constant * get_constant() { return & constant; }
@@ -316 +306 @@
         SizeofExpr( const SizeofExpr & other );
         SizeofExpr( Type * type );
-        virtual ~SizeofExpr();
 
         Expression * get_expr() const { return expr; }
@@ -341 +330 @@
         AlignofExpr( const AlignofExpr & other );
         AlignofExpr( Type * type );
-        virtual ~AlignofExpr();
 
         Expression * get_expr() const { return expr; }
@@ -364 +352 @@
         UntypedOffsetofExpr( Type * type, const std::string & member );
         UntypedOffsetofExpr( const UntypedOffsetofExpr & other );
-        virtual ~UntypedOffsetofExpr();
 
         std::string get_member() const { return member; }
@@ -385 +372 @@
         OffsetofExpr( Type * type, DeclarationWithType * member );
         OffsetofExpr( const OffsetofExpr & other );
-        virtual ~OffsetofExpr();
 
         Type * get_type() const { return type; }
@@ -405 +391 @@
         OffsetPackExpr( StructInstType * type );
         OffsetPackExpr( const OffsetPackExpr & other );
-        virtual ~OffsetPackExpr();
 
         StructInstType * get_type() const { return type; }
@@ -427 +412 @@
         AttrExpr( const AttrExpr & other );
         AttrExpr( Expression * attr, Type * type );
-        virtual ~AttrExpr();
 
         Expression * get_attr() const { return attr; }
@@ -452 +436 @@
         LogicalExpr( Expression * arg1, Expression * arg2, bool andp = true );
         LogicalExpr( const LogicalExpr & other );
-        virtual ~LogicalExpr();
 
         bool get_isAnd() const { return isAnd; }
@@ -478 +461 @@
         ConditionalExpr( Expression * arg1, Expression * arg2, Expression * arg3 );
         ConditionalExpr( const ConditionalExpr & other );
-        virtual ~ConditionalExpr();
 
         Expression * get_arg1() const { return arg1; }
@@ -501 +483 @@
         CommaExpr( Expression * arg1, Expression * arg2 );
         CommaExpr( const CommaExpr & other );
-        virtual ~CommaExpr();
 
         Expression * get_arg1() const { return arg1; }
@@ -521 +502 @@
         TypeExpr( Type * type );
         TypeExpr( const TypeExpr & other );
-        virtual ~TypeExpr();
 
         Type * get_type() const { return type; }
@@ -541 +521 @@
         AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
         AsmExpr( const AsmExpr & other );
-        virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
 
         Expression * get_inout() const { return inout; }
@@ -563 +542 @@
 /// along with a set of copy constructor calls, one for each argument.
 class ImplicitCopyCtorExpr : public Expression {
+protected:
+        virtual ~ImplicitCopyCtorExpr();
+
 public:
         ApplicationExpr * callExpr;
@@ -571 +553 @@
         ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
         ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other );
-        virtual ~ImplicitCopyCtorExpr();
 
         ApplicationExpr * get_callExpr() const { return callExpr; }
@@ -593 +574 @@
         ConstructorExpr( Expression * callExpr );
         ConstructorExpr( const ConstructorExpr & other );
-        ~ConstructorExpr();
 
         Expression * get_callExpr() const { return callExpr; }
@@ -611 +591 @@
         CompoundLiteralExpr( Type * type, Initializer * initializer );
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
-        virtual ~CompoundLiteralExpr();
 
         Initializer * get_initializer() const { return initializer; }
@@ -648 +627 @@
         UntypedTupleExpr( const std::list< Expression * > & exprs );
         UntypedTupleExpr( const UntypedTupleExpr & other );
-        virtual ~UntypedTupleExpr();
 
         std::list<Expression*>& get_exprs() { return exprs; }
@@ -665 +643 @@
         TupleExpr( const std::list< Expression * > & exprs );
         TupleExpr( const TupleExpr & other );
-        virtual ~TupleExpr();
 
         std::list<Expression*>& get_exprs() { return exprs; }
@@ -683 +660 @@
         TupleIndexExpr( Expression * tuple, unsigned int index );
         TupleIndexExpr( const TupleIndexExpr & other );
-        virtual ~TupleIndexExpr();
 
         Expression * get_tuple() const { return tuple; }
@@ -703 +679 @@
         TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls );
         TupleAssignExpr( const TupleAssignExpr & other );
-        virtual ~TupleAssignExpr();
 
         TupleAssignExpr * set_stmtExpr( StmtExpr * newValue ) { stmtExpr = newValue; return this; }
@@ -723 +698 @@
         StmtExpr( CompoundStmt * statements );
         StmtExpr( const StmtExpr & other );
-        virtual ~StmtExpr();
 
         CompoundStmt * get_statements() const { return statements; }
@@ -748 +722 @@
         UniqueExpr( Expression * expr, long long idVal = -1 );
         UniqueExpr( const UniqueExpr & other );
-        ~UniqueExpr();
 
         Expression * get_expr() const { return expr; }
@@ -778 +751 @@
         InitAlternative( const InitAlternative & other );
         InitAlternative & operator=( const Initializer & other ) = delete; // at the moment this isn't used, and I don't want to implement it
-        ~InitAlternative();
 };
 
@@ -788 +760 @@
         UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
         UntypedInitExpr( const UntypedInitExpr & other );
-        ~UntypedInitExpr();
 
         Expression * get_expr() const { return expr; }
@@ -808 +779 @@
         InitExpr( Expression * expr, Designation * designation );
         InitExpr( const InitExpr & other );
-        ~InitExpr();
 
         Expression * get_expr() const { return expr; }
@@ -830 +800 @@
         DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt );
         DeletedExpr( const DeletedExpr & other );
-        ~DeletedExpr();
 
         virtual DeletedExpr * clone() const { return new DeletedExpr( * this ); }