X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/cd3684cfa8e5b6faa2ce00330a6d84bd04d165d4..affac6132ae6ee354e1497e456b5c81a0c84334f:/src/scan-gram.l diff --git a/src/scan-gram.l b/src/scan-gram.l index 56e65cfe..471d7b91 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -1,6 +1,6 @@ /* Bison Grammar Scanner -*- C -*- - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -16,14 +16,19 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA */ %option debug nodefault nounput noyywrap never-interactive %option prefix="gram_" outfile="lex.yy.c" %{ +/* Work around a bug in flex 2.5.31. See Debian bug 333231 + . */ +#undef gram_wrap +#define gram_wrap() 1 + #include "system.h" #include @@ -34,6 +39,7 @@ #include "files.h" #include "getargs.h" #include "gram.h" +#include "quotearg.h" #include "reader.h" #include "uniqstr.h" @@ -47,6 +53,19 @@ } \ while (0) +/* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */ +int gram_get_lineno (void); +FILE *gram_get_in (void); +FILE *gram_get_out (void); +int gram_get_leng (void); +char *gram_get_text (void); +void gram_set_lineno (int); +void gram_set_in (FILE *); +void gram_set_out (FILE *); +int gram_get_debug (void); +void gram_set_debug (int); +int gram_lex_destroy (void); + /* Location of scanner cursor. */ boundary scanner_cursor; @@ -101,8 +120,10 @@ static int rule_length; static void handle_dollar (int token_type, char *cp, location loc); static void handle_at (int token_type, char *cp, location loc); static void handle_syncline (char *args); +static unsigned long int scan_integer (char const *p, int base, location loc); static int convert_ucn_to_byte (char const *hex_text); static void unexpected_eof (boundary, char const *); +static void unexpected_newline (boundary, char const *); %} %x SC_COMMENT SC_LINE_COMMENT SC_YACC_COMMENT @@ -156,10 +177,9 @@ splice (\\[ \f\t\v]*\n)* { - [ \f\n\t\v] ; + /* Comments and white space. */ "," warn_at (*loc, _("stray `,' treated as white space")); - - /* Comments. */ + [ \f\n\t\v] | "//".* ; "/*" { token_start = loc->start; @@ -182,12 +202,14 @@ splice (\\[ \f\t\v]*\n)* { "%binary" return PERCENT_NONASSOC; "%debug" return PERCENT_DEBUG; + "%default"[-_]"prec" return PERCENT_DEFAULT_PREC; "%define" return PERCENT_DEFINE; "%defines" return PERCENT_DEFINES; "%destructor" token_type = PERCENT_DESTRUCTOR; BEGIN SC_PRE_CODE; "%dprec" return PERCENT_DPREC; "%error"[-_]"verbose" return PERCENT_ERROR_VERBOSE; "%expect" return PERCENT_EXPECT; + "%expect"[-_]"rr" return PERCENT_EXPECT_RR; "%file-prefix" return PERCENT_FILE_PREFIX; "%fixed"[-_]"output"[-_]"files" return PERCENT_YACC; "%initial-action" token_type = PERCENT_INITIAL_ACTION; BEGIN SC_PRE_CODE; @@ -197,6 +219,7 @@ splice (\\[ \f\t\v]*\n)* "%locations" return PERCENT_LOCATIONS; "%merge" return PERCENT_MERGE; "%name"[-_]"prefix" return PERCENT_NAME_PREFIX; + "%no"[-_]"default"[-_]"prec" return PERCENT_NO_DEFAULT_PREC; "%no"[-_]"lines" return PERCENT_NO_LINES; "%nonassoc" return PERCENT_NONASSOC; "%nondeterministic-parser" return PERCENT_NONDETERMINISTIC_PARSER; @@ -206,6 +229,7 @@ splice (\\[ \f\t\v]*\n)* "%prec" rule_length--; return PERCENT_PREC; "%printer" token_type = PERCENT_PRINTER; BEGIN SC_PRE_CODE; "%pure"[-_]"parser" return PERCENT_PURE_PARSER; + "%require" return PERCENT_REQUIRE; "%right" return PERCENT_RIGHT; "%skeleton" return PERCENT_SKELETON; "%start" return PERCENT_START; @@ -233,15 +257,11 @@ splice (\\[ \f\t\v]*\n)* } {int} { - unsigned long num; - set_errno (0); - num = strtoul (yytext, 0, 10); - if (INT_MAX < num || get_errno ()) - { - complain_at (*loc, _("integer out of range: %s"), quote (yytext)); - num = INT_MAX; - } - val->integer = num; + val->integer = scan_integer (yytext, 10, *loc); + return INT; + } + 0[xX][0-9abcdefABCDEF]+ { + val->integer = scan_integer (yytext, 16, *loc); return INT; } @@ -249,7 +269,7 @@ splice (\\[ \f\t\v]*\n)* "'" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER; /* Strings. */ - "\"" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_STRING; + "\"" token_start = loc->start; BEGIN SC_ESCAPED_STRING; /* Prologue. */ "%{" code_start = loc->start; BEGIN SC_PROLOGUE; @@ -352,15 +372,14 @@ splice (\\[ \f\t\v]*\n)* } - /*----------------------------------------------------------------. - | Scanning a C string, including its escapes. The initial `"' is | - | already eaten. | - `----------------------------------------------------------------*/ + /*------------------------------------------------. + | Scanning a Bison string, including its escapes. | + | The initial quote is already eaten. | + `------------------------------------------------*/ { "\"" { - STRING_GROW; STRING_FINISH; loc->start = token_start; val->chars = last_string; @@ -368,15 +387,14 @@ splice (\\[ \f\t\v]*\n)* BEGIN INITIAL; return STRING; } - - .|\n STRING_GROW; - <> unexpected_eof (token_start, "\""); BEGIN INITIAL; + \n unexpected_newline (token_start, "\""); BEGIN INITIAL; + <> unexpected_eof (token_start, "\""); BEGIN INITIAL; } - /*---------------------------------------------------------------. - | Scanning a C character, decoding its escapes. The initial "'" | - | is already eaten. | - `---------------------------------------------------------------*/ + /*----------------------------------------------------------. + | Scanning a Bison character literal, decoding its escapes. | + | The initial quote is already eaten. | + `----------------------------------------------------------*/ { @@ -385,7 +403,9 @@ splice (\\[ \f\t\v]*\n)* STRING_GROW; STRING_FINISH; loc->start = token_start; - val->symbol = symbol_get (last_string, *loc); + val->symbol = symbol_get (quotearg_style (escape_quoting_style, + last_string), + *loc); symbol_class_set (val->symbol, token_sym, *loc); last_string_1 = last_string[1]; symbol_user_token_number_set (val->symbol, last_string_1, *loc); @@ -394,9 +414,13 @@ splice (\\[ \f\t\v]*\n)* BEGIN INITIAL; return ID; } + \n unexpected_newline (token_start, "'"); BEGIN INITIAL; + <> unexpected_eof (token_start, "'"); BEGIN INITIAL; +} - .|\n STRING_GROW; - <> unexpected_eof (token_start, "'"); BEGIN INITIAL; + +{ + \0 complain_at (*loc, _("invalid null character")); } @@ -407,19 +431,23 @@ splice (\\[ \f\t\v]*\n)* { \\[0-7]{1,3} { - unsigned long c = strtoul (yytext + 1, 0, 8); + unsigned long int c = strtoul (yytext + 1, 0, 8); if (UCHAR_MAX < c) complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext)); + else if (! c) + complain_at (*loc, _("invalid null character: %s"), quote (yytext)); else obstack_1grow (&obstack_for_string, c); } \\x[0-9abcdefABCDEF]+ { - unsigned long c; + unsigned long int c; set_errno (0); c = strtoul (yytext + 2, 0, 16); if (UCHAR_MAX < c || get_errno ()) complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext)); + else if (! c) + complain_at (*loc, _("invalid null character: %s"), quote (yytext)); else obstack_1grow (&obstack_for_string, c); } @@ -439,6 +467,8 @@ splice (\\[ \f\t\v]*\n)* int c = convert_ucn_to_byte (yytext); if (c < 0) complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext)); + else if (! c) + complain_at (*loc, _("invalid null character: %s"), quote (yytext)); else obstack_1grow (&obstack_for_string, c); } @@ -448,33 +478,27 @@ splice (\\[ \f\t\v]*\n)* } } + /*--------------------------------------------. + | Scanning user-code characters and strings. | + `--------------------------------------------*/ - /*----------------------------------------------------------. - | Scanning a C character without decoding its escapes. The | - | initial "'" is already eaten. | - `----------------------------------------------------------*/ + +{ + {splice}|\\{splice}[^\n$@\[\]] STRING_GROW; +} { - "'" STRING_GROW; BEGIN context_state; - \\{splice}[^$@\[\]] STRING_GROW; - <> unexpected_eof (token_start, "'"); BEGIN context_state; + "'" STRING_GROW; BEGIN context_state; + \n unexpected_newline (token_start, "'"); BEGIN context_state; + <> unexpected_eof (token_start, "'"); BEGIN context_state; } - - /*----------------------------------------------------------------. - | Scanning a C string, without decoding its escapes. The initial | - | `"' is already eaten. | - `----------------------------------------------------------------*/ - { - "\"" STRING_GROW; BEGIN context_state; - \\{splice}[^$@\[\]] STRING_GROW; - <> { - unexpected_eof (token_start, "\""); - BEGIN context_state; - } + "\"" STRING_GROW; BEGIN context_state; + \n unexpected_newline (token_start, "\""); BEGIN context_state; + <> unexpected_eof (token_start, "\""); BEGIN context_state; } @@ -531,7 +555,7 @@ splice (\\[ \f\t\v]*\n)* } else { - complain_at (*loc, _("missing `{' in `%s'"), + complain_at (*loc, _("missing `{' in %s"), token_name (token_type)); obstack_sgrow (&obstack_for_string, "{}"); STRING_FINISH; @@ -594,6 +618,15 @@ splice (\\[ \f\t\v]*\n)* "$"("<"{tag}">")?(-?[0-9]+|"$") handle_dollar (token_type, yytext, *loc); "@"(-?[0-9]+|"$") handle_at (token_type, yytext, *loc); + "$" { + warn_at (*loc, _("stray `$'")); + obstack_sgrow (&obstack_for_string, "$]["); + } + "@" { + warn_at (*loc, _("stray `@'")); + obstack_sgrow (&obstack_for_string, "@@"); + } + <> unexpected_eof (code_start, "}"); BEGIN INITIAL; } @@ -633,10 +666,9 @@ splice (\\[ \f\t\v]*\n)* } - /*----------------------------------------------------------------. - | By default, grow the string obstack with the input, escaping M4 | - | quoting characters. | - `----------------------------------------------------------------*/ + /*-----------------------------------------. + | Escape M4 quoting characters in C code. | + `-----------------------------------------*/ { @@ -644,10 +676,16 @@ splice (\\[ \f\t\v]*\n)* \@ obstack_sgrow (&obstack_for_string, "@@"); \[ obstack_sgrow (&obstack_for_string, "@{"); \] obstack_sgrow (&obstack_for_string, "@}"); - .|\n STRING_GROW; } + /*-----------------------------------------------------. + | By default, grow the string obstack with the input. | + `-----------------------------------------------------*/ + +. | +\n STRING_GROW; + %% /* Keeps track of the maximum number of semantic values to the left of @@ -780,16 +818,16 @@ handle_action_dollar (char *text, location loc) } else { - long num; + long int num; set_errno (0); num = strtol (cp, 0, 10); if (INT_MIN <= num && num <= rule_length && ! get_errno ()) { int n = num; - if (1-n > max_left_semantic_context) - max_left_semantic_context = 1-n; - if (!type_name && n > 0) + if (max_left_semantic_context < 1 - n) + max_left_semantic_context = 1 - n; + if (!type_name && 0 < n) type_name = symbol_list_n_type_name_get (current_rule, loc, n); if (!type_name && typed) complain_at (loc, _("$%d of `%s' has no declared type"), @@ -797,8 +835,10 @@ handle_action_dollar (char *text, location loc) if (!type_name) type_name = ""; obstack_fgrow3 (&obstack_for_string, - "]b4_rhs_value([%d], [%d], [%s])[", + "]b4_rhs_value(%d, %d, [%s])[", rule_length, n, type_name); + if (typed) + symbol_list_n_used_set (current_rule, n, true); } else complain_at (loc, _("integer out of range: %s"), quote (text)); @@ -859,14 +899,14 @@ handle_action_at (char *text, location loc) obstack_sgrow (&obstack_for_string, "]b4_lhs_location["); else { - long num; + long int num; set_errno (0); num = strtol (cp, 0, 10); if (INT_MIN <= num && num <= rule_length && ! get_errno ()) { int n = num; - obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location([%d], [%d])[", + obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[", rule_length, n); } else @@ -909,6 +949,25 @@ handle_at (int token_type, char *text, location loc) } +/*------------------------------------------------------. +| Scan NUMBER for a base-BASE integer at location LOC. | +`------------------------------------------------------*/ + +static unsigned long int +scan_integer (char const *number, int base, location loc) +{ + unsigned long int num; + set_errno (0); + num = strtoul (number, 0, base); + if (INT_MAX < num || get_errno ()) + { + complain_at (loc, _("integer out of range: %s"), quote (number)); + num = INT_MAX; + } + return num; +} + + /*------------------------------------------------------------------. | Convert universal character name UCN to a single-byte character, | | and return that character. Return -1 if UCN does not correspond | @@ -918,7 +977,7 @@ handle_at (int token_type, char *text, location loc) static int convert_ucn_to_byte (char const *ucn) { - unsigned long code = strtoul (ucn + 2, 0, 16); + unsigned long int code = strtoul (ucn + 2, 0, 16); /* FIXME: Currently we assume Unicode-compatible unibyte characters on ASCII hosts (i.e., Latin-1 on hosts with 8-bit bytes). On @@ -976,12 +1035,28 @@ handle_syncline (char *args) const char *file = NULL; file = strchr (args, '"') + 1; *strchr (file, '"') = 0; - scanner_cursor.file = current_file = xstrdup (file); + scanner_cursor.file = current_file = uniqstr_new (file); scanner_cursor.line = lineno; scanner_cursor.column = 1; } +/*----------------------------------------------------------------. +| For a token or comment starting at START, report message MSGID, | +| which should say that an end marker was found before | +| the expected TOKEN_END. | +`----------------------------------------------------------------*/ + +static void +unexpected_end (boundary start, char const *msgid, char const *token_end) +{ + location loc; + loc.start = start; + loc.end = scanner_cursor; + complain_at (loc, _(msgid), token_end); +} + + /*------------------------------------------------------------------------. | Report an unexpected EOF in a token or comment starting at START. | | An end of file was encountered and the expected TOKEN_END was missing. | @@ -990,10 +1065,18 @@ handle_syncline (char *args) static void unexpected_eof (boundary start, char const *token_end) { - location loc; - loc.start = start; - loc.end = scanner_cursor; - complain_at (loc, _("missing `%s' at end of file"), token_end); + unexpected_end (start, N_("missing `%s' at end of file"), token_end); +} + + +/*----------------------------------------. +| Likewise, but for unexpected newlines. | +`----------------------------------------*/ + +static void +unexpected_newline (boundary start, char const *token_end) +{ + unexpected_end (start, N_("missing `%s' at end of line"), token_end); }