Changeset 5c216b4 for src

Timestamp:

Feb 19, 2022, 9:48:04 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

1eec0b0

Parents:

a38bbbc

git-author:

Peter A. Buhr <pabuhr@…> (02/19/22 09:15:38)

git-committer:

Peter A. Buhr <pabuhr@…> (02/19/22 09:48:04)

Message:

add detailed syntax-error messages

File:

• src/Parser/parser.yy (modified) (7 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 Feb 11 14:26:15 2022
-// Update Count     : 5174
+// 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