Changeset 473d1da0

Timestamp:

Jan 31, 2022, 6:59:08 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

0fba0d4

Parents:

c9c1c1c

git-author:

Peter A. Buhr <pabuhr@…> (01/31/22 18:57:10)

git-committer:

Peter A. Buhr <pabuhr@…> (01/31/22 18:59:08)

Message:

rename "if control" to "conditional control"

Location:

src/Parser

Files:

• ParseNode.h (modified) (3 diffs)
• StatementNode.cc (modified) (4 diffs)
• parser.yy (modified) (5 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 : Wed Jul 14 17:28:53 2021
-// Update Count     : 900
+// Last Modified On : Sat Jan 29 09:45:56 2022
+// Update Count     : 901
 //
 
@@ -390 +390 @@
 Statement * build_expr( ExpressionNode * ctl );
 
-struct IfCtrl {
-        IfCtrl( DeclarationNode * decl, ExpressionNode * condition ) :
+struct CondCtl {
+        CondCtl( DeclarationNode * decl, ExpressionNode * condition ) :
                 init( decl ? new StatementNode( decl ) : nullptr ), condition( condition ) {}
 
@@ -409 +409 @@
 };
 
-Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init );
-Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
+Expression * build_if_control( CondCtl * ctl, std::list< Statement * > & init );
+Statement * build_if( CondCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
-Statement * build_while( IfCtrl * ctl, StatementNode * stmt );
+Statement * build_while( CondCtl * ctl, StatementNode * stmt );
 Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_for( ForCtrl * forctl, StatementNode * stmt );

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 Oct 24 04:20:55 2020
-// Update Count     : 383
+// Last Modified On : Sat Jan 29 09:45:51 2022
+// Update Count     : 384
 //
 
@@ -78 +78 @@
 } // build_expr
 
-Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init ) {
+Expression * build_if_control( CondCtl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
@@ -100 +100 @@
 } // build_if_control
 
-Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+Statement * build_if( CondCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
         Statement * thenb, * elseb = nullptr;
         std::list< Statement * > branches;
@@ -145 +145 @@
 } // build_default
 
-Statement * build_while( IfCtrl * ctl, StatementNode * stmt ) {
+Statement * build_while( CondCtl * ctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Oct 15 09:20:17 2021
-// Update Count     : 5163
+// Last Modified On : Sun Jan 30 09:41:13 2022
+// Update Count     : 5165
 //
 
@@ -238 +238 @@
         WaitForStmt * wfs;
         Expression * constant;
-        IfCtrl * ifctl;
+        CondCtl * ifctl;
         ForCtrl * fctl;
         enum OperKinds compop;
@@ -327 +327 @@
 %type<en> comma_expression                              comma_expression_opt
 %type<en> argument_expression_list_opt  argument_expression_list        argument_expression                     default_initializer_opt
-%type<ifctl> if_control_expression
+%type<ifctl> conditional_declaration
 %type<fctl> for_control_expression              for_control_expression_list
 %type<compop> inclexcl
@@ -1123 +1123 @@
 
 if_statement:
-        IF '(' if_control_expression ')' statement                      %prec THEN
+        IF '(' conditional_declaration ')' statement            %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
                 { $$ = new StatementNode( build_if( $3, maybe_build_compound( $5 ), nullptr ) ); }
-        | IF '(' if_control_expression ')' statement ELSE statement
+        | IF '(' conditional_declaration ')' statement ELSE statement
                 { $$ = new StatementNode( build_if( $3, maybe_build_compound( $5 ), maybe_build_compound( $7 ) ) ); }
         ;
 
-if_control_expression:
+conditional_declaration:
         comma_expression
-                { $$ = new IfCtrl( nullptr, $1 ); }
+                { $$ = new CondCtl( nullptr, $1 ); }
         | c_declaration                                                                         // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
+                { $$ = new CondCtl( $1, nullptr ); }
         | cfa_declaration                                                                       // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
+                { $$ = new CondCtl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
-                { $$ = new IfCtrl( $1, $2 ); }
+                { $$ = new CondCtl( $1, $2 ); }
         ;
 
@@ -1193 +1193 @@
 iteration_statement:
         WHILE '(' ')' statement                                                         // CFA => while ( 1 )
-                { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) ); }
-        | WHILE '(' if_control_expression ')' statement         %prec THEN
+                { $$ = new StatementNode( build_while( new CondCtl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) ); }
+        | WHILE '(' conditional_declaration ')' statement       %prec THEN
                 { $$ = new StatementNode( build_while( $3, maybe_build_compound( $5 ) ) ); }
-        | WHILE '(' if_control_expression ')' statement ELSE statement // CFA
+        | WHILE '(' conditional_declaration ')' statement ELSE statement // CFA
                 { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
         | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )