Changeset cc7bbe6 for src/Parser/parser.yy

Timestamp:

Feb 23, 2022, 11:24:34 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

08ed947

Parents:

f5a51db (diff), 3a038fa (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (11 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 : Tue Feb  1 11:06:13 2022
-// Update Count     : 5167
+// Last Modified On : Sat Feb 19 09:47:20 2022
+// Update Count     : 5218
 //
 
@@ -1052 +1052 @@
         identifier_or_type_name ':' attribute_list_opt statement
                 { $$ = $4->add_label( $1, $3 ); }
+        | identifier_or_type_name ':' attribute_list_opt error
+                { SemanticError( yylloc, "previous label must be associated with a statement (where a declaration is not a statement). Move the label or terminate with a semi-colon." ); $$ = nullptr; }
         ;
 
@@ -1086 +1088 @@
         | statement_list_nodecl statement
                 { assert( $1 ); $1->set_last( $2 ); $$ = $1; }
+        | statement_list_nodecl error
+                { SemanticError( yylloc, "declarations only allowed at the start of the switch body, i.e., after the '{'." ); $$ = nullptr; }
         ;
 
@@ -1093 +1097 @@
         | MUTEX '(' ')' comma_expression ';'
                 { $$ = new StatementNode( build_mutex( nullptr, new StatementNode( build_expr( $4 ) ) ) ); }
-                // { SemanticError( yylloc, "Mutex expression is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -1113 +1116 @@
                         $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
+        | SWITCH '(' comma_expression ')' '{' error '}'         // CFA
+                { SemanticError( yylloc, "only declarations can appear before the list of case clauses." ); $$ = nullptr; }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
                 { $$ = new StatementNode( build_switch( false, $3, $5 ) ); }
@@ -1120 +1125 @@
                         $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
+        | CHOOSE '(' comma_expression ')' '{' error '}'         // CFA
+                { SemanticError( yylloc, "only declarations can appear before the list of case clauses." ); $$ = nullptr; }
         ;
 
@@ -1158 +1165 @@
 
 case_label:                                                                                             // CFA
-        CASE case_value_list ':'                                        { $$ = $2; }
+        CASE error
+                { SemanticError( yylloc, "missing case list after case." ); $$ = nullptr; }
+        | CASE case_value_list ':'                                      { $$ = $2; }
+        | CASE case_value_list error
+                { SemanticError( yylloc, "missing colon after case list." ); $$ = nullptr; }
         | DEFAULT ':'                                                           { $$ = new StatementNode( build_default() ); }
                 // A semantic check is required to ensure only one default clause per switch/choose statement.
-        ;
-
-//label_list_opt:
-//      // empty
-//      | identifier_or_type_name ':'
-//      | label_list_opt identifier_or_type_name ':'
-//      ;
+        | DEFAULT error
+                { SemanticError( yylloc, "missing colon after default." ); $$ = nullptr; }
+        ;
 
 case_label_list:                                                                                // CFA
@@ -1197 +1204 @@
                 { $$ = 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; }
                 { $$ = new StatementNode( build_while( $3, maybe_build_compound( $5 ), $7 ) ); }
         | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
@@ -1204 +1210 @@
                 { $$ = 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; }
                 { $$ = new StatementNode( build_do_while( $5, maybe_build_compound( $2 ), $8 ) ); }
         | FOR '(' ')' statement                                                         // CFA => for ( ;; )
@@ -1211 +1216 @@
                 { $$ = 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; }
                 { $$ = new StatementNode( build_for( $3, maybe_build_compound( $5 ), $7 ) ); }
         ;
@@ -2729 +2733 @@
         | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
                 { $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asm( false, $3, 0 ) ) ); }
+        | EXTERN STRINGliteral
+                {
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
+                        linkage = LinkageSpec::update( yylloc, linkage, $2 );
+                }
+          up external_definition down 
+                {
+                        linkage = linkageStack.top();
+                        linkageStack.pop();
+                        $$ = $5;
+                }
         | EXTERN STRINGliteral                                                          // C++-style linkage specifier
                 {