Changeset 401e61f

Timestamp:

Jun 5, 2018, 10:16:46 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

2248dc7, dafdbe7

Parents:

6e3eaa57

Message:

add if control to while loop

Location:

src

Files:

• Parser/ParseNode.h (modified) (2 diffs)
• Parser/StatementNode.cc (modified) (21 diffs)
• Parser/parser.yy (modified) (2 diffs)
• tests/.expect/ifwhileCtl.txt (moved) (moved from src/tests/.expect/ifcond.txt) (1 diff)
• tests/ifwhileCtl.c (moved) (moved from src/tests/ifcond.c) (2 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 30 09:19:17 2018
-// Update Count     : 831
+// Last Modified On : Mon Jun  4 22:21:04 2018
+// Update Count     : 832
 //
 
@@ -408 +408 @@
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
-Statement * build_while( ExpressionNode * ctl, StatementNode * stmt, bool kind = false );
+Statement * build_while( IfCtl * ctl, StatementNode * stmt );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_for( ForCtl * forctl, StatementNode * stmt );
 Statement * build_branch( BranchStmt::Type kind );

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 30 09:21:16 2018
-// Update Count     : 354
+// Last Modified On : Tue Jun  5 08:58:34 2018
+// Update Count     : 362
 //
 
@@ -69 +69 @@
         caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
         return this;
-}
+} // StatementNode::append_last_case
 
 Statement * build_expr( ExpressionNode * ctl ) {
         Expression * e = maybeMoveBuild< Expression >( ctl );
 
-        if ( e )
-                return new ExprStmt( e );
-        else
-                return new NullStmt();
-}
+        if ( e ) return new ExprStmt( e );
+        else return new NullStmt();
+} // build_expr
 
 Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init ) {
@@ -100 +98 @@
         delete ctl;
         return cond;
-}
+} // build_if_control
 
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
-        Statement * thenb, * elseb = 0;
+        Statement * thenb, * elseb = nullptr;
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( then_stmt, branches );
@@ -119 +117 @@
         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 ) {
@@ -135 +133 @@
         // 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 ) {
         std::list< Statement * > branches;
         return new CaseStmt( maybeMoveBuild< Expression >(ctl), branches );
-}
+} // build_case
+
 Statement * build_default() {
         std::list< Statement * > branches;
         return new CaseStmt( nullptr, branches, true );
-}
-
-Statement * build_while( ExpressionNode * ctl, StatementNode * stmt, bool kind ) {
+} // build_default
+
+Statement * build_while( IfCtl * ctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
@@ -151 +151 @@
 
         std::list< Statement * > init;
-        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, kind );
-}
+        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 ) {
+        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( ForCtl * forctl, StatementNode * stmt ) {
@@ -174 +184 @@
         delete forctl;
         return new ForStmt( init, cond, incr, branches.front() );
-}
+} // build_for
 
 Statement * build_branch( BranchStmt::Type kind ) {
         Statement * ret = new BranchStmt( "", kind );
         return ret;
-}
+} // build_branch
+
 Statement * build_branch( std::string * identifier, BranchStmt::Type kind ) {
         Statement * ret = new BranchStmt( * identifier, kind );
         delete identifier;                                                                      // allocated by lexer
         return ret;
-}
+} // build_branch
+
 Statement * build_computedgoto( ExpressionNode * ctl ) {
         return new BranchStmt( maybeMoveBuild< Expression >(ctl), BranchStmt::Goto );
-}
+} // build_computedgoto
 
 Statement * build_return( ExpressionNode * ctl ) {
@@ -193 +205 @@
         buildMoveList( ctl, exps );
         return new ReturnStmt( exps.size() > 0 ? exps.back() : nullptr );
-}
+} // build_return
 
 Statement * build_throw( ExpressionNode * ctl ) {
@@ -200 +212 @@
         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 ) {
@@ -207 +219 @@
         assertf( exps.size() < 2, "This means we are leaking memory");
         return new ThrowStmt( ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
-}
+} // build_resume
 
 Statement * build_resume_at( ExpressionNode * ctl, ExpressionNode * target ) {
@@ -213 +225 @@
         (void)target;
         assertf( false, "resume at (non-local throw) is not yet supported," );
-}
+} // build_resume_at
 
 Statement * build_try( StatementNode * try_stmt, StatementNode * catch_stmt, StatementNode * finally_stmt ) {
@@ -221 +233 @@
         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 ) {
         std::list< Statement * > branches;
@@ -227 +240 @@
         assert( branches.size() == 1 );
         return new CatchStmt( kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
-}
+} // build_catch
+
 Statement * build_finally( StatementNode * stmt ) {
         std::list< Statement * > branches;
@@ -233 +247 @@
         assert( branches.size() == 1 );
         return new FinallyStmt( dynamic_cast< CompoundStmt * >( branches.front() ) );
-}
+} // build_finally
 
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when ) {
@@ -254 +268 @@
 
         return node;
-}
+} // build_waitfor
 
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when, WaitForStmt * node ) {
@@ -273 +287 @@
 
         return node;
-}
+} // build_waitfor
 
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when ) {
@@ -282 +296 @@
                 node->timeout.statement = maybeMoveBuild<Statement >( stmt    );
                 node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
-        }
-        else {
+        } else {
                 node->orelse.statement  = maybeMoveBuild<Statement >( stmt );
                 node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( when ) );
-        }
+        } // if
 
         return node;
-}
+} // build_waitfor_timeout
 
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when,  StatementNode * else_stmt, ExpressionNode * else_when ) {
@@ -302 +315 @@
 
         return node;
-}
+} // build_waitfor_timeout
 
 WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
@@ -309 +322 @@
         Statement * s = maybeMoveBuild<Statement>( stmt );
         return new WithStmt( e, s );
-}
+} // build_with
 
 Statement * build_compound( StatementNode * first ) {
@@ -315 +328 @@
         buildMoveList( first, cs->get_kids() );
         return cs;
-}
+} // build_compound
 
 Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
@@ -325 +338 @@
         buildMoveList( clobber, clob );
         return new AsmStmt( voltile, instruction, out, in, clob, gotolabels ? gotolabels->labels : noLabels );
-}
+} // build_asm
 
 Statement * build_directive( string * directive ) {
         return new DirectiveStmt( *directive );
-}
+} // build_directive
 
 // Local Variables: //

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  4 21:24:46 2018
-// Update Count     : 3488
+// Last Modified On : Mon Jun  4 22:22:04 2018
+// Update Count     : 3492
 //
 
@@ -1050 +1050 @@
 
 iteration_statement:
-        WHILE '(' comma_expression ')' statement
-                { $$ = new StatementNode( build_while( $3, $5 ) ); }
+        WHILE '(' push if_control_expression ')' statement pop
+                { $$ = new StatementNode( build_while( $4, $6 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
-                { $$ = new StatementNode( build_while( $5, $2, true ) ); }
+                { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
         | FOR '(' push for_control_expression ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }

src/tests/.expect/ifwhileCtl.txt

@@ -3 +3 @@
 x == y correct
 s.i < 4 correct
+x != 0 correct
+x == y correct
+s.i < 4 correct

src/tests/ifwhileCtl.c

@@ -10 +10 @@
 // Created On       : Sat Aug 26 10:13:11 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  2 09:55:02 2018
-// Update Count     : 15
+// Last Modified On : Mon Jun  4 22:46:48 2018
+// Update Count     : 19
 //
 
@@ -42 +42 @@
 
         if ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+                S s1;
                 sout | "s.i < 4 correct" | endl;
         } else {
+                S s1;
                 sout | "s.i >= 4 incorrect" | endl;
         } // if
+
+        while ( int x = 1 ) {
+                sout | "x != 0 correct" | endl;
+                break;
+        } // while
+
+        while ( int x = 4, y = 0 ) {
+                sout | "x != 0 && y != 0 incorrect" | endl;
+        } // while
+
+        while ( int x = 5, y = f( x ); x == y ) {
+                sout | "x == y correct" | endl;
+                break;
+        } // while
+
+        while ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+                S s1;
+                sout | "s.i < 4 correct" | endl;
+                break;
+        } // while
 } // main