Changeset b0dfbc4

Timestamp:

Sep 1, 2017, 7:03:25 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

1395748, dbc733e

Parents:

5809461

git-author:

Rob Schluntz <rschlunt@…> (09/01/17 19:00:17)

git-committer:

Rob Schluntz <rschlunt@…> (09/01/17 19:03:25)

Message:

Clean up BranchStmt? code

Location:

src

Files:

• SynTree/Statement.cc (modified) (1 diff)
• tests/.expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• tests/.expect/dtor-early-exit-ERR2.txt (modified) (1 diff)

src/SynTree/Statement.cc

@@ -89 +89 @@
 
 BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
+        Statement( labels ), originalTarget( target ), target( target ), computedTarget( nullptr ), 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 == 0 )
+        if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
                 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;
 }
 

src/tests/.expect/dtor-early-exit-ERR1.txt

@@ -1 +1 @@
 dtor-early-exit.c:142:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
+  with target: L1
+  with original target: L1
 

src/tests/.expect/dtor-early-exit-ERR2.txt

@@ -1 +1 @@
 dtor-early-exit.c:142:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
+  with target: L2
+  with original target: L2