Changes in src/SynTree/Expression.cc [9a705dc8:68f9c43]

File:

• src/SynTree/Expression.cc (modified) (26 diffs)

src/SynTree/Expression.cc

@@ -52 +52 @@
 Expression::~Expression() {
         delete env;
-        delete result;
 }
 
@@ -74 +73 @@
 ConstantExpr::ConstantExpr( const ConstantExpr &other) : Expression( other ), constant( other.constant ) {
 }
-
-ConstantExpr::~ConstantExpr() {}
 
 void ConstantExpr::print( std::ostream &os, Indenter indent ) const {
@@ -120 +117 @@
 }
 
-VariableExpr::~VariableExpr() {
-        // don't delete the declaration, since it points somewhere else in the tree
-}
-
 VariableExpr * VariableExpr::functionPointer( FunctionDecl * func ) {
         VariableExpr * funcExpr = new VariableExpr( func );
@@ -150 +143 @@
 }
 
-SizeofExpr::~SizeofExpr() {
-        delete expr;
-        delete type;
-}
-
 void SizeofExpr::print( std::ostream &os, Indenter indent) const {
         os << "Sizeof Expression on: ";
@@ -176 +164 @@
 }
 
-AlignofExpr::~AlignofExpr() {
-        delete expr;
-        delete type;
-}
-
 void AlignofExpr::print( std::ostream &os, Indenter indent) const {
         os << "Alignof Expression on: ";
@@ -196 +179 @@
 UntypedOffsetofExpr::UntypedOffsetofExpr( const UntypedOffsetofExpr &other ) :
         Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
-
-UntypedOffsetofExpr::~UntypedOffsetofExpr() {
-        delete type;
-}
 
 void UntypedOffsetofExpr::print( std::ostream &os, Indenter indent) const {
@@ -217 +196 @@
         Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
 
-OffsetofExpr::~OffsetofExpr() {
-        delete type;
-}
-
 void OffsetofExpr::print( std::ostream &os, Indenter indent) const {
         os << "Offsetof Expression on member " << member->name << " of ";
@@ -234 +209 @@
 OffsetPackExpr::OffsetPackExpr( const OffsetPackExpr &other ) : Expression( other ), type( maybeClone( other.type ) ) {}
 
-OffsetPackExpr::~OffsetPackExpr() { delete type; }
-
 void OffsetPackExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Offset pack expression on ";
@@ -252 +225 @@
 AttrExpr::AttrExpr( const AttrExpr &other ) :
                 Expression( other ), attr( maybeClone( other.attr ) ), expr( maybeClone( other.expr ) ), type( maybeClone( other.type ) ), isType( other.isType ) {
-}
-
-AttrExpr::~AttrExpr() {
-        delete attr;
-        delete expr;
-        delete type;
 }
 
@@ -271 +238 @@
 }
 
-CastExpr::CastExpr( Expression *arg, Type *toType, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
+CastExpr::CastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
         set_result(toType);
 }
 
-CastExpr::CastExpr( Expression *arg, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
+CastExpr::CastExpr( Expression *arg_ ) : Expression(), arg(arg_) {
         set_result( new VoidType( Type::Qualifiers() ) );
 }
 
-CastExpr::CastExpr( const CastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ), isGenerated( other.isGenerated ) {
-}
-
-CastExpr::~CastExpr() {
-        delete arg;
+CastExpr::CastExpr( const CastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
 }
 
@@ -299 +262 @@
 }
 
-KeywordCastExpr::KeywordCastExpr( Expression *arg, Target target ) : Expression(), arg(arg), target( target ) {
-}
-
-KeywordCastExpr::KeywordCastExpr( const KeywordCastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ), target( other.target ) {
-}
-
-KeywordCastExpr::~KeywordCastExpr() {
-        delete arg;
-}
-
-const std::string & KeywordCastExpr::targetString() const {
-        static const std::string targetStrs[] = {
-                "coroutine", "thread", "monitor"
-        };
-        static_assert(
-                (sizeof(targetStrs) / sizeof(targetStrs[0])) == ((unsigned long)NUMBER_OF_TARGETS),
-                "Each KeywordCastExpr::Target should have a corresponding string representation"
-        );
-        return targetStrs[(unsigned long)target];
-}
-
-void KeywordCastExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Keyword Cast of:" << std::endl << indent+1;
-        arg->print(os, indent+1);
-        os << std::endl << indent << "... to: ";
-        os << targetString();
-        Expression::print( os, indent );
-}
-
 VirtualCastExpr::VirtualCastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
         set_result(toType);
@@ -333 +267 @@
 
 VirtualCastExpr::VirtualCastExpr( const VirtualCastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
-}
-
-VirtualCastExpr::~VirtualCastExpr() {
-        delete arg;
 }
 
@@ -361 +291 @@
 }
 
-UntypedMemberExpr::~UntypedMemberExpr() {
-        delete aggregate;
-        delete member;
-}
-
 void UntypedMemberExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
@@ -392 +317 @@
 }
 
-MemberExpr::~MemberExpr() {
-        // don't delete the member declaration, since it points somewhere else in the tree
-        delete aggregate;
-}
-
 void MemberExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Member Expression, with field: " << std::endl;
@@ -412 +332 @@
                 Expression( other ), function( maybeClone( other.function ) ) {
         cloneAll( other.args, args );
-}
-
-UntypedExpr::~UntypedExpr() {
-        delete function;
-        deleteAll( args );
 }
 
@@ -465 +380 @@
 }
 
-NameExpr::~NameExpr() {}
-
 void NameExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Name: " << get_name();
@@ -479 +392 @@
 LogicalExpr::LogicalExpr( const LogicalExpr &other ) :
                 Expression( other ), arg1( maybeClone( other.arg1 ) ), arg2( maybeClone( other.arg2 ) ), isAnd( other.isAnd ) {
-}
-
-LogicalExpr::~LogicalExpr() {
-        delete arg1;
-        delete arg2;
 }
 
@@ -499 +407 @@
 ConditionalExpr::ConditionalExpr( const ConditionalExpr &other ) :
                 Expression( other ), arg1( maybeClone( other.arg1 ) ), arg2( maybeClone( other.arg2 ) ), arg3( maybeClone( other.arg3 ) ) {
-}
-
-ConditionalExpr::~ConditionalExpr() {
-        delete arg1;
-        delete arg2;
-        delete arg3;
 }
 
@@ -542 +444 @@
 ImplicitCopyCtorExpr::~ImplicitCopyCtorExpr() {
         set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
-        delete callExpr;
-        deleteAll( tempDecls );
-        deleteAll( returnDecls );
-        deleteAll( dtors );
 }
 
@@ -570 +468 @@
 }
 
-ConstructorExpr::~ConstructorExpr() {
-        delete callExpr;
-}
-
 void ConstructorExpr::print( std::ostream &os, Indenter indent ) const {
         os <<  "Constructor Expression: " << std::endl << indent+1;
@@ -588 +482 @@
 
 CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), initializer( other.initializer->clone() ) {}
-
-CompoundLiteralExpr::~CompoundLiteralExpr() {
-        delete initializer;
-}
 
 void CompoundLiteralExpr::print( std::ostream &os, Indenter indent ) const {
@@ -618 +508 @@
         cloneAll( other.dtors, dtors );
 }
-StmtExpr::~StmtExpr() {
-        delete statements;
-        deleteAll( dtors );
-        deleteAll( returnDecls );
-}
 void StmtExpr::computeResult() {
         assert( statements );
         std::list< Statement * > & body = statements->kids;
-        delete result;
         result = nullptr;
         if ( ! returnDecls.empty() ) {
@@ -669 +553 @@
 UniqueExpr::UniqueExpr( const UniqueExpr &other ) : Expression( other ), expr( maybeClone( other.expr ) ), object( maybeClone( other.object ) ), var( maybeClone( other.var ) ), id( other.id ) {
 }
-UniqueExpr::~UniqueExpr() {
-        delete expr;
-        delete object;
-        delete var;
-}
+
 void UniqueExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Unique Expression with id:" << id << std::endl << indent+1;
@@ -686 +566 @@
 InitAlternative::InitAlternative( Type * type, Designation * designation ) : type( type ), designation( designation ) {}
 InitAlternative::InitAlternative( const InitAlternative & other ) : type( maybeClone( other.type ) ), designation( maybeClone( other.designation ) ) {}
-InitAlternative::~InitAlternative() {
-        delete type;
-        delete designation;
-}
 
 UntypedInitExpr::UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts ) : expr( expr ), initAlts( initAlts ) {}
 UntypedInitExpr::UntypedInitExpr( const UntypedInitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), initAlts( other.initAlts ) {}
-UntypedInitExpr::~UntypedInitExpr() {
-        delete expr;
-}
 
 void UntypedInitExpr::print( std::ostream & os, Indenter indent ) const {
@@ -713 +586 @@
 }
 InitExpr::InitExpr( const InitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), designation( maybeClone( other.designation) ) {}
-InitExpr::~InitExpr() {
-        delete expr;
-        delete designation;
-}
 
 void InitExpr::print( std::ostream & os, Indenter indent ) const {
@@ -730 +599 @@
 }
 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 {