@@ -54,12 +54,14 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
5454 [PM_ERR_ALIAS_ARGUMENT ] = "Invalid argument being passed to `alias`; expected a bare word, symbol, constant, or global variable" ,
5555 [PM_ERR_AMPAMPEQ_MULTI_ASSIGN ] = "Unexpected `&&=` in a multiple assignment" ,
5656 [PM_ERR_ARGUMENT_AFTER_BLOCK ] = "Unexpected argument after a block argument" ,
57+ [PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES ] = "Unexpected argument after `...`" ,
5758 [PM_ERR_ARGUMENT_BARE_HASH ] = "Unexpected bare hash argument" ,
5859 [PM_ERR_ARGUMENT_BLOCK_MULTI ] = "Multiple block arguments; only one block is allowed" ,
5960 [PM_ERR_ARGUMENT_FORMAL_CLASS ] = "Invalid formal argument; formal argument cannot be a class variable" ,
6061 [PM_ERR_ARGUMENT_FORMAL_CONSTANT ] = "Invalid formal argument; formal argument cannot be a constant" ,
6162 [PM_ERR_ARGUMENT_FORMAL_GLOBAL ] = "Invalid formal argument; formal argument cannot be a global variable" ,
6263 [PM_ERR_ARGUMENT_FORMAL_IVAR ] = "Invalid formal argument; formal argument cannot be an instance variable" ,
64+ [PM_ERR_ARGUMENT_FORWARDING_UNBOUND ] = "Unexpected `...` in an non-parenthesized call" ,
6365 [PM_ERR_ARGUMENT_NO_FORWARDING_AMP ] = "Unexpected `&` when the parent method is not forwarding" ,
6466 [PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES ] = "Unexpected `...` when the parent method is not forwarding" ,
6567 [PM_ERR_ARGUMENT_NO_FORWARDING_STAR ] = "Unexpected `*` when the parent method is not forwarding" ,
@@ -85,6 +87,7 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
8587 [PM_ERR_CANNOT_PARSE_STRING_PART ] = "Cannot parse the string part" ,
8688 [PM_ERR_CASE_EXPRESSION_AFTER_CASE ] = "Expected an expression after `case`" ,
8789 [PM_ERR_CASE_EXPRESSION_AFTER_WHEN ] = "Expected an expression after `when`" ,
90+ [PM_ERR_CASE_MATCH_MISSING_PREDICATE ] = "Expected a predicate for a case matching statement" ,
8891 [PM_ERR_CASE_MISSING_CONDITIONS ] = "Expected a `when` or `in` clause after `case`" ,
8992 [PM_ERR_CASE_TERM ] = "Expected an `end` to close the `case` statement" ,
9093 [PM_ERR_CLASS_IN_METHOD ] = "Unexpected class definition in a method body" ,
@@ -199,7 +202,7 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
199202 [PM_ERR_PARAMETER_NAME_REPEAT ] = "Repeated parameter name" ,
200203 [PM_ERR_PARAMETER_NO_DEFAULT ] = "Expected a default value for the parameter" ,
201204 [PM_ERR_PARAMETER_NO_DEFAULT_KW ] = "Expected a default value for the keyword parameter" ,
202- [PM_ERR_PARAMETER_NUMBERED_RESERVED ] = "Token reserved for a numbered parameter" ,
205+ [PM_ERR_PARAMETER_NUMBERED_RESERVED ] = "%.2s is reserved for a numbered parameter" ,
203206 [PM_ERR_PARAMETER_ORDER ] = "Unexpected parameter order" ,
204207 [PM_ERR_PARAMETER_SPLAT_MULTI ] = "Unexpected multiple `*` splat parameters" ,
205208 [PM_ERR_PARAMETER_STAR ] = "Unexpected parameter `*`" ,
@@ -229,6 +232,10 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
229232 [PM_ERR_RESCUE_TERM ] = "Expected a closing delimiter for the `rescue` clause" ,
230233 [PM_ERR_RESCUE_VARIABLE ] = "Expected an exception variable after `=>` in a rescue statement" ,
231234 [PM_ERR_RETURN_INVALID ] = "Invalid `return` in a class or module body" ,
235+ [PM_ERR_STATEMENT_ALIAS ] = "Unexpected an `alias` at a non-statement position" ,
236+ [PM_ERR_STATEMENT_POSTEXE_END ] = "Unexpected an `END` at a non-statement position" ,
237+ [PM_ERR_STATEMENT_PREEXE_BEGIN ] = "Unexpected a `BEGIN` at a non-statement position" ,
238+ [PM_ERR_STATEMENT_UNDEF ] = "Unexpected an `undef` at a non-statement position" ,
232239 [PM_ERR_STRING_CONCATENATION ] = "Expected a string for concatenation" ,
233240 [PM_ERR_STRING_INTERPOLATED_TERM ] = "Expected a closing delimiter for the interpolated string" ,
234241 [PM_ERR_STRING_LITERAL_TERM ] = "Expected a closing delimiter for the string literal" ,
@@ -253,13 +260,16 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
253260 [PM_WARN_AMBIGUOUS_FIRST_ARGUMENT_PLUS ] = "Ambiguous first argument; put parentheses or a space even after `+` operator" ,
254261 [PM_WARN_AMBIGUOUS_PREFIX_STAR ] = "Ambiguous `*` has been interpreted as an argument prefix" ,
255262 [PM_WARN_AMBIGUOUS_SLASH ] = "Ambiguous `/`; wrap regexp in parentheses or add a space after `/` operator" ,
263+ [PM_WARN_END_IN_METHOD ] = "END in method; use at_exit" ,
256264};
257265
258266static const char *
259267pm_diagnostic_message (pm_diagnostic_id_t diag_id ) {
260268 assert (diag_id < PM_DIAGNOSTIC_ID_LEN );
269+
261270 const char * message = diagnostic_messages [diag_id ];
262271 assert (message );
272+
263273 return message ;
264274}
265275
@@ -271,7 +281,57 @@ pm_diagnostic_list_append(pm_list_t *list, const uint8_t *start, const uint8_t *
271281 pm_diagnostic_t * diagnostic = (pm_diagnostic_t * ) calloc (sizeof (pm_diagnostic_t ), 1 );
272282 if (diagnostic == NULL ) return false;
273283
274- * diagnostic = (pm_diagnostic_t ) { .start = start , .end = end , .message = pm_diagnostic_message (diag_id ) };
284+ * diagnostic = (pm_diagnostic_t ) {
285+ .start = start ,
286+ .end = end ,
287+ .message = pm_diagnostic_message (diag_id ),
288+ .owned = false
289+ };
290+
291+ pm_list_append (list , (pm_list_node_t * ) diagnostic );
292+ return true;
293+ }
294+
295+ /**
296+ * Append a diagnostic to the given list of diagnostics that is using a format
297+ * string for its message.
298+ */
299+ bool
300+ pm_diagnostic_list_append_format (pm_list_t * list , const uint8_t * start , const uint8_t * end , pm_diagnostic_id_t diag_id , ...) {
301+ va_list arguments ;
302+ va_start (arguments , diag_id );
303+
304+ const char * format = pm_diagnostic_message (diag_id );
305+ int result = vsnprintf (NULL , 0 , format , arguments );
306+ va_end (arguments );
307+
308+ if (result < 0 ) {
309+ return false;
310+ }
311+
312+ pm_diagnostic_t * diagnostic = (pm_diagnostic_t * ) calloc (sizeof (pm_diagnostic_t ), 1 );
313+ if (diagnostic == NULL ) {
314+ return false;
315+ }
316+
317+ size_t length = (size_t ) (result + 1 );
318+ char * message = (char * ) malloc (length );
319+ if (message == NULL ) {
320+ free (diagnostic );
321+ return false;
322+ }
323+
324+ va_start (arguments , diag_id );
325+ vsnprintf (message , length , format , arguments );
326+ va_end (arguments );
327+
328+ * diagnostic = (pm_diagnostic_t ) {
329+ .start = start ,
330+ .end = end ,
331+ .message = message ,
332+ .owned = true
333+ };
334+
275335 pm_list_append (list , (pm_list_node_t * ) diagnostic );
276336 return true;
277337}
@@ -285,8 +345,9 @@ pm_diagnostic_list_free(pm_list_t *list) {
285345
286346 for (node = list -> head ; node != NULL ; node = next ) {
287347 next = node -> next ;
288-
289348 pm_diagnostic_t * diagnostic = (pm_diagnostic_t * ) node ;
349+
350+ if (diagnostic -> owned ) free ((void * ) diagnostic -> message );
290351 free (diagnostic );
291352 }
292353}
0 commit comments