X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/520144aadc34f57ac0572ded66ab62fc32cb3069..782e8187185a009ce698ad294c87e49a0a30c3a1:/src/scan-gram.l diff --git a/src/scan-gram.l b/src/scan-gram.l index fa200d64..8e48148c 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include @@ -164,7 +164,9 @@ splice (\\[ \f\t\v]*\n)* { /* Comments and white space. */ - "," warn_at (*loc, _("stray ',' treated as white space")); + "," { + complain (loc, Wother, _("stray ',' treated as white space")); + } [ \f\n\t\v] | "//".* ; "/*" { @@ -239,7 +241,7 @@ splice (\\[ \f\t\v]*\n)* "%yacc" return PERCENT_YACC; {directive} { - complain_at (*loc, _("invalid directive: %s"), quote (yytext)); + complain (loc, complaint, _("invalid directive: %s"), quote (yytext)); } "=" return EQUAL; @@ -265,7 +267,7 @@ splice (\\[ \f\t\v]*\n)* /* Identifiers may not start with a digit. Yet, don't silently accept "1FOO" as "1 FOO". */ {int}{id} { - complain_at (*loc, _("invalid identifier: %s"), quote (yytext)); + complain (loc, complaint, _("invalid identifier: %s"), quote (yytext)); } /* Characters. */ @@ -323,7 +325,7 @@ splice (\\[ \f\t\v]*\n)* } . { - complain_at (*loc, _("invalid character: %s"), quote (yytext)); + complain (loc, complaint, _("invalid character: %s"), quote (yytext)); } <> { @@ -340,7 +342,7 @@ splice (\\[ \f\t\v]*\n)* { - \0 complain_at (*loc, _("invalid null character")); + \0 complain (loc, complaint, _("invalid null character")); } @@ -392,8 +394,9 @@ splice (\\[ \f\t\v]*\n)* {id} { if (bracketed_id_str) { - complain_at (*loc, _("unexpected identifier in bracketed name: %s"), - quote (yytext)); + complain (loc, complaint, + _("unexpected identifier in bracketed name: %s"), + quote (yytext)); } else { @@ -414,10 +417,10 @@ splice (\\[ \f\t\v]*\n)* } } else - complain_at (*loc, _("an identifier expected")); + complain (loc, complaint, _("an identifier expected")); } . { - complain_at (*loc, _("invalid character in bracketed name: %s"), + complain (loc, complaint, _("invalid character in bracketed name: %s"), quote (yytext)); } <> { @@ -515,12 +518,13 @@ splice (\\[ \f\t\v]*\n)* /* FIXME: Eventually, make these errors. */ if (last_string[0] == '\0') { - warn_at (*loc, _("empty character literal")); + complain (loc, Wother, _("empty character literal")); /* '\0' seems dangerous even if we are about to complain. */ val->character = '\''; } else if (last_string[1] != '\0') - warn_at (*loc, _("extra characters in character literal")); + complain (loc, Wother, + _("extra characters in character literal")); } if (yytext[0] == '\n') unexpected_newline (token_start, "'"); @@ -536,12 +540,13 @@ splice (\\[ \f\t\v]*\n)* /* FIXME: Eventually, make these errors. */ if (last_string[0] == '\0') { - warn_at (*loc, _("empty character literal")); + complain (loc, Wother, _("empty character literal")); /* '\0' seems dangerous even if we are about to complain. */ val->character = '\''; } else if (last_string[1] != '\0') - warn_at (*loc, _("extra characters in character literal")); + complain (loc, Wother, + _("extra characters in character literal")); } unexpected_eof (token_start, "'"); STRING_FREE; @@ -594,7 +599,7 @@ splice (\\[ \f\t\v]*\n)* \\[0-7]{1,3} { unsigned long int c = strtoul (yytext + 1, NULL, 8); if (!c || UCHAR_MAX < c) - complain_at (*loc, _("invalid number after \\-escape: %s"), + complain (loc, complaint, _("invalid number after \\-escape: %s"), yytext+1); else obstack_1grow (&obstack_for_string, c); @@ -604,7 +609,7 @@ splice (\\[ \f\t\v]*\n)* verify (UCHAR_MAX < ULONG_MAX); unsigned long int c = strtoul (yytext + 2, NULL, 16); if (!c || UCHAR_MAX < c) - complain_at (*loc, _("invalid number after \\-escape: %s"), + complain (loc, complaint, _("invalid number after \\-escape: %s"), yytext+1); else obstack_1grow (&obstack_for_string, c); @@ -624,7 +629,7 @@ splice (\\[ \f\t\v]*\n)* \\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} { int c = convert_ucn_to_byte (yytext); if (c <= 0) - complain_at (*loc, _("invalid number after \\-escape: %s"), + complain (loc, complaint, _("invalid number after \\-escape: %s"), yytext+1); else obstack_1grow (&obstack_for_string, c); @@ -632,11 +637,12 @@ splice (\\[ \f\t\v]*\n)* \\(.|\n) { char const *p = yytext + 1; /* Quote only if escaping won't make the character visible. */ - if (isspace ((unsigned char) *p) && isprint ((unsigned char) *p)) + if (c_isspace ((unsigned char) *p) && c_isprint ((unsigned char) *p)) p = quote (p); else p = quotearg_style_mem (escape_quoting_style, p, 1); - complain_at (*loc, _("invalid character after \\-escape: %s"), p); + complain (loc, complaint, _("invalid character after \\-escape: %s"), + p); } } @@ -867,7 +873,8 @@ scan_integer (char const *number, int base, location loc) if (INT_MAX < num) { - complain_at (loc, _("integer out of range: %s"), quote (number)); + complain (&loc, complaint, _("integer out of range: %s"), + quote (number)); num = INT_MAX; } @@ -941,11 +948,11 @@ handle_syncline (char *args, location loc) { char *after_num; unsigned long int lineno = strtoul (args, &after_num, 10); - char *file = mbschr (after_num, '"') + 1; - *mbschr (file, '"') = '\0'; + char *file = strchr (after_num, '"') + 1; + *strchr (file, '"') = '\0'; if (INT_MAX <= lineno) { - warn_at (loc, _("line number overflow")); + complain (&loc, Wother, _("line number overflow")); lineno = INT_MAX; } current_file = uniqstr_new (file); @@ -969,7 +976,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end) // Instead of '\'', display "'". if (STREQ (token_end, "'\\''")) token_end = "\"'\""; - complain_at (loc, _(msgid), token_end); + complain (&loc, complaint, _(msgid), token_end); }