Changeset 3be261a

Timestamp:

Feb 25, 2016, 4:45:19 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

41a2620

Parents:

6ce67ce

Message:

added copy constructors and destructors to many types that were missing them

Location:

src/SynTree

Files:

• Expression.cc (modified) (4 diffs)
• Expression.h (modified) (5 diffs)
• Statement.cc (modified) (16 diffs)
• Statement.h (modified) (21 diffs)

src/SynTree/Expression.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Expression.cc -- 
+// Expression.cc --
 //
 // Author           : Richard C. Bilson
@@ -422 +422 @@
 }
 
+AsmExpr::AsmExpr( const AsmExpr & other ) : inout( maybeClone( other.inout ) ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
+
+
 void AsmExpr::print( std::ostream &os, int indent ) const {
         os << "Asm Expression: " << std::endl;
@@ -429 +432 @@
 }
 
+UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}
+
+UntypedValofExpr::~UntypedValofExpr() { delete body; }
+
 void UntypedValofExpr::print( std::ostream &os, int indent ) const {
         os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
@@ -434 +441 @@
                 get_body()->print( os, indent + 2 );
 }
+
+
 
 std::ostream & operator<<( std::ostream & out, Expression * expr ) {

src/SynTree/Expression.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Expression.h -- 
+// Expression.h --
 //
 // Author           : Richard C. Bilson
@@ -155 +155 @@
 };
 
+// xxx - this doesn't appear to actually be hooked in anywhere. We should use this instead of the "&&"" UntypedExpr hack
 class LabelAddressExpr : public Expression {
   public:
         LabelAddressExpr( Expression *arg );
-        LabelAddressExpr( const AddressExpr &other );
+        LabelAddressExpr( const LabelAddressExpr &other );
         virtual ~LabelAddressExpr();
 
@@ -251 +252 @@
 };
 
-/// ConstantExpr represents an expression that simply refers to the value of a constant 
+/// ConstantExpr represents an expression that simply refers to the value of a constant
 class ConstantExpr : public Expression {
   public:
@@ -515 +516 @@
   public:
         AsmExpr( Expression *inout, ConstantExpr *constraint, Expression *operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( const AsmExpr & other );
         virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
 
@@ -541 +543 @@
   public:
         UntypedValofExpr( Statement *_body, Expression *_aname = 0 ) : Expression( _aname ), body ( _body ) {}
-        virtual ~UntypedValofExpr() {}
+        UntypedValofExpr( const UntypedValofExpr & other );
+        virtual ~UntypedValofExpr();
 
         Expression *get_value();

src/SynTree/Statement.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Statement.cc -- 
+// Statement.cc --
 //
 // Author           : Richard C. Bilson
@@ -36 +36 @@
 ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
 
-ExprStmt::~ExprStmt() {}
+ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
+
+ExprStmt::~ExprStmt() {
+        delete expr;
+}
 
 void ExprStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Expression Statement:" << endl;
         expr->print( os, indent + 2 );
-} 
+}
 
 
 AsmStmt::AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement( labels ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+
+AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
+  cloneAll( other.output, output );
+  cloneAll( other.input, input );
+  cloneAll( other.clobber, clobber );
+}
 
 AsmStmt::~AsmStmt() {
@@ -60 +70 @@
                 os << endl << std::string( indent, ' ' ) << "output: " << endl;
                 printAll( output, os, indent + 2 );
-        } // if 
+        } // if
         if ( ! input.empty() ) {
                 os << std::string( indent, ' ' ) << "input: " << endl << std::string( indent, ' ' );
@@ -69 +79 @@
                 printAll( clobber, os, indent + 2 );
         } // if
-} 
+}
 
 
@@ -93 +103 @@
 ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr, bool throwP ) : Statement( labels ), expr( _expr ), isThrow( throwP ) {}
 
+ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ), isThrow( other.isThrow ) {}
+
 ReturnStmt::~ReturnStmt() {
         delete expr;
@@ -106 +118 @@
         Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
 
+IfStmt::IfStmt( const IfStmt & other ) :
+        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
+
 IfStmt::~IfStmt() {}
 
@@ -123 +138 @@
 SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
         Statement( _labels ), condition( _condition ), branches( _branches ) {
+}
+
+SwitchStmt::SwitchStmt( const SwitchStmt & other ):
+        Statement( other ), condition( maybeClone( other.condition ) ) {
+        cloneAll( other.branches, branches );
 }
 
@@ -145 +165 @@
 }
 
-CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) : 
+CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) :
         Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != 0 )
                 throw SemanticError("default with conditions");
+}
+
+CaseStmt::CaseStmt( const CaseStmt & other ) :
+        Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
+        cloneAll( other.stmts, stmts );
 }
 
@@ -181 +206 @@
 }
 
+ChooseStmt::ChooseStmt( const ChooseStmt & other ):
+        Statement( other ), condition( maybeClone( other.condition ) ) {
+                cloneAll( other.branches, branches );
+}
+
 ChooseStmt::~ChooseStmt() {
         delete condition;
@@ -208 +238 @@
 }
 
+WhileStmt::WhileStmt( const WhileStmt & other ):
+        Statement( other ), condition( maybeClone( other.condition ) ), body( maybeClone( other.body ) ), isDoWhile( other.isDoWhile ) {
+}
+
 WhileStmt::~WhileStmt() {
         delete body;
@@ -223 +257 @@
 ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
         Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
+}
+
+ForStmt::ForStmt( const ForStmt & other ):
+        Statement( other ), condition( maybeClone( other.condition ) ), increment( maybeClone( other.increment ) ), body( maybeClone( other.body ) ) {
+                cloneAll( other.initialization, initialization );
+
 }
 
@@ -241 +281 @@
         os << string( indent, ' ' ) << "For Statement" << endl ;
 
-        os << string( indent + 2, ' ' ) << "initialization: \n"; 
+        os << string( indent + 2, ' ' ) << "initialization: \n";
         for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
                 (*it)->print( os, indent + 4 );
         }
 
-        os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "condition: \n";
         if ( condition != 0 )
                 condition->print( os, indent + 4 );
 
-        os << "\n" << string( indent + 2, ' ' ) << "increment: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "increment: \n";
         if ( increment != 0 )
                 increment->print( os, indent + 4 );
 
-        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n"; 
+        os << "\n" << string( indent + 2, ' ' ) << "statement block: \n";
         if ( body != 0 )
                 body->print( os, indent + 4 );
@@ -265 +305 @@
 }
 
-TryStmt::TryStmt( const TryStmt &other ) : Statement( other.labels ) {
-        block = other.block;
-        std::copy( other.handlers.begin(), other.handlers.end(), back_inserter( handlers ) );
-        finallyBlock = other.finallyBlock;
+TryStmt::TryStmt( const TryStmt &other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
+        cloneAll( other.handlers, handlers );
 }
 
@@ -294 +332 @@
 CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool isCatchRest ) :
         Statement( labels ), decl ( _decl ), body( _body ), catchRest ( isCatchRest ) {
+}
+
+CatchStmt::CatchStmt( const CatchStmt & other ) :
+        Statement( other ), decl ( maybeClone( other.decl ) ), body( maybeClone( other.body ) ), catchRest ( other.catchRest ) {
 }
 
@@ -319 +361 @@
 }
 
+FinallyStmt::FinallyStmt( const FinallyStmt & other ) : Statement( other ), block( maybeClone( other.block ) ) {
+}
+
 FinallyStmt::~FinallyStmt() {
         delete block;
@@ -331 +376 @@
 NullStmt::NullStmt( std::list<Label> labels ) : CompoundStmt( labels ) {}
 NullStmt::NullStmt() : CompoundStmt( std::list<Label>() ) {}
-NullStmt::~NullStmt() {}
 
 void NullStmt::print( std::ostream &os, int indent ) const {

src/SynTree/Statement.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Statement.h -- 
+// Statement.h --
 //
 // Author           : Richard C. Bilson
@@ -57 +57 @@
   public:
         ExprStmt( std::list<Label> labels, Expression *expr );
+        ExprStmt( const ExprStmt &other );
         virtual ~ExprStmt();
 
@@ -73 +74 @@
   public:
         AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> input, std::list<Expression *> output, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        AsmStmt( const AsmStmt &other );
         virtual ~AsmStmt();
 
@@ -103 +105 @@
   public:
         IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
+        IfStmt( const IfStmt &other );
         virtual ~IfStmt();
 
@@ -111 +114 @@
         Statement *get_elsePart() { return elsePart; }
         void set_elsePart( Statement *newValue ) { elsePart = newValue; }
-        
+
         virtual IfStmt *clone() const { return new IfStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -125 +128 @@
   public:
         SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
+        SwitchStmt( const SwitchStmt &other );
         virtual ~SwitchStmt();
 
@@ -146 +150 @@
   public:
         ChooseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
+        ChooseStmt( const ChooseStmt &other );
         virtual ~ChooseStmt();
 
@@ -177 +182 @@
 class CaseStmt : public Statement {
   public:
-        CaseStmt( std::list<Label> labels, Expression *conditions, 
+        CaseStmt( std::list<Label> labels, Expression *conditions,
               std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
 
@@ -192 +198 @@
         std::list<Statement *> &get_statements() { return stmts; }
         void set_statements( std::list<Statement *> &newValue ) { stmts = newValue; }
-        
+
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -208 +214 @@
         WhileStmt( std::list<Label> labels, Expression *condition,
                Statement *body, bool isDoWhile = false );
+        WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();
 
@@ -216 +223 @@
         bool get_isDoWhile() { return isDoWhile; }
         void set_isDoWhile( bool newValue ) { isDoWhile = newValue; }
-        
+
         virtual WhileStmt *clone() const { return new WhileStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -231 +238 @@
         ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
+        ForStmt( const ForStmt &other );
         virtual ~ForStmt();
 
@@ -241 +249 @@
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
-        
+
         virtual ForStmt *clone() const { return new ForStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -259 +267 @@
         BranchStmt( std::list<Label> labels, Label target, Type ) throw (SemanticError);
         BranchStmt( std::list<Label> labels, Expression *computedTarget, Type ) throw (SemanticError);
-        virtual ~BranchStmt() {}
 
         Label get_originalTarget() { return originalTarget; }
         Label get_target() { return target; }
         void set_target( Label newValue ) { target = newValue; }
-        
+
         Expression *get_computedTarget() { return computedTarget; }
         void set_target( Expression * newValue ) { computedTarget = newValue; }
@@ -286 +293 @@
   public:
         ReturnStmt( std::list<Label> labels, Expression *expr, bool throwP = false );
+        ReturnStmt( const ReturnStmt &other );
         virtual ~ReturnStmt();
 
         Expression *get_expr() { return expr; }
         void set_expr( Expression *newValue ) { expr = newValue; }
-        
+
         virtual ReturnStmt *clone() const { return new ReturnStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -305 +313 @@
         NullStmt();
         NullStmt( std::list<Label> labels );
-        virtual ~NullStmt();
 
         virtual NullStmt *clone() const { return new NullStmt( *this ); }
@@ -311 +318 @@
         virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-        
-  private:
-};
-
-class TryStmt : public Statement { 
+
+  private:
+};
+
+class TryStmt : public Statement {
   public:
         TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &handlers, FinallyStmt *finallyBlock = 0 );
@@ -332 +339 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-        
+
   private:
         CompoundStmt *block;
         std::list<Statement *> handlers;
         FinallyStmt *finallyBlock;
-}; 
+};
 
 class CatchStmt : public Statement {
   public:
         CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool isCatchRest = false );
+        CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();
 
@@ -349 +357 @@
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
-        
+
         virtual CatchStmt *clone() const { return new CatchStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-        
+
   private:
         Declaration *decl;
@@ -361 +369 @@
 };
 
-class FinallyStmt : public Statement { 
+class FinallyStmt : public Statement {
   public:
         FinallyStmt( std::list<Label> labels, CompoundStmt *block );
+        FinallyStmt( const FinallyStmt &other );
         virtual ~FinallyStmt();
 
         CompoundStmt *get_block() const { return block; }
         void set_block( CompoundStmt *newValue ) { block = newValue; }
-        
+
         virtual FinallyStmt *clone() const { return new FinallyStmt( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -375 +384 @@
   private:
         CompoundStmt *block;
-}; 
+};