Changeset f80e0218 for src/Parser/StatementNode.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/Parser/StatementNode.cc (modified) (12 diffs)

src/Parser/StatementNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// StatementNode.cc -- 
+// StatementNode.cc --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 14:39:39 2015
-// Update Count     : 130
+// Last Modified On : Thu Jun  9 14:18:46 2016
+// Update Count     : 132
 //
 
@@ -27 +27 @@
 
 const char *StatementNode::StType[] = {
-        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru", 
-        "While", "Do",       "For", 
+        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru",
+        "While", "Do",       "For",
         "Goto",  "Continue", "Break",  "Return",  "Throw",
         "Try",   "Catch",    "Finally", "Asm",
@@ -62 +62 @@
 StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
         this->control = ( t == Default ) ? 0 : control;
-} 
+}
 
 StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {}
@@ -74 +74 @@
 
 StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) {
-        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s ); 
+        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s );
         ret->addDeclaration( d );
         ret->setCatchRest( catchRestP );
@@ -101 +101 @@
 StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
-                labels.push_front( *l ); 
+                labels.push_front( *l );
                 delete l;
         } // if
@@ -156 +156 @@
                         control->print( os, indent );
                         os << endl;
-                } else 
+                } else
                         os << string( indent, ' ' ) << "Null Statement" << endl;
                 break;
@@ -177 +177 @@
                 if ( block ) {
                         os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
-                        block->printList( os, indent + 2 * ParseNode::indent_by );  
+                        block->printList( os, indent + 2 * ParseNode::indent_by );
                 } // if
                 if ( target ) {
@@ -222 +222 @@
                                 branches.pop_front();
                         } // if
-                        return new IfStmt( labs, notZeroExpr( get_control()->build() ), thenb, elseb );
+                        return new IfStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), thenb, elseb );
                 }
           case While:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front() );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front() );
           case Do:
                 assert( branches.size() == 1 );
-                return new WhileStmt( labs, notZeroExpr( get_control()->build() ), branches.front(), true );
+                return new WhileStmt( labs, notZeroExpr( maybeBuild<Expression>(get_control()) ), branches.front(), true );
           case For:
                 {
@@ -244 +244 @@
                         Expression *cond = 0;
                         if ( ctl->get_condition() != 0 )
-                                cond = notZeroExpr( ctl->get_condition()->build() );
+                                cond = notZeroExpr( maybeBuild<Expression>(ctl->get_condition()) );
 
                         Expression *incr = 0;
                         if ( ctl->get_change() != 0 )
-                                incr = ctl->get_change()->build();
+                                incr = maybeBuild<Expression>(ctl->get_change());
 
                         return new ForStmt( labs, init, cond, incr, branches.front() );
                 }
           case Switch:
-                return new SwitchStmt( labs, get_control()->build(), branches );
+                return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Choose:
-                return new ChooseStmt( labs, get_control()->build(), branches );
+                return new ChooseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Fallthru:
                 return new FallthruStmt( labs );
-          case Case: 
-                return new CaseStmt( labs, get_control()->build(), branches );
+          case Case:
+                return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
                 return new CaseStmt( labs, 0, branches, true );
@@ -266 +266 @@
                         if ( get_target() == "" ) {                                     // computed goto
                                 assert( get_control() != 0 );
-                                return new BranchStmt( labs, get_control()->build(), BranchStmt::Goto );
+                                return new BranchStmt( labs, maybeBuild<Expression>(get_control()), BranchStmt::Goto );
                         } // if
 
@@ -394 +394 @@
                 os << string( indent + ParseNode::indent_by, ' ' ) << "Goto Labels:" << endl;
                 os << string( indent + 2 * ParseNode::indent_by, ' ' );
-                for ( std::list<std::string>::const_iterator i = gotolabels.begin();; ) {
+                for ( std::list<Label>::const_iterator i = gotolabels.begin();; ) {
                         os << *i;
                         i++;
@@ -426 +426 @@
 }
 
-Statement *NullStmtNode::build() const { 
+Statement *NullStmtNode::build() const {
         return new NullStmt;
 }