Changes in src/Parser/StatementNode.cc [6180274:de52331]

File:

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

src/Parser/StatementNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// StatementNode.cc -- Transform from parse data-structures to AST data-structures, usually deleting the parse
-//     data-structure after the transformation.
+// StatementNode.cc --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 20:29:30 2022
-// Update Count     : 425
+// Last Modified On : Sat Oct 24 04:20:55 2020
+// Update Count     : 383
 //
 
@@ -64 +63 @@
         // convert from StatementNode list to Statement list
         StatementNode * node = dynamic_cast< StatementNode * >(prev);
-        list< Statement * > stmts;
+        std::list< Statement * > stmts;
         buildMoveList( stmt, stmts );
         // splice any new Statements to end of current Statements
@@ -79 +78 @@
 } // build_expr
 
-Expression * build_if_control( CondCtl * ctl, list< Statement * > & init ) {
+Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
@@ -101 +100 @@
 } // build_if_control
 
-Statement * build_if( CondCtl * ctl, StatementNode * then, StatementNode * else_ ) {
-        list< Statement * > astinit;                                            // maybe empty
-        Expression * astcond = build_if_control( ctl, astinit ); // ctl deleted, cond/init set
-
-        Statement * astthen, * astelse = nullptr;
-        list< Statement * > aststmt;
-        buildMoveList< Statement, StatementNode >( then, aststmt );
-        assert( aststmt.size() == 1 );
-        astthen = aststmt.front();
-
-        if ( else_ ) {
-                list< Statement * > aststmt;
-                buildMoveList< Statement, StatementNode >( else_, aststmt );
-                assert( aststmt.size() == 1 );
-                astelse = aststmt.front();
-        } // if
-
-        return new IfStmt( astcond, astthen, astelse, astinit );
+Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+        Statement * thenb, * elseb = nullptr;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
+        } // if
+
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
+        return new IfStmt( cond, thenb, elseb, init );
 } // build_if
 
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt ) {
-        list< Statement * > aststmt;
-        buildMoveList< Statement, StatementNode >( stmt, aststmt );
-        if ( ! isSwitch ) {                                                                     // choose statement
-                for ( Statement * stmt : aststmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        if ( ! isSwitch ) {                                                                             // choose statement
+                for ( Statement * stmt : branches ) {
                         CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
                         if ( ! caseStmt->stmts.empty() ) {                      // code after "case" => end of case list
@@ -133 +131 @@
                 } // for
         } // if
-        // aststmt.size() == 0 for switch (...) {}, i.e., no declaration or statements
-        return new SwitchStmt( maybeMoveBuild< Expression >(ctl), aststmt );
+        // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
+        return new SwitchStmt( maybeMoveBuild< Expression >(ctl), branches );
 } // build_switch
 
 Statement * build_case( ExpressionNode * ctl ) {
-        return new CaseStmt( maybeMoveBuild< Expression >(ctl), {} ); // stmt starts empty and then added to
+        std::list< Statement * > branches;
+        return new CaseStmt( maybeMoveBuild< Expression >(ctl), branches );
 } // build_case
 
 Statement * build_default() {
-        return new CaseStmt( nullptr, {}, true );                       // stmt starts empty and then added to
+        std::list< Statement * > branches;
+        return new CaseStmt( nullptr, branches, true );
 } // build_default
 
-Statement * build_while( CondCtl * ctl, StatementNode * stmt, StatementNode * else_ ) {
-        list< Statement * > astinit;                                            // maybe empty
-        Expression * astcond = build_if_control( ctl, astinit ); // ctl deleted, cond/init set
-
-        list< Statement * > aststmt;                                            // loop body, compound created if empty
-        buildMoveList< Statement, StatementNode >( stmt, aststmt );
-        assert( aststmt.size() == 1 );
-
-        list< Statement * > astelse;                                            // else clause, maybe empty
-        buildMoveList< Statement, StatementNode >( else_, astelse );
-
-        return new WhileDoStmt( astcond, aststmt.front(), astelse.front(), astinit, false );
+Statement * build_while( IfCtrl * ctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
+        return new WhileStmt( cond, branches.front(), init, false );
 } // build_while
 
-Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt, StatementNode * else_ ) {
-        list< Statement * > aststmt;                                            // loop body, compound created if empty
-        buildMoveList< Statement, StatementNode >( stmt, aststmt );
-        assert( aststmt.size() == 1 );                                          // compound created if empty
-
-        list< Statement * > astelse;                                            // else clause, maybe empty
-        buildMoveList< Statement, StatementNode >( else_, astelse );
-
-        // do-while cannot have declarations in the contitional, so init is always empty
-        return new WhileDoStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), aststmt.front(), astelse.front(), {}, true );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+
+        std::list< Statement * > init;
+        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, true );
 } // build_do_while
 
-Statement * build_for( ForCtrl * forctl, StatementNode * stmt, StatementNode * else_ ) {
-        list< Statement * > astinit;                                            // maybe empty
-        buildMoveList( forctl->init, astinit );
-
-        Expression * astcond = nullptr;                                         // maybe empty
-        astcond = notZeroExpr( maybeMoveBuild< Expression >(forctl->condition) );
-
-        Expression * astincr = nullptr;                                         // maybe empty
-        astincr = maybeMoveBuild< Expression >(forctl->change);
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+
+        std::list< Statement * > init;
+        if ( forctl->init != 0 ) {
+                buildMoveList( forctl->init, init );
+        } // if
+
+        Expression * cond = 0;
+        if ( forctl->condition != 0 )
+                cond = notZeroExpr( maybeMoveBuild< Expression >(forctl->condition) );
+
+        Expression * incr = 0;
+        if ( forctl->change != 0 )
+                incr = maybeMoveBuild< Expression >(forctl->change);
+
         delete forctl;
-
-        list< Statement * > aststmt;                                            // loop body, compound created if empty
-        buildMoveList< Statement, StatementNode >( stmt, aststmt );
-        assert( aststmt.size() == 1 );
-
-        list< Statement * > astelse;                                            // else clause, maybe empty
-        buildMoveList< Statement, StatementNode >( else_, astelse );
-
-        return new ForStmt( astinit, astcond, astincr, aststmt.front(), astelse.front() );
+        return new ForStmt( init, cond, incr, branches.front() );
 } // build_for
 
@@ -197 +191 @@
 } // build_branch
 
-Statement * build_branch( string * identifier, BranchStmt::Type kind ) {
+Statement * build_branch( std::string * identifier, BranchStmt::Type kind ) {
         Statement * ret = new BranchStmt( * identifier, kind );
         delete identifier;                                                                      // allocated by lexer
@@ -208 +202 @@
 
 Statement * build_return( ExpressionNode * ctl ) {
-        list< Expression * > exps;
+        std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         return new ReturnStmt( exps.size() > 0 ? exps.back() : nullptr );
@@ -214 +208 @@
 
 Statement * build_throw( ExpressionNode * ctl ) {
-        list< Expression * > exps;
+        std::list< Expression * > exps;
         buildMoveList( ctl, exps );
-        assertf( exps.size() < 2, "CFA internal error: leaking memory" );
+        assertf( exps.size() < 2, "This means we are leaking memory");
         return new ThrowStmt( ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
 } // build_throw
 
 Statement * build_resume( ExpressionNode * ctl ) {
-        list< Expression * > exps;
+        std::list< Expression * > exps;
         buildMoveList( ctl, exps );
-        assertf( exps.size() < 2, "CFA internal error: leaking memory" );
+        assertf( exps.size() < 2, "This means we are leaking memory");
         return new ThrowStmt( ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
 } // build_resume
@@ -233 +227 @@
 } // build_resume_at
 
-Statement * build_try( StatementNode * try_, StatementNode * catch_, StatementNode * finally_ ) {
-        list< CatchStmt * > aststmt;
-        buildMoveList< CatchStmt, StatementNode >( catch_, aststmt );
-        CompoundStmt * tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_));
-        FinallyStmt * finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_) );
-        return new TryStmt( tryBlock, aststmt, finallyBlock );
+Statement * build_try( StatementNode * try_stmt, StatementNode * catch_stmt, StatementNode * finally_stmt ) {
+        std::list< CatchStmt * > branches;
+        buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
+        CompoundStmt * tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        FinallyStmt * finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
+        return new TryStmt( tryBlock, branches, finallyBlock );
 } // build_try
 
 Statement * build_catch( CatchStmt::Kind kind, DeclarationNode * decl, ExpressionNode * cond, StatementNode * body ) {
-        list< Statement * > aststmt;
-        buildMoveList< Statement, StatementNode >( body, aststmt );
-        assert( aststmt.size() == 1 );
-        return new CatchStmt( kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), aststmt.front() );
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( body, branches );
+        assert( branches.size() == 1 );
+        return new CatchStmt( kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
 } // build_catch
 
 Statement * build_finally( StatementNode * stmt ) {
-        list< Statement * > aststmt;
-        buildMoveList< Statement, StatementNode >( stmt, aststmt );
-        assert( aststmt.size() == 1 );
-        return new FinallyStmt( dynamic_cast< CompoundStmt * >( aststmt.front() ) );
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        return new FinallyStmt( dynamic_cast< CompoundStmt * >( branches.front() ) );
 } // build_finally
 
@@ -260 +254 @@
         node->type = type;
 
-        list< Statement * > stmts;
+        std::list< Statement * > stmts;
         buildMoveList< Statement, StatementNode >( then, stmts );
         if(!stmts.empty()) {
@@ -325 +319 @@
 } // build_waitfor_timeout
 
-WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when,  StatementNode * else_, ExpressionNode * else_when ) {
+WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when,  StatementNode * else_stmt, ExpressionNode * else_when ) {
         auto node = new WaitForStmt();
 
@@ -332 +326 @@
         node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
 
-        node->orelse.statement  = maybeMoveBuild<Statement >( else_ );
+        node->orelse.statement  = maybeMoveBuild<Statement >( else_stmt );
         node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( else_when ) );
 
@@ -339 +333 @@
 
 Statement * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
-        list< Expression * > e;
+        std::list< Expression * > e;
         buildMoveList( exprs, e );
         Statement * s = maybeMoveBuild<Statement>( stmt );
@@ -367 +361 @@
 
 Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
-        list< Expression * > out, in;
-        list< ConstantExpr * > clob;
+        std::list< Expression * > out, in;
+        std::list< ConstantExpr * > clob;
 
         buildMoveList( output, out );
@@ -381 +375 @@
 
 Statement * build_mutex( ExpressionNode * exprs, StatementNode * stmt ) {
-        list< Expression * > expList;
+        std::list< Expression * > expList;
         buildMoveList( exprs, expList );
         Statement * body = maybeMoveBuild<Statement>( stmt );