Changeset 455a7d5 for src/Parser/parser.yy

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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 jenkins-sandbox

File:

• src/Parser/parser.yy (modified) (8 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 25 15:54:35 2018
-// Update Count     : 3841
+// Last Modified On : Wed Aug  8 17:50:07 2018
+// Update Count     : 3998
 //
 
@@ -186 +186 @@
 } // fieldDecl
 
+ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        return new ForCtrl(
+                distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
+                new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
+                new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
+} // forCtrl
+
+
 bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 
@@ -217 +225 @@
         WaitForStmt * wfs;
         Expression * constant;
-        IfCtl * ifctl;
-        ForCtl * fctl;
+        IfCtrl * ifctl;
+        ForCtrl * fctl;
+        enum OperKinds compop;
         LabelNode * label;
         InitializerNode * in;
@@ -281 +290 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
+%token Erange                                                                                   // ~=
 %token ATassign                                                                                 // @=
 
@@ -303 +313 @@
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression
+%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
@@ -1049 +1060 @@
 if_control_expression:
         comma_expression
-                { $$ = new IfCtl( nullptr, $1 ); }
+                { $$ = new IfCtrl( nullptr, $1 ); }
         | c_declaration                                                                         // no semi-colon
-                { $$ = new IfCtl( $1, nullptr ); }
+                { $$ = new IfCtrl( $1, nullptr ); }
         | cfa_declaration                                                                       // no semi-colon
-                { $$ = new IfCtl( $1, nullptr ); }
+                { $$ = new IfCtrl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
-                { $$ = new IfCtl( $1, $2 ); }
+                { $$ = new IfCtrl( $1, $2 ); }
         ;
 
@@ -1111 +1122 @@
         WHILE '(' push if_control_expression ')' statement pop
                 { $$ = new StatementNode( build_while( $4, $6 ) ); }
+        | WHILE '(' ')' statement                                                       // CFA => while ( 1 )
+                { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), $4 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
                 { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
+        | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
+                { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), $2 ) ); }
         | FOR '(' push for_control_expression ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
@@ -1118 +1133 @@
 
 for_control_expression:
-        comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtl( $1, $3, $5 ); }
-        | declaration comma_expression_opt ';' comma_expression_opt // C99
-                { $$ = new ForCtl( $1, $2, $4 ); }
+        comma_expression_opt                                                            // CFA
+                {
+                        if ( ! $1 ) {                                                           // => for ( ;; )
+                                $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
+                        } else {
+                                $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $1->clone(),
+                                                         new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                        } // if
+                }
+        | constant_expression inclexcl constant_expression      // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
+        | comma_expression_opt ';' comma_expression                     // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else if ( ! $3 ) {
+                                SemanticError( yylloc, "Missing loop range." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $3->clone(),
+                                                                 new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtrl( $1, $3, $5 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
+                { $$ = new ForCtrl( $1, $2, $4 ); }
+        ;
+
+inclexcl:
+        '~'
+                { $$ = OperKinds::LThan; }
+        | Erange
+                { $$ = OperKinds::LEThan; }
         ;