Changeset b1f2007 for src/Parser

Timestamp:

Dec 13, 2023, 9:17:13 AM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

4c2fe47

Parents:

c40157e

Message:

first attempt at simplifying SemanticError? and its usage

Location:

src/Parser

Files:

• ParseNode.h (modified) (3 diffs)
• TypeData.cc (modified) (3 diffs)
• parser.yy (modified) (7 diffs)

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr  3 17:55:00 2023
-// Update Count     : 942
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Dec  9 17:39:34 2023
+// Update Count     : 945
 //
 
@@ -37 +37 @@
 class ExpressionNode;
 struct StatementNode;
+
 
 //##############################################################################
@@ -97 +98 @@
 std::ostream & operator<<( std::ostream & out, const ParseNode * node );
 
+__attribute__((noreturn)) static inline void SemanticError( const ParseNode * obj, const std::string & error ) {
+        SemanticError( obj->location, toString( error, obj ) );
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr  4 13:39:00 2023
-// Update Count     : 680
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Nov 26 15:51:05 2023
+// Update Count     : 681
 //
 
@@ -864 +864 @@
 
 static string genTSError( string msg, DeclarationNode::BasicType basictype ) {
-        SemanticError( yylloc, string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." );
+        SemanticError( yylloc, "invalid type specifier \"%s\" for type \"%s\".", msg.c_str(), DeclarationNode::basicTypeNames[basictype] );
 } // genTSError
 
@@ -1507 +1507 @@
                 } // for
                 // declaration type still set => type not moved to a matching parameter so there is a missing parameter name
-                if ( decl->type ) SemanticError( decl->location, string( "missing name in parameter list " ) + *decl->name );
+                if ( decl->type ) SemanticError( decl->location, "missing name in parameter list %s", decl->name->c_str() );
         } // for
 

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 Oct  3 17:14:12 2023
-// Update Count     : 6396
+// Last Modified On : Sun Nov 26 13:18:06 2023
+// Update Count     : 6398
 //
 
@@ -260 +260 @@
                 } // if
         } else {
-                SemanticError( yylloc, "syntax error, loop-index name missing. Expression disallowed. ." ); return nullptr;
+                SemanticError( yylloc, "syntax error, loop-index name missing. Expression disallowed." ); return nullptr;
         } // if
 } // forCtrl
 
 static void IdentifierBeforeIdentifier( string & identifier1, string & identifier2, const char * kind ) {
-        SemanticError( yylloc, ::toString( "syntax error, adjacent identifiers \"", identifier1, "\" and \"", identifier2, "\" are not meaningful in a", kind, ".\n"
-                                   "Possible cause is misspelled type name or missing generic parameter." ) );
+        SemanticError( yylloc, "syntax error, adjacent identifiers \"%s\" and \"%s\" are not meaningful in an %s.\n"
+                                   "Possible cause is misspelled type name or missing generic parameter.",
+                                   identifier1.c_str(), identifier2.c_str(), kind );
 } // IdentifierBeforeIdentifier
 
 static void IdentifierBeforeType( string & identifier, const char * kind ) {
-        SemanticError( yylloc, ::toString( "syntax error, identifier \"", identifier, "\" cannot appear before a ", kind, ".\n"
-                                   "Possible cause is misspelled storage/CV qualifier, misspelled typename, or missing generic parameter." ) );
+        SemanticError( yylloc, "syntax error, identifier \"%s\" cannot appear before a %s.\n"
+                                   "Possible cause is misspelled storage/CV qualifier, misspelled typename, or missing generic parameter.",
+                                   identifier.c_str(), kind );
 } // IdentifierBeforeType
 
@@ -689 +691 @@
         //      { SemanticError( yylloc, "Resume expression is currently unimplemented." ); $$ = nullptr; }
         | IDENTIFIER IDENTIFIER                                                         // invalid syntax rule
-                { IdentifierBeforeIdentifier( *$1.str, *$2.str, "n expression" ); $$ = nullptr; }
+                { IdentifierBeforeIdentifier( *$1.str, *$2.str, "expression" ); $$ = nullptr; }
         | IDENTIFIER type_qualifier                                                     // invalid syntax rule
                 { IdentifierBeforeType( *$1.str, "type qualifier" ); $$ = nullptr; }
@@ -1155 +1157 @@
         | identifier_or_type_name ':' attribute_list_opt error // invalid syntax rule
                 {
-                        SemanticError( yylloc, ::toString( "syntx error, label \"", *$1.str, "\" must be associated with a statement, "
-                                                                                           "where a declaration, case, or default is not a statement. "
-                                                                                           "Move the label or terminate with a semi-colon." ) );
+                        SemanticError( yylloc, "syntx error, label \"%s\" must be associated with a statement, "
+                                                   "where a declaration, case, or default is not a statement.\n"
+                                                   "Move the label or terminate with a semicolon.", $1.str->c_str() );
                         $$ = nullptr;
                 }
@@ -2101 +2103 @@
         | sue_declaration_specifier invalid_types                       // invalid syntax rule
                 {
-                        SemanticError( yylloc, ::toString( "syntax error, expecting ';' at end of ",
-                                $1->type->enumeration.name ? "enum" : ast::AggregateDecl::aggrString( $1->type->aggregate.kind ),
-                                " declaration." ) );
+                        SemanticError( yylloc, "syntax error, expecting ';' at end of \"%s\" declaration.",
+                                                   $1->type->enumeration.name ? "enum" : ast::AggregateDecl::aggrString( $1->type->aggregate.kind ) );
                         $$ = nullptr;
                 }
@@ -2161 +2162 @@
 type_qualifier:
         type_qualifier_name
-        | attribute                                                                                     // trick handles most atrribute locations
+        | attribute                                                                                     // trick handles most attribute locations
         ;
 
@@ -2585 +2586 @@
         | type_specifier field_declaring_list_opt '}'           // invalid syntax rule
                 {
-                        SemanticError( yylloc, ::toString( "syntax error, expecting ';' at end of previous declaration." ) );
+                        SemanticError( yylloc, "syntax error, expecting ';' at end of previous declaration." );
                         $$ = nullptr;
                 }