X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6c30d6413ef7cd08f1ca6d7f5ebe3a15fe1fd475..faff3bef5b72ac85093799f997596631c3202c12:/src/scan-gram.l
diff --git a/src/scan-gram.l b/src/scan-gram.l
index eaf8d176..75023f4f 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,11 +1,12 @@
/* Bison Grammar Scanner -*- C -*-
- Copyright (C) 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,99 +15,98 @@
GNU General Public License for more details.
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
-*/
+ along with this program. If not, see . */
-%option debug nodefault noyywrap never-interactive
+%option debug nodefault noinput nounput noyywrap never-interactive
%option prefix="gram_" outfile="lex.yy.c"
%{
-#include "system.h"
-#include "mbswidth.h"
+/* Work around a bug in flex 2.5.31. See Debian bug 333231
+ . */
+#undef gram_wrap
+#define gram_wrap() 1
+
+#define FLEX_PREFIX(Id) gram_ ## Id
+#include "flex-scanner.h"
+
#include "complain.h"
-#include "quote.h"
-#include "struniq.h"
-#include "getargs.h"
+#include "files.h"
#include "gram.h"
+#include "quotearg.h"
#include "reader.h"
+#include "uniqstr.h"
-#define YY_USER_INIT \
-do { \
- LOCATION_RESET (*loc); \
- loc->file = current_file; \
-} while (0)
+#include
+#include
+#include
-/* Each time we match a string, move the end cursor to its end. */
-#define STEP LOCATION_STEP (*loc)
+#include "scan-gram.h"
-static void extend_location (location_t *, char const *, int);
-#define YY_USER_ACTION extend_location (loc, yytext, yyleng);
+#define YY_DECL GRAM_LEX_DECL
-static size_t no_cr_read (FILE *, char *, size_t);
-#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
+#define YY_USER_INIT \
+ code_start = scanner_cursor = loc->start; \
+/* Location of scanner cursor. */
+static boundary scanner_cursor;
-/* STRING_OBSTACK -- Used to store all the characters that we need to
- keep (to construct ID, STRINGS etc.). Use the following macros to
- use it.
+#define YY_USER_ACTION location_compute (loc, &scanner_cursor, yytext, yyleng);
- Use STRING_GROW to append what has just been matched, and
- STRING_FINISH to end the string (it puts the ending 0).
- STRING_FINISH also stores this string in LAST_STRING, which can be
- used, and which is used by STRING_FREE to free the last string. */
+static size_t no_cr_read (FILE *, char *, size_t);
+#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
-static struct obstack string_obstack;
+#define ROLLBACK_CURRENT_TOKEN \
+ do { \
+ scanner_cursor.column -= mbsnwidth (yytext, yyleng, 0); \
+ yyless (0); \
+ } while (0)
/* A string representing the most recently saved token. */
static char *last_string;
-
-#define STRING_GROW \
- obstack_grow (&string_obstack, yytext, yyleng)
-
-#define STRING_FINISH \
- do { \
- obstack_1grow (&string_obstack, '\0'); \
- last_string = obstack_finish (&string_obstack); \
- } while (0)
-
-#define STRING_FREE \
- obstack_free (&string_obstack, last_string)
+/* Bracketed identifier. */
+static uniqstr bracketed_id_str = 0;
+static location bracketed_id_loc;
+static boundary bracketed_id_start;
+static int bracketed_id_context_state = 0;
void
-scanner_last_string_free (void)
+gram_scanner_last_string_free (void)
{
STRING_FREE;
}
-/* Within well-formed rules, RULE_LENGTH is the number of values in
- the current rule so far, which says where to find `$0' with respect
- to the top of the stack. It is not the same as the rule->length in
- the case of mid rule actions.
-
- Outside of well-formed rules, RULE_LENGTH has an undefined value. */
-static int rule_length;
-
-static void handle_dollar (braced_code_t code_kind,
- char *cp, location_t location);
-static void handle_at (braced_code_t code_kind,
- char *cp, location_t location);
-static void handle_syncline (char *args, location_t *location);
+static void handle_syncline (char *, location);
+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_end_of_file (location_t *, char const *);
+static void unexpected_eof (boundary, char const *);
+static void unexpected_newline (boundary, char const *);
%}
-%x SC_COMMENT SC_LINE_COMMENT SC_YACC_COMMENT
-%x SC_STRING SC_CHARACTER
+ /* A C-like comment in directives/rules. */
+%x SC_YACC_COMMENT
+ /* Strings and characters in directives/rules. */
%x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
-%x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE
+ /* A identifier was just read in directives/rules. Special state
+ to capture the sequence 'identifier :'. */
+%x SC_AFTER_IDENTIFIER
+
+ /* Three types of user code:
+ - prologue (code between '%{' '%}' in the first section, before %%);
+ - actions, printers, union, etc, (between braced in the middle section);
+ - epilogue (everything after the second %%). */
+%x SC_PROLOGUE SC_BRACED_CODE SC_EPILOGUE
+ /* C and C++ comments in code. */
+%x SC_COMMENT SC_LINE_COMMENT
+ /* Strings and characters in code. */
+%x SC_STRING SC_CHARACTER
+ /* Bracketed identifiers support. */
+%x SC_BRACKETED_ID SC_RETURN_BRACKETED_ID
letter [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
-id {letter}({letter}|[0-9])*
-directive %{letter}({letter}|[0-9]|-)*
-int [0-9]+
+id {letter}({letter}|[-0-9])*
+directive %{id}
+int [0-9]+
/* POSIX says that a tag must be both an id and a C union member, but
historically almost any character is allowed in a tag. We disallow
@@ -120,119 +120,158 @@ splice (\\[ \f\t\v]*\n)*
%%
%{
/* Nesting level of the current code in braces. */
- int braces_level IF_LINT (= 0);
+ int braces_level PACIFY_CC (= 0);
+
+ /* Parent context state, when applicable. */
+ int context_state PACIFY_CC (= 0);
- /* Scanner context when scanning C code. */
- int c_context IF_LINT (= 0);
+ /* Location of most recent identifier, when applicable. */
+ location id_loc PACIFY_CC (= empty_location);
- /* At each yylex invocation, mark the current position as the
- start of the next token. */
- STEP;
+ /* Where containing code started, when applicable. Its initial
+ value is relevant only when yylex is invoked in the SC_EPILOGUE
+ start condition. */
+ boundary code_start = scanner_cursor;
+
+ /* Where containing comment or string or character literal started,
+ when applicable. */
+ boundary token_start PACIFY_CC (= scanner_cursor);
%}
+ /*-----------------------.
+ | Scanning white space. |
+ `-----------------------*/
+
+
+{
+ /* Comments and white space. */
+ "," warn_at (*loc, _("stray ',' treated as white space"));
+ [ \f\n\t\v] |
+ "//".* ;
+ "/*" {
+ token_start = loc->start;
+ context_state = YY_START;
+ BEGIN SC_YACC_COMMENT;
+ }
+
+ /* #line directives are not documented, and may be withdrawn or
+ modified in future versions of Bison. */
+ ^"#line "{int}" \"".*"\"\n" {
+ handle_syncline (yytext + sizeof "#line " - 1, *loc);
+ }
+}
+
+
/*----------------------------.
| Scanning Bison directives. |
`----------------------------*/
+
+ /* For directives that are also command line options, the regex must be
+ "%..."
+ after "[-_]"s are removed, and the directive must match the --long
+ option name, with a single string argument. Otherwise, add exceptions
+ to ../build-aux/cross-options.pl. */
+
{
- "%binary" return PERCENT_NONASSOC;
- "%debug" return PERCENT_DEBUG;
- "%define" return PERCENT_DEFINE;
- "%defines" return PERCENT_DEFINES;
- "%destructor" return PERCENT_DESTRUCTOR;
- "%dprec" return PERCENT_DPREC;
- "%error"[-_]"verbose" return PERCENT_ERROR_VERBOSE;
- "%expect" return PERCENT_EXPECT;
- "%file-prefix" return PERCENT_FILE_PREFIX;
+ "%binary" return PERCENT_NONASSOC;
+ "%code" return PERCENT_CODE;
+ "%debug" return PERCENT_DEBUG;
+ "%default"[-_]"prec" return PERCENT_DEFAULT_PREC;
+ "%define" return PERCENT_DEFINE;
+ "%defines" return PERCENT_DEFINES;
+ "%destructor" return PERCENT_DESTRUCTOR;
+ "%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;
- "%glr-parser" return PERCENT_GLR_PARSER;
- "%left" return PERCENT_LEFT;
- "%locations" return PERCENT_LOCATIONS;
- "%merge" return PERCENT_MERGE;
- "%name"[-_]"prefix" return PERCENT_NAME_PREFIX;
- "%no"[-_]"lines" return PERCENT_NO_LINES;
- "%nonassoc" return PERCENT_NONASSOC;
- "%nterm" return PERCENT_NTERM;
- "%output" return PERCENT_OUTPUT;
- "%parse-param" return PERCENT_PARSE_PARAM;
- "%prec" rule_length--; return PERCENT_PREC;
- "%printer" return PERCENT_PRINTER;
- "%pure"[-_]"parser" return PERCENT_PURE_PARSER;
- "%right" return PERCENT_RIGHT;
- "%lex-param" return PERCENT_LEX_PARAM;
- "%skeleton" return PERCENT_SKELETON;
- "%start" return PERCENT_START;
- "%term" return PERCENT_TOKEN;
- "%token" return PERCENT_TOKEN;
- "%token"[-_]"table" return PERCENT_TOKEN_TABLE;
- "%type" return PERCENT_TYPE;
- "%union" return PERCENT_UNION;
- "%verbose" return PERCENT_VERBOSE;
- "%yacc" return PERCENT_YACC;
-
- {directive} {
+ "%initial-action" return PERCENT_INITIAL_ACTION;
+ "%glr-parser" return PERCENT_GLR_PARSER;
+ "%language" return PERCENT_LANGUAGE;
+ "%left" return PERCENT_LEFT;
+ "%lex-param" return PERCENT_LEX_PARAM;
+ "%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;
+ "%nterm" return PERCENT_NTERM;
+ "%output" return PERCENT_OUTPUT;
+ "%parse-param" return PERCENT_PARSE_PARAM;
+ "%prec" return PERCENT_PREC;
+ "%printer" return PERCENT_PRINTER;
+ "%pure"[-_]"parser" return PERCENT_PURE_PARSER;
+ "%require" return PERCENT_REQUIRE;
+ "%right" return PERCENT_RIGHT;
+ "%skeleton" return PERCENT_SKELETON;
+ "%start" return PERCENT_START;
+ "%term" return PERCENT_TOKEN;
+ "%token" return PERCENT_TOKEN;
+ "%token"[-_]"table" return PERCENT_TOKEN_TABLE;
+ "%type" return PERCENT_TYPE;
+ "%union" return PERCENT_UNION;
+ "%verbose" return PERCENT_VERBOSE;
+ "%yacc" return PERCENT_YACC;
+
+ {directive} {
complain_at (*loc, _("invalid directive: %s"), quote (yytext));
- STEP;
- }
-
- ^"#line "{int}" \"".*"\"\n" {
- handle_syncline (yytext + sizeof "#line " - 1, loc);
- STEP;
}
"=" return EQUAL;
- ":" rule_length = 0; return COLON;
- "|" rule_length = 0; return PIPE;
+ "|" return PIPE;
";" return SEMICOLON;
-
- [ \f\n\t\v] STEP;
-
- "," {
- warn_at (*loc, _("stray `,' treated as white space"));
- STEP;
- }
-
- {id} {
- val->symbol = symbol_get (yytext, *loc);
- rule_length++;
- return ID;
+ "<*>" return TYPE_TAG_ANY;
+ "<>" return TYPE_TAG_NONE;
+
+ {id} {
+ val->uniqstr = uniqstr_new (yytext);
+ id_loc = *loc;
+ bracketed_id_str = NULL;
+ BEGIN SC_AFTER_IDENTIFIER;
}
{int} {
- unsigned long num;
- errno = 0;
- num = strtoul (yytext, 0, 10);
- if (INT_MAX < num || 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;
}
- /* Characters. We don't check there is only one. */
- "'" STRING_GROW; BEGIN SC_ESCAPED_CHARACTER;
+ /* 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));
+ }
- /* Strings. */
- "\"" STRING_GROW; BEGIN SC_ESCAPED_STRING;
+ /* Characters. */
+ "'" token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
- /* Comments. */
- "/*" BEGIN SC_YACC_COMMENT;
- "//".* STEP;
+ /* Strings. */
+ "\"" token_start = loc->start; BEGIN SC_ESCAPED_STRING;
/* Prologue. */
- "%{" BEGIN SC_PROLOGUE;
+ "%{" code_start = loc->start; BEGIN SC_PROLOGUE;
/* Code in between braces. */
- "{" STRING_GROW; braces_level = 0; BEGIN SC_BRACED_CODE;
+ "{" {
+ STRING_GROW;
+ braces_level = 0;
+ code_start = loc->start;
+ BEGIN SC_BRACED_CODE;
+ }
/* A type. */
"<"{tag}">" {
- obstack_grow (&string_obstack, yytext + 1, yyleng - 2);
+ obstack_grow (&obstack_for_string, yytext + 1, yyleng - 2);
STRING_FINISH;
- val->struniq = struniq_new (last_string);
+ val->uniqstr = uniqstr_new (last_string);
STRING_FREE;
return TYPE;
}
@@ -244,94 +283,233 @@ splice (\\[ \f\t\v]*\n)*
return PERCENT_PERCENT;
}
+ "[" {
+ bracketed_id_str = NULL;
+ bracketed_id_start = loc->start;
+ bracketed_id_context_state = YY_START;
+ BEGIN SC_BRACKETED_ID;
+ }
+
. {
complain_at (*loc, _("invalid character: %s"), quote (yytext));
- STEP;
+ }
+
+ <> {
+ loc->start = loc->end = scanner_cursor;
+ yyterminate ();
}
}
- /*---------------------------------------------------------------.
- | Scanning a Yacc comment. The initial `/ *' is already eaten. |
- `---------------------------------------------------------------*/
+ /*-----------------------------------------------------------------.
+ | Scanning after an identifier, checking whether a colon is next. |
+ `-----------------------------------------------------------------*/
-
+
+{
+ "[" {
+ if (bracketed_id_str)
+ {
+ ROLLBACK_CURRENT_TOKEN;
+ BEGIN SC_RETURN_BRACKETED_ID;
+ *loc = id_loc;
+ return ID;
+ }
+ else
+ {
+ bracketed_id_start = loc->start;
+ bracketed_id_context_state = YY_START;
+ BEGIN SC_BRACKETED_ID;
+ }
+ }
+ ":" {
+ BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
+ *loc = id_loc;
+ return ID_COLON;
+ }
+ . {
+ ROLLBACK_CURRENT_TOKEN;
+ BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
+ *loc = id_loc;
+ return ID;
+ }
+ <> {
+ BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
+ *loc = id_loc;
+ return ID;
+ }
+}
+
+ /*--------------------------------.
+ | Scanning bracketed identifiers. |
+ `--------------------------------*/
+
+
+{
+ {id} {
+ if (bracketed_id_str)
+ {
+ complain_at (*loc, _("unexpected identifier in bracketed name: %s"),
+ quote (yytext));
+ }
+ else
+ {
+ bracketed_id_str = uniqstr_new (yytext);
+ bracketed_id_loc = *loc;
+ }
+ }
+ "]" {
+ BEGIN bracketed_id_context_state;
+ if (bracketed_id_str)
+ {
+ if (INITIAL == bracketed_id_context_state)
+ {
+ val->uniqstr = bracketed_id_str;
+ bracketed_id_str = 0;
+ *loc = bracketed_id_loc;
+ return BRACKETED_ID;
+ }
+ }
+ else
+ complain_at (*loc, _("an identifier expected"));
+ }
+ . {
+ complain_at (*loc, _("invalid character in bracketed name: %s"),
+ quote (yytext));
+ }
+ <> {
+ BEGIN bracketed_id_context_state;
+ unexpected_eof (bracketed_id_start, "]");
+ }
+}
+
+
{
- "*/" {
- STEP;
+ . {
+ ROLLBACK_CURRENT_TOKEN;
+ val->uniqstr = bracketed_id_str;
+ bracketed_id_str = 0;
+ *loc = bracketed_id_loc;
BEGIN INITIAL;
+ return BRACKETED_ID;
}
+}
+
+
+ /*---------------------------------------------------------------.
+ | Scanning a Yacc comment. The initial '/ *' is already eaten. |
+ `---------------------------------------------------------------*/
+
+{
+ "*/" BEGIN context_state;
.|\n ;
- <> unexpected_end_of_file (loc, "*/");
+ <> unexpected_eof (token_start, "*/"); BEGIN context_state;
}
/*------------------------------------------------------------.
- | Scanning a C comment. The initial `/ *' is already eaten. |
+ | Scanning a C comment. The initial '/ *' is already eaten. |
`------------------------------------------------------------*/
{
- "*"{splice}"/" STRING_GROW; BEGIN c_context;
- <> unexpected_end_of_file (loc, "*/");
+ "*"{splice}"/" STRING_GROW; BEGIN context_state;
+ <> unexpected_eof (token_start, "*/"); BEGIN context_state;
}
/*--------------------------------------------------------------.
- | Scanning a line comment. The initial `//' is already eaten. |
+ | Scanning a line comment. The initial '//' is already eaten. |
`--------------------------------------------------------------*/
{
- "\n" STRING_GROW; BEGIN c_context;
+ "\n" STRING_GROW; BEGIN context_state;
{splice} STRING_GROW;
- <> BEGIN c_context;
+ <> BEGIN context_state;
}
- /*----------------------------------------------------------------.
- | 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;
+ "\""|"\n" {
+ if (yytext[0] == '\n')
+ unexpected_newline (token_start, "\"");
STRING_FINISH;
- val->string = last_string;
- rule_length++;
+ loc->start = token_start;
+ val->chars = last_string;
+ BEGIN INITIAL;
+ return STRING;
+ }
+ <> {
+ unexpected_eof (token_start, "\"");
+ STRING_FINISH;
+ loc->start = token_start;
+ val->chars = last_string;
BEGIN INITIAL;
return STRING;
}
-
- .|\n STRING_GROW;
- <> unexpected_end_of_file (loc, "\"");
}
- /*---------------------------------------------------------------.
- | 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. |
+ `----------------------------------------------------------*/
{
- "'" {
- STRING_GROW;
+ "'"|"\n" {
STRING_FINISH;
- val->symbol = symbol_get (last_string, *loc);
- symbol_class_set (val->symbol, token_sym, *loc);
- symbol_user_token_number_set (val->symbol,
- (unsigned char) last_string[1], *loc);
+ loc->start = token_start;
+ val->character = last_string[0];
+ {
+ /* FIXME: Eventually, make these errors. */
+ if (last_string[0] == '\0')
+ {
+ warn_at (*loc, _("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"));
+ }
+ if (yytext[0] == '\n')
+ unexpected_newline (token_start, "'");
STRING_FREE;
- rule_length++;
BEGIN INITIAL;
- return ID;
+ return CHAR;
}
+ <> {
+ STRING_FINISH;
+ loc->start = token_start;
+ val->character = last_string[0];
+ {
+ /* FIXME: Eventually, make these errors. */
+ if (last_string[0] == '\0')
+ {
+ warn_at (*loc, _("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"));
+ }
+ unexpected_eof (token_start, "'");
+ STRING_FREE;
+ BEGIN INITIAL;
+ return CHAR;
+ }
+}
- .|\n STRING_GROW;
- <> unexpected_end_of_file (loc, "'");
+
+{
+ \0 complain_at (*loc, _("invalid null character"));
}
@@ -342,84 +520,75 @@ splice (\\[ \f\t\v]*\n)*
{
\\[0-7]{1,3} {
- unsigned long c = strtoul (yytext + 1, 0, 8);
- if (UCHAR_MAX < c)
- {
- complain_at (*loc, _("invalid escape sequence: %s"),
- quote (yytext));
- STEP;
- }
+ unsigned long int c = strtoul (yytext + 1, NULL, 8);
+ if (!c || UCHAR_MAX < c)
+ complain_at (*loc, _("invalid number after \\-escape: %s"),
+ yytext+1);
else
- obstack_1grow (&string_obstack, c);
+ obstack_1grow (&obstack_for_string, c);
}
\\x[0-9abcdefABCDEF]+ {
- unsigned long c;
- errno = 0;
- c = strtoul (yytext + 2, 0, 16);
- if (UCHAR_MAX < c || errno)
- {
- complain_at (*loc, _("invalid escape sequence: %s"),
- quote (yytext));
- STEP;
- }
+ 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"),
+ yytext+1);
else
- obstack_1grow (&string_obstack, c);
+ obstack_1grow (&obstack_for_string, c);
}
- \\a obstack_1grow (&string_obstack, '\a');
- \\b obstack_1grow (&string_obstack, '\b');
- \\f obstack_1grow (&string_obstack, '\f');
- \\n obstack_1grow (&string_obstack, '\n');
- \\r obstack_1grow (&string_obstack, '\r');
- \\t obstack_1grow (&string_obstack, '\t');
- \\v obstack_1grow (&string_obstack, '\v');
+ \\a obstack_1grow (&obstack_for_string, '\a');
+ \\b obstack_1grow (&obstack_for_string, '\b');
+ \\f obstack_1grow (&obstack_for_string, '\f');
+ \\n obstack_1grow (&obstack_for_string, '\n');
+ \\r obstack_1grow (&obstack_for_string, '\r');
+ \\t obstack_1grow (&obstack_for_string, '\t');
+ \\v obstack_1grow (&obstack_for_string, '\v');
/* \\[\"\'?\\] would be shorter, but it confuses xgettext. */
- \\("\""|"'"|"?"|"\\") obstack_1grow (&string_obstack, yytext[1]);
+ \\("\""|"'"|"?"|"\\") obstack_1grow (&obstack_for_string, yytext[1]);
\\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} {
int c = convert_ucn_to_byte (yytext);
- if (c < 0)
- {
- complain_at (*loc, _("invalid escape sequence: %s"),
- quote (yytext));
- STEP;
- }
+ if (c <= 0)
+ complain_at (*loc, _("invalid number after \\-escape: %s"),
+ yytext+1);
else
- obstack_1grow (&string_obstack, c);
+ obstack_1grow (&obstack_for_string, c);
}
\\(.|\n) {
- complain_at (*loc, _("unrecognized escape sequence: %s"),
- quote (yytext));
- STRING_GROW;
+ char const *p = yytext + 1;
+ /* Quote only if escaping won't make the character visible. */
+ if (isspace ((unsigned char) *p) && 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);
}
}
+ /*--------------------------------------------.
+ | 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 c_context;
- \\{splice}[^$@\[\]] STRING_GROW;
- <> unexpected_end_of_file (loc, "'");
+ "'" 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 c_context;
- \\{splice}[^$@\[\]] STRING_GROW;
- <> unexpected_end_of_file (loc, "\"");
+ "\"" STRING_GROW; BEGIN context_state;
+ \n unexpected_newline (token_start, "\""); BEGIN context_state;
+ <> unexpected_eof (token_start, "\""); BEGIN context_state;
}
@@ -429,45 +598,68 @@ splice (\\[ \f\t\v]*\n)*
{
- "'" STRING_GROW; c_context = YY_START; BEGIN SC_CHARACTER;
- "\"" STRING_GROW; c_context = YY_START; BEGIN SC_STRING;
- "/"{splice}"*" STRING_GROW; c_context = YY_START; BEGIN SC_COMMENT;
- "/"{splice}"/" STRING_GROW; c_context = YY_START; BEGIN SC_LINE_COMMENT;
+ "'" {
+ STRING_GROW;
+ context_state = YY_START;
+ token_start = loc->start;
+ BEGIN SC_CHARACTER;
+ }
+ "\"" {
+ STRING_GROW;
+ context_state = YY_START;
+ token_start = loc->start;
+ BEGIN SC_STRING;
+ }
+ "/"{splice}"*" {
+ STRING_GROW;
+ context_state = YY_START;
+ token_start = loc->start;
+ BEGIN SC_COMMENT;
+ }
+ "/"{splice}"/" {
+ STRING_GROW;
+ context_state = YY_START;
+ BEGIN SC_LINE_COMMENT;
+ }
}
- /*---------------------------------------------------------------.
- | Scanning some code in braces (%union and actions). The initial |
- | "{" is already eaten. |
- `---------------------------------------------------------------*/
+
+ /*-----------------------------------------------------------.
+ | Scanning some code in braces (actions). The initial "{" is |
+ | already eaten. |
+ `-----------------------------------------------------------*/
{
"{"|"<"{splice}"%" STRING_GROW; braces_level++;
"%"{splice}">" STRING_GROW; braces_level--;
"}" {
- STRING_GROW;
- braces_level--;
+ obstack_1grow (&obstack_for_string, '}');
+
+ --braces_level;
if (braces_level < 0)
{
STRING_FINISH;
- val->string = last_string;
- rule_length++;
+ loc->start = code_start;
+ val->code = last_string;
BEGIN INITIAL;
return BRACED_CODE;
}
}
- /* Tokenize `<<%' correctly (as `<<' `%') rather than incorrrectly
- (as `<' `<%'). */
+ /* Tokenize '<<%' correctly (as '<<' '%') rather than incorrrectly
+ (as '<' '<%'). */
"<"{splice}"<" STRING_GROW;
- "$"("<"{tag}">")?(-?[0-9]+|"$") { handle_dollar (current_braced_code,
- yytext, *loc); }
- "@"(-?[0-9]+|"$") { handle_at (current_braced_code,
- yytext, *loc); }
-
- <> unexpected_end_of_file (loc, "}");
+ <> {
+ unexpected_eof (code_start, "}");
+ STRING_FINISH;
+ loc->start = code_start;
+ val->code = last_string;
+ BEGIN INITIAL;
+ return BRACED_CODE;
+ }
}
@@ -479,12 +671,20 @@ splice (\\[ \f\t\v]*\n)*
{
"%}" {
STRING_FINISH;
- val->string = last_string;
+ loc->start = code_start;
+ val->chars = last_string;
BEGIN INITIAL;
return PROLOGUE;
}
- <> unexpected_end_of_file (loc, "%}");
+ <> {
+ unexpected_eof (code_start, "%}");
+ STRING_FINISH;
+ loc->start = code_start;
+ val->chars = last_string;
+ BEGIN INITIAL;
+ return PROLOGUE;
+ }
}
@@ -497,66 +697,23 @@ splice (\\[ \f\t\v]*\n)*
{
<> {
STRING_FINISH;
- val->string = last_string;
+ loc->start = code_start;
+ val->chars = last_string;
BEGIN INITIAL;
return EPILOGUE;
}
}
- /*----------------------------------------------------------------.
- | By default, grow the string obstack with the input, escaping M4 |
- | quoting characters. |
- `----------------------------------------------------------------*/
-
-
-{
- \$ obstack_sgrow (&string_obstack, "$][");
- \@ obstack_sgrow (&string_obstack, "@@");
- \[ obstack_sgrow (&string_obstack, "@{");
- \] obstack_sgrow (&string_obstack, "@}");
- .|\n STRING_GROW;
-}
+ /*-----------------------------------------------------.
+ | By default, grow the string obstack with the input. |
+ `-----------------------------------------------------*/
+. |
+\n STRING_GROW;
%%
-/* Extend *LOC to account for token TOKEN of size SIZE. */
-
-static void
-extend_location (location_t *loc, char const *token, int size)
-{
- int line = loc->last_line;
- int column = loc->last_column;
- char const *p0 = token;
- char const *p = token;
- char const *lim = token + size;
-
- for (p = token; p < lim; p++)
- switch (*p)
- {
- case '\r':
- /* \r shouldn't survive no_cr_read. */
- abort ();
-
- case '\n':
- line++;
- column = 1;
- p0 = p + 1;
- break;
-
- case '\t':
- column += mbsnwidth (p0, p - p0, 0);
- column += 8 - ((column - 1) & 7);
- p0 = p + 1;
- break;
- }
-
- loc->last_line = line;
- loc->last_column = column + mbsnwidth (p0, p - p0, 0);
-}
-
-
/* Read bytes from FP into buffer BUF of size SIZE. Return the
number of bytes read. Remove '\r' from input, treating \r\n
and isolated \r as \n. */
@@ -564,14 +721,14 @@ extend_location (location_t *loc, char const *token, int size)
static size_t
no_cr_read (FILE *fp, char *buf, size_t size)
{
- size_t s = fread (buf, 1, size, fp);
- if (s)
+ size_t bytes_read = fread (buf, 1, size, fp);
+ if (bytes_read)
{
- char *w = memchr (buf, '\r', s);
+ char *w = memchr (buf, '\r', bytes_read);
if (w)
{
char const *r = ++w;
- char const *lim = buf + s;
+ char const *lim = buf + bytes_read;
for (;;)
{
@@ -600,181 +757,28 @@ no_cr_read (FILE *fp, char *buf, size_t size)
}
}
- return s;
+ return bytes_read;
}
-/*------------------------------------------------------------------.
-| TEXT is pointing to a wannabee semantic value (i.e., a `$'). |
-| |
-| Possible inputs: $[]($|integer) |
-| |
-| Output to the STRING_OBSTACK a reference to this semantic value. |
-`------------------------------------------------------------------*/
-
-static inline void
-handle_action_dollar (char *text, location_t location)
-{
- const char *type_name = NULL;
- char *cp = text + 1;
-
- /* Get the type name if explicit. */
- if (*cp == '<')
- {
- type_name = ++cp;
- while (*cp != '>')
- ++cp;
- *cp = '\0';
- ++cp;
- }
-
- if (*cp == '$')
- {
- if (!type_name)
- type_name = symbol_list_n_type_name_get (current_rule, location, 0);
- if (!type_name && typed)
- complain_at (location, _("$$ of `%s' has no declared type"),
- current_rule->sym->tag);
- if (!type_name)
- type_name = "";
- obstack_fgrow1 (&string_obstack,
- "]b4_lhs_value([%s])[", type_name);
- }
- else
- {
- long num;
- errno = 0;
- num = strtol (cp, 0, 10);
-
- if (INT_MIN <= num && num <= rule_length && ! errno)
- {
- int n = num;
- if (!type_name && n > 0)
- type_name = symbol_list_n_type_name_get (current_rule, location,
- n);
- if (!type_name && typed)
- complain_at (location, _("$%d of `%s' has no declared type"),
- n, current_rule->sym->tag);
- if (!type_name)
- type_name = "";
- obstack_fgrow3 (&string_obstack,
- "]b4_rhs_value([%d], [%d], [%s])[",
- rule_length, n, type_name);
- }
- else
- complain_at (location, _("integer out of range: %s"), quote (text));
- }
-}
-
-
-/*---------------------------------------------------------------.
-| TEXT is expected to be $$ in some code associated to a symbol: |
-| destructor or printer. |
-`---------------------------------------------------------------*/
-
-static inline void
-handle_symbol_code_dollar (char *text, location_t location)
-{
- char *cp = text + 1;
- if (*cp == '$')
- obstack_sgrow (&string_obstack, "]b4_dollar_dollar[");
- else
- complain_at (location, _("invalid value: %s"), quote (text));
-}
-
-
-/*-----------------------------------------------------------------.
-| Dispatch onto handle_action_dollar, or handle_destructor_dollar, |
-| depending upon CODE_KIND. |
-`-----------------------------------------------------------------*/
-
-static void
-handle_dollar (braced_code_t braced_code_kind,
- char *text, location_t location)
-{
- switch (braced_code_kind)
- {
- case action_braced_code:
- handle_action_dollar (text, location);
- break;
-
- case destructor_braced_code:
- case printer_braced_code:
- handle_symbol_code_dollar (text, location);
- break;
- }
-}
-
/*------------------------------------------------------.
-| TEXT is a location token (i.e., a `@...'). Output to |
-| STRING_OBSTACK a reference to this location. |
+| Scan NUMBER for a base-BASE integer at location LOC. |
`------------------------------------------------------*/
-static inline void
-handle_action_at (char *text, location_t location)
+static unsigned long int
+scan_integer (char const *number, int base, location loc)
{
- char *cp = text + 1;
- locations_flag = 1;
+ verify (INT_MAX < ULONG_MAX);
+ unsigned long int num = strtoul (number, NULL, base);
- if (*cp == '$')
+ if (INT_MAX < num)
{
- obstack_sgrow (&string_obstack, "]b4_lhs_location[");
+ complain_at (loc, _("integer out of range: %s"), quote (number));
+ num = INT_MAX;
}
- else
- {
- long num;
- errno = 0;
- num = strtol (cp, 0, 10);
- if (INT_MIN <= num && num <= rule_length && ! errno)
- {
- int n = num;
- obstack_fgrow2 (&string_obstack, "]b4_rhs_location([%d], [%d])[",
- rule_length, n);
- }
- else
- complain_at (location, _("integer out of range: %s"), quote (text));
- }
-}
-
-
-/*---------------------------------------------------------------.
-| TEXT is expected to be @$ in some code associated to a symbol: |
-| destructor or printer. |
-`---------------------------------------------------------------*/
-
-static inline void
-handle_symbol_code_at (char *text, location_t location)
-{
- char *cp = text + 1;
- if (*cp == '$')
- obstack_sgrow (&string_obstack, "]b4_at_dollar[");
- else
- complain_at (location, _("invalid value: %s"), quote (text));
-}
-
-
-/*-------------------------------------------------------------------.
-| Dispatch onto handle_action_at, or handle_destructor_at, depending |
-| upon CODE_KIND. |
-`-------------------------------------------------------------------*/
-
-static void
-handle_at (braced_code_t braced_code_kind,
- char *text, location_t location)
-{
- switch (braced_code_kind)
- {
- case action_braced_code:
- handle_action_at (text, location);
- break;
-
- case destructor_braced_code:
- case printer_braced_code:
- handle_symbol_code_at (text, location);
- break;
- }
+ return num;
}
@@ -787,7 +791,8 @@ handle_at (braced_code_t braced_code_kind,
static int
convert_ucn_to_byte (char const *ucn)
{
- unsigned long code = strtoul (ucn + 2, 0, 16);
+ verify (UCHAR_MAX <= INT_MAX);
+ unsigned long int code = strtoul (ucn + 2, NULL, 16);
/* FIXME: Currently we assume Unicode-compatible unibyte characters
on ASCII hosts (i.e., Latin-1 on hosts with 8-bit bytes). On
@@ -835,41 +840,66 @@ convert_ucn_to_byte (char const *ucn)
/*----------------------------------------------------------------.
-| Handle `#line INT "FILE"'. ARGS has already skipped `#line '. |
+| Handle '#line INT "FILE"'. ARGS has already skipped '#line '. |
+`----------------------------------------------------------------*/
+
+static void
+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';
+ if (INT_MAX <= lineno)
+ {
+ warn_at (loc, _("line number overflow"));
+ lineno = INT_MAX;
+ }
+ current_file = uniqstr_new (file);
+ boundary_set (&scanner_cursor, current_file, lineno, 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
-handle_syncline (char *args, location_t *location)
+unexpected_end (boundary start, char const *msgid, char const *token_end)
{
- int lineno = strtol (args, &args, 10);
- const char *file = NULL;
- file = strchr (args, '"') + 1;
- *strchr (file, '"') = 0;
- current_file = xstrdup (file);
- location->file = current_file;
- location->last_line = lineno;
+ location loc;
+ loc.start = start;
+ loc.end = scanner_cursor;
+ token_end = quote (token_end);
+ // Instead of '\'', display "'".
+ if (!strcmp (token_end, "'\\''"))
+ token_end = "\"'\"";
+ complain_at (loc, _(msgid), token_end);
}
-/*-------------------------------------------------------------.
-| Report an unexpected end of file at LOC. An end of file was |
-| encountered and the expected TOKEN_END was missing. After |
-| reporting the problem, pretend that TOKEN_END was found. |
-`-------------------------------------------------------------*/
+/*------------------------------------------------------------------------.
+| 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. |
+`------------------------------------------------------------------------*/
static void
-unexpected_end_of_file (location_t *loc, char const *token_end)
+unexpected_eof (boundary start, char const *token_end)
{
- size_t i = strlen (token_end);
+ unexpected_end (start, N_("missing %s at end of file"), token_end);
+}
- complain_at (*loc, _("missing `%s' at end of file"), token_end);
- /* Adjust location's last column so that any later message does not
- mention the characters just inserted. */
- loc->last_column -= i;
+/*----------------------------------------.
+| Likewise, but for unexpected newlines. |
+`----------------------------------------*/
- while (i != 0)
- unput (token_end[--i]);
+static void
+unexpected_newline (boundary start, char const *token_end)
+{
+ unexpected_end (start, N_("missing %s at end of line"), token_end);
}
@@ -878,9 +908,9 @@ unexpected_end_of_file (location_t *loc, char const *token_end)
`-------------------------*/
void
-scanner_initialize (void)
+gram_scanner_initialize (void)
{
- obstack_init (&string_obstack);
+ obstack_init (&obstack_for_string);
}
@@ -889,9 +919,9 @@ scanner_initialize (void)
`-----------------------------------------------*/
void
-scanner_free (void)
+gram_scanner_free (void)
{
- obstack_free (&string_obstack, 0);
+ obstack_free (&obstack_for_string, 0);
/* Reclaim Flex's buffers. */
- yy_delete_buffer (YY_CURRENT_BUFFER);
+ yylex_destroy ();
}