Changes in src/Parser/parser.yy [ecae5860:401e61f]

File:

• src/Parser/parser.yy (modified) (5 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 : Fri Jun  1 17:59:57 2018
-// Update Count     : 3476
+// 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 ) ); }
@@ -1331 +1331 @@
         c_declaration ';'
         | cfa_declaration ';'                                                           // CFA
-        | static_assert
+        | static_assert                                                                         // C11
         ;
 
@@ -1337 +1337 @@
         STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
                 { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
+        | STATICASSERT '(' constant_expression ')' ';'          // CFA
+                { $$ = DeclarationNode::newStaticAssert( $3, build_constantStr( *new string( "\"\"" ) ) ); }
 
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
@@ -1881 +1883 @@
 
 field_declaration:
-        cfa_field_declaring_list ';'                                            // CFA, new style field declaration
+        type_specifier field_declaring_list ';'
+                { $$ = distAttr( $1, $2 ); }
+        | EXTENSION type_specifier field_declaring_list ';'     // GCC
+                { distExt( $3 ); $$ = distAttr( $2, $3 ); }             // mark all fields in list
+        | typedef_declaration ';'                                                       // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
+        | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
-                {
-                        distExt( $2 );                                                          // mark all fields in list
-                        $$ = $2;
-                }
-        | type_specifier field_declaring_list ';'
-                {
-                        $$ = distAttr( $1, $2 ); }
-        | EXTENSION type_specifier field_declaring_list ';'     // GCC
-                {
-                        distExt( $3 );                                                          // mark all fields in list
-                        $$ = distAttr( $2, $3 );
-                }
-        | static_assert
+                { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
+        | cfa_typedef_declaration ';'                                           // CFA
+                { SemanticError( yylloc, "Typedef in aggregate is currently unimplemented." ); $$ = nullptr; }
+        | static_assert                                                                         // C11
         ;