Changes in src/SynTree/Statement.cc [e612146c:135b431]

File:

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

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:46:44 2017
-// Update Count     : 68
+// Last Modified On : Thu Aug 17 16:17:20 2017
+// Update Count     : 67
 //
 
@@ -52 +52 @@
 
 
-AsmStmt::AsmStmt( std::list<Label> labels, bool voltile, Expression *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( 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 ) {
@@ -89 +89 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
+        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() ) {
+        if ( type == BranchStmt::Goto && target.empty() )
                 throw SemanticError("goto without target");
-        }
 }
 
 BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
         Statement( labels ), computedTarget( computedTarget ), type( type ) {
-        if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
+        if ( type != BranchStmt::Goto || computedTarget == 0 )
                 throw SemanticError("Computed target not valid in branch statement");
-        }
 }
 
 void BranchStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "Branch (" << brType[type] << ")" << endl ;
-        if ( target != "" ) os << string( indent+2, ' ' ) << "with target: " << target << endl;
-        if ( originalTarget != "" ) os << string( indent+2, ' ' ) << "with original target: " << originalTarget << endl;
-        if ( computedTarget != nullptr ) os << string( indent+2, ' ' ) << "with computed target: " << computedTarget << endl;
 }