Changeset 6d49ea3 for src/SynTree

Timestamp:

Aug 17, 2017, 5:37:20 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

274ce8c

Parents:

936e9f4

Message:

second attempt, add declarations into if conditional

Location:

src/SynTree

Files:

• Mutator.cc (modified) (2 diffs)
• Statement.cc (modified) (15 diffs)
• Statement.h (modified) (3 diffs)
• Visitor.cc (modified) (2 diffs)

src/SynTree/Mutator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:32:00 2017
-// Update Count     : 25
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:37 2017
+// Update Count     : 27
 //
 
@@ -114 +114 @@
 
 Statement *Mutator::mutate( IfStmt *ifStmt ) {
+        mutateAll( ifStmt->get_initialization(), *this );
         ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
         ifStmt->set_thenPart( maybeMutate( ifStmt->get_thenPart(), *this ) );

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 12:26:00 2017
-// Update Count     : 65
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 16:17:20 2017
+// Update Count     : 67
 //
 
@@ -32 +32 @@
 using std::endl;
 
-Statement::Statement( std::list<Label> _labels ) : labels( _labels ) {}
+Statement::Statement( std::list<Label> labels ) : labels( labels ) {}
 
 void Statement::print( __attribute__((unused)) std::ostream &, __attribute__((unused)) int indent ) const {}
@@ -38 +38 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
+ExprStmt::ExprStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -88 +88 @@
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
-BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
+        Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() )
@@ -95 +95 @@
 }
 
-BranchStmt::BranchStmt( std::list<Label> labels, Expression *_computedTarget, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), computedTarget( _computedTarget ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
+        Statement( labels ), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == 0 )
                 throw SemanticError("Computed target not valid in branch statement");
@@ -105 +105 @@
 }
 
-ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr ) : Statement( labels ), expr( _expr ) {}
+ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -122 +122 @@
 }
 
-IfStmt::IfStmt( std::list<Label> _labels, Expression *_condition, Statement *_thenPart, Statement *_elsePart ):
-        Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
+IfStmt::IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
+        Statement( labels ), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
 IfStmt::IfStmt( const IfStmt & other ) :
-        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
+        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {
+        cloneAll( other.initialization, initialization );
+}
 
 IfStmt::~IfStmt() {
+        deleteAll( initialization );
         delete condition;
         delete thenPart;
@@ -139 +142 @@
         condition->print( os, indent + 4 );
 
+        if ( !initialization.empty() ) {
+                os << string( indent + 2, ' ' ) << "initialization: \n";
+                for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+                        os << string( indent + 4, ' ' );
+                        (*it)->print( os, indent + 4 );
+                }
+                os << endl;
+        }
+
         os << string( indent+2, ' ' ) << "... then: " << endl;
 
@@ -151 +163 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
-        Statement( _labels ), condition( _condition ), statements( _statements ) {
+SwitchStmt::SwitchStmt( std::list<Label> labels, Expression * condition, std::list<Statement *> &statements ):
+        Statement( labels ), condition( condition ), statements( statements ) {
 }
 
@@ -179 +191 @@
 }
 
-CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) :
-        Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
+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");
@@ -216 +228 @@
 }
 
-WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition_, Statement *body_, bool isDoWhile_ ):
-        Statement( labels ), condition( condition_), body( body_), isDoWhile( isDoWhile_) {
+WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition, Statement *body, bool isDoWhile ):
+        Statement( labels ), condition( condition), body( body), isDoWhile( isDoWhile) {
 }
 
@@ -238 +250 @@
 }
 
-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( std::list<Label> labels, std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
+        Statement( labels ), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
 
@@ -317 +329 @@
 }
 
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
-        Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
+        Statement( labels ), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
@@ -351 +363 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Kind _kind, Declaration *_decl, Expression *_cond, Statement *_body ) :
-        Statement( labels ), kind ( _kind ), decl ( _decl ), cond ( _cond ), body( _body ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
+        Statement( labels ), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
 }
 
@@ -389 +401 @@
 
 
-FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *_block ) : Statement( labels ), block( _block ) {
+FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *block ) : Statement( labels ), block( block ) {
         assert( labels.empty() ); // finally statement cannot be labeled
 }

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 16 16:28:55 2017
-// Update Count     : 70
+// Last Modified On : Thu Aug 17 15:37:53 2017
+// Update Count     : 72
 //
 
@@ -127 +127 @@
 class IfStmt : public Statement {
   public:
-        std::list<Statement *> initialization;
         Expression *condition;
         Statement *thenPart;
         Statement *elsePart;
-
-        IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
+        std::list<Statement *> initialization;
+
+        IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart,
+                        std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt &other );
         virtual ~IfStmt();
 
         std::list<Statement *> &get_initialization() { return initialization; }
-        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
@@ -239 +239 @@
 
         std::list<Statement *> &get_initialization() { return initialization; }
-        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }

src/SynTree/Visitor.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:30:00 2017
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:38 2017
+// Update Count     : 29
 //
 
@@ -99 +99 @@
 
 void Visitor::visit( IfStmt *ifStmt ) {
+        acceptAll( ifStmt->get_initialization(), *this );
         maybeAccept( ifStmt->get_condition(), *this );
         maybeAccept( ifStmt->get_thenPart(), *this );