Changeset 3b0bc16 for src/Parser

Timestamp:

Feb 1, 2022, 8:22:12 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

fde0a58

Parents:

729c991

Message:

change class name WhileStmt? to WhileDoStmt?, add else clause to WhileDoStmt? and ForStmt?, change names thenPart/ElsePart to then/else_

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• StatementNode.cc (modified) (2 diffs)
• parser.yy (modified) (4 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 : Sat Jan 29 09:45:56 2022
-// Update Count     : 901
+// Last Modified On : Tue Feb  1 11:06:18 2022
+// Update Count     : 903
 //
 
@@ -414 +414 @@
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
-Statement * build_while( CondCtl * ctl, StatementNode * stmt );
-Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
-Statement * build_for( ForCtrl * forctl, StatementNode * stmt );
+Statement * build_while( CondCtl * ctl, StatementNode * stmt, StatementNode * els = nullptr );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt, StatementNode * els = nullptr );
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt, StatementNode * els = nullptr );
 Statement * build_branch( BranchStmt::Type kind );
 Statement * build_branch( std::string * identifier, 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 : Sat Jan 29 09:45:51 2022
-// Update Count     : 384
+// Last Modified On : Tue Feb  1 18:39:00 2022
+// Update Count     : 395
 //
 
@@ -145 +145 @@
 } // build_default
 
-Statement * build_while( CondCtl * ctl, StatementNode * stmt ) {
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( stmt, branches );
-        assert( branches.size() == 1 );
-
+Statement * build_while( CondCtl * ctl, StatementNode * stmt, StatementNode * else_ ) {
         std::list< Statement * > init;
         Expression * cond = build_if_control( ctl, init );
-        return new WhileStmt( cond, branches.front(), init, false );
+
+        std::list< Statement * > aststmt;
+        buildMoveList< Statement, StatementNode >( stmt, aststmt );
+        assert( aststmt.size() == 1 );
+
+        std::list< Statement * > astelse;
+        buildMoveList< Statement, StatementNode >( else_, astelse );
+
+        return new WhileDoStmt( cond, aststmt.front(), astelse.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 );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt, StatementNode * else_ ) {
+        std::list< Statement * > aststmt;
+        buildMoveList< Statement, StatementNode >( stmt, aststmt );
+        assert( aststmt.size() == 1 );
+
+        std::list< Statement * > astelse;
+        buildMoveList< Statement, StatementNode >( else_, astelse );
 
         std::list< Statement * > init;
-        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, true );
+        return new WhileDoStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), aststmt.front(), astelse.front(), init, true );
 } // build_do_while
 
-Statement * build_for( ForCtrl * forctl, StatementNode * stmt ) {
-        std::list< Statement * > branches;
-        buildMoveList< Statement, StatementNode >( stmt, branches );
-        assert( branches.size() == 1 );
-
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt, StatementNode * else_ ) {
         std::list< Statement * > init;
-        if ( forctl->init != 0 ) {
+        if ( forctl->init != nullptr ) {
                 buildMoveList( forctl->init, init );
         } // if
 
-        Expression * cond = 0;
-        if ( forctl->condition != 0 )
+        Expression * cond = nullptr;
+        if ( forctl->condition != nullptr )
                 cond = notZeroExpr( maybeMoveBuild< Expression >(forctl->condition) );
 
-        Expression * incr = 0;
-        if ( forctl->change != 0 )
+        Expression * incr = nullptr;
+        if ( forctl->change != nullptr )
                 incr = maybeMoveBuild< Expression >(forctl->change);
 
+        std::list< Statement * > aststmt;
+        buildMoveList< Statement, StatementNode >( stmt, aststmt );
+        assert( aststmt.size() == 1 );
+
+        std::list< Statement * > astelse;
+        buildMoveList< Statement, StatementNode >( else_, astelse );
+
         delete forctl;
-        return new ForStmt( init, cond, incr, branches.front() );
+        return new ForStmt( init, cond, incr, aststmt.front(), astelse.front() );
 } // build_for
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 30 09:41:13 2022
-// Update Count     : 5165
+// Last Modified On : Tue Feb  1 11:06:13 2022
+// Update Count     : 5167
 //
 
@@ -1197 +1197 @@
                 { $$ = new StatementNode( build_while( $3, maybe_build_compound( $5 ) ) ); }
         | WHILE '(' conditional_declaration ')' statement ELSE statement // CFA
-                { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                // { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_while( $3, maybe_build_compound( $5 ), $7 ) ); }
         | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
                 { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), maybe_build_compound( $2 ) ) ); }
@@ -1203 +1204 @@
                 { $$ = new StatementNode( build_do_while( $5, maybe_build_compound( $2 ) ) ); }
         | DO statement WHILE '(' comma_expression ')' ELSE statement // CFA
-                { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                // { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_do_while( $5, maybe_build_compound( $2 ), $8 ) ); }
         | FOR '(' ')' statement                                                         // CFA => for ( ;; )
                 { $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), maybe_build_compound( $4 ) ) ); }
@@ -1209 +1211 @@
                 { $$ = new StatementNode( build_for( $3, maybe_build_compound( $5 ) ) ); }
         | FOR '(' for_control_expression_list ')' statement ELSE statement // CFA
-                { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                // { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_for( $3, maybe_build_compound( $5 ), $7 ) ); }
         ;