Changeset 79a6b17

Timestamp:

Jan 30, 2023, 7:16:12 PM (22 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

a5f9444

Parents:

ad861ef

Message:

print better error message when semi-colon missing after aggregate

Location:

src/Parser

Files:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Fri Jan 20 12:08:37 2023
- * Update Count     : 766
+ * Last Modified On : Mon Jan 30 19:03:34 2023
+ * Update Count     : 767
  */
 
@@ -503 +503 @@
         SemanticErrorThrow = true;
         cerr << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
-                 << ": " << ErrorHelpers::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
+                 << ": " << ErrorHelpers::error_str() << errmsg << " before token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
 }
 

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 Jan 20 12:11:56 2023
-// Update Count     : 5855
+// Last Modified On : Mon Jan 30 18:59:23 2023
+// Update Count     : 5856
 //
 
@@ -1996 +1996 @@
 declaration_specifier:                                                                  // type specifier + storage class
         basic_declaration_specifier
+        | type_declaration_specifier
         | sue_declaration_specifier
-        | type_declaration_specifier
+        | sue_declaration_specifier invalid_types
+                {
+                        SemanticError( yylloc,
+                                                  ::toString( "Missing ';' after end of ",
+                                                                          $1->type->enumeration.name ? "enum" : AggregateDecl::aggrString( $1->type->aggregate.kind ),
+                                                                          " declaration" ) );
+                        $$ = nullptr;
+                }
+        ;
+
+invalid_types:
+        aggregate_key
+        | basic_type_name
+        | indirect_type
         ;