Changes in src/SynTree/Statement.cc [046e04a:b3c36f4]

File:

• src/SynTree/Statement.cc (modified) (8 diffs)

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 Jun 12 10:37:00 2017
-// Update Count     : 64
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Aug 12 13:58:48 2016
+// Update Count     : 62
 //
 
@@ -101 +101 @@
 }
 
-ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr ) : Statement( labels ), expr( _expr ) {}
-
-ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
+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() {
@@ -110 +110 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) const {
-        os <<  "Return Statement, returning: ";
+        os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
         if ( expr != 0 ) {
                 os << endl << string( indent+2, ' ' );
@@ -287 +287 @@
 }
 
-ThrowStmt::ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target ) :
-                Statement( labels ), kind(kind), expr(expr), target(target)     {
-        assertf(Resume == kind || nullptr == target, "Non-local termination throw is not accepted." );
-}
-
-ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
-        Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
-}
-
-ThrowStmt::~ThrowStmt() {
-        delete expr;
-        delete target;
-}
-
-void ThrowStmt::print( std::ostream &os, int indent) const {
-        if ( target ) {
-                os << "Non-Local ";
-        }
-        os << "Throw Statement, raising: ";
-        expr->print(os, indent + 4);
-        if ( target ) {
-                os << "At: ";
-                target->print(os, indent + 4);
-        }
-}
-
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &_handlers, FinallyStmt *_finallyBlock ) :
         Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
 }
@@ -334 +308 @@
         // handlers
         os << string( indent + 2, ' ' ) << "and handlers: " << endl;
-        for ( std::list<CatchStmt *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
+        for ( std::list<Statement *>::const_iterator i = handlers.begin(); i != handlers.end(); i++)
                 (*i )->print( os, indent + 4 );
 
@@ -344 +318 @@
 }
 
-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, Declaration *_decl, Statement *_body, bool catchAny ) :
+        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
 }
 
 CatchStmt::CatchStmt( const CatchStmt & other ) :
-        Statement( other ), kind ( other.kind ), decl ( maybeClone( other.decl ) ), cond ( maybeClone( other.cond ) ), body( maybeClone( other.body ) ) {
+        Statement( other ), decl ( maybeClone( other.decl ) ), body( maybeClone( other.body ) ), catchRest ( other.catchRest ) {
 }
 
@@ -358 +332 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) const {
-        os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
+        os << "Catch Statement" << endl;
 
         os << string( indent, ' ' ) << "... catching" << endl;
@@ -364 +338 @@
                 decl->printShort( os, indent + 4 );
                 os << endl;
-        }
+        } else if ( catchRest )
+                os << string( indent + 4 , ' ' ) << "the rest" << endl;
         else
                 os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;