(YY_USER_INIT): Initialize scanner_cursor instead
of *loc.
(STEP): Remove. No longer needed, now that adjust_location does
the work. All uses removed.
(scanner_cursor): New var.
(adjust_location): Renamed from extend_location. It now sets
*loc and adjusts the scanner cursor. All uses changed.
Don't bother testing for CR.
(handle_syncline): Remove location arg; now updates scanner cursor.
All callers changed.
(unexpected_end_of_file): Now accepts start boundary of token or
comment, not location. All callers changed. Update scanner cursor,
not the location.
(SC_AFTER_IDENTIFIER): New state.
(context_state): Renamed from c_context. All uses changed.
(id_loc, code_start, token_start): New local vars.
(<INITIAL,SC_AFTER_IDENTIFIER>): New initial context. Move all
processing of Yacc white space and equivalents here.
(<INITIAL>{id}): Save id_loc. Begin state SC_AFTER_IDENTIFIER
instead of returning ID immediately, since we need to search for
a subsequent colon.
(<INITIAL>"'", "\""): Save token_start.
(<INITIAL>"%{", "{", "%%"): Save code_start.
(<SC_AFTER_IDENTIFIER>): New state, looking for a colon.
(<SC_YACC_COMMENT>, <SC_COMMENT>, <SC_LINE_COMMENT>):
BEGIN context_state at end, not INITIAL.
(<SC_ESCAPED_STRING>"\"", <SC_ESCAPED_CHARACTER>"'",
<SC_BRACED_CODE>"}", <SC_PROLOGUE>"%}", <SC_EPILOGUE><<EOF>>):
Return correct token start.
(<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>): Save start boundary when
the start of a character, string or multiline comment is found.
#include "system.h"
#include "mbswidth.h"
#include "complain.h"
#include "system.h"
#include "mbswidth.h"
#include "complain.h"
#include "quote.h"
#include "struniq.h"
#include "getargs.h"
#include "gram.h"
#include "reader.h"
#include "quote.h"
#include "struniq.h"
#include "getargs.h"
#include "gram.h"
#include "reader.h"
-#define YY_USER_INIT \
-do { \
- LOCATION_RESET (*loc); \
- loc->file = current_file; \
-} while (0)
+#define YY_USER_INIT \
+ do \
+ { \
+ scanner_cursor.file = current_file; \
+ scanner_cursor.line = 1; \
+ scanner_cursor.column = 1; \
+ } \
+ while (0)
-/* Each time we match a string, move the end cursor to its end. */
-#define STEP LOCATION_STEP (*loc)
+/* Location of scanner cursor. */
+boundary scanner_cursor;
-static void extend_location (location_t *, char const *, int);
-#define YY_USER_ACTION extend_location (loc, yytext, yyleng);
+static void adjust_location (location_t *, char const *, size_t);
+#define YY_USER_ACTION adjust_location (loc, yytext, yyleng);
static size_t no_cr_read (FILE *, char *, size_t);
#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
static size_t no_cr_read (FILE *, char *, size_t);
#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
char *cp, location_t location);
static void handle_at (braced_code_t code_kind,
char *cp, location_t location);
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 *args);
static int convert_ucn_to_byte (char const *hex_text);
static int convert_ucn_to_byte (char const *hex_text);
-static void unexpected_end_of_file (location_t *, char const *);
+static void unexpected_end_of_file (boundary, char const *);
%}
%x SC_COMMENT SC_LINE_COMMENT SC_YACC_COMMENT
%x SC_STRING SC_CHARACTER
%}
%x SC_COMMENT SC_LINE_COMMENT SC_YACC_COMMENT
%x SC_STRING SC_CHARACTER
%x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
%x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE
%x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
%x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE
/* Nesting level of the current code in braces. */
int braces_level IF_LINT (= 0);
/* Nesting level of the current code in braces. */
int braces_level IF_LINT (= 0);
- /* Scanner context when scanning C code. */
- int c_context IF_LINT (= 0);
+ /* Parent context state, when applicable. */
+ int context_state IF_LINT (= 0);
- /* At each yylex invocation, mark the current position as the
- start of the next token. */
- STEP;
+ /* Location of most recent identifier, when applicable. */
+ location_t id_loc IF_LINT (= *loc);
+
+ /* Location where containing code started, when applicable. */
+ boundary code_start IF_LINT (= loc->start);
+
+ /* Location where containing comment or string or character literal
+ started, when applicable. */
+ boundary token_start IF_LINT (= loc->start);
+ /*-----------------------.
+ | Scanning white space. |
+ `-----------------------*/
+
+<INITIAL,SC_AFTER_IDENTIFIER>
+{
+ [ \f\n\t\v] ;
+
+ /* Comments. */
+ "/*" 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);
+ }
+}
+
+
/*----------------------------.
| Scanning Bison directives. |
`----------------------------*/
/*----------------------------.
| Scanning Bison directives. |
`----------------------------*/
"%verbose" return PERCENT_VERBOSE;
"%yacc" return PERCENT_YACC;
"%verbose" return PERCENT_VERBOSE;
"%yacc" return PERCENT_YACC;
complain_at (*loc, _("invalid directive: %s"), quote (yytext));
complain_at (*loc, _("invalid directive: %s"), quote (yytext));
- STEP;
- }
-
- ^"#line "{int}" \"".*"\"\n" {
- handle_syncline (yytext + sizeof "#line " - 1, loc);
- STEP;
- ":" rule_length = 0; return COLON;
"|" rule_length = 0; return PIPE;
";" return SEMICOLON;
"|" rule_length = 0; return PIPE;
";" return SEMICOLON;
"," {
warn_at (*loc, _("stray `,' treated as white space"));
"," {
warn_at (*loc, _("stray `,' treated as white space"));
val->symbol = symbol_get (yytext, *loc);
val->symbol = symbol_get (yytext, *loc);
+ BEGIN SC_AFTER_IDENTIFIER;
}
/* Characters. We don't check there is only one. */
}
/* Characters. We don't check there is only one. */
- "'" STRING_GROW; BEGIN SC_ESCAPED_CHARACTER;
+ "'" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
- "\"" STRING_GROW; BEGIN SC_ESCAPED_STRING;
-
- /* Comments. */
- "/*" BEGIN SC_YACC_COMMENT;
- "//".* STEP;
+ "\"" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_STRING;
- "%{" BEGIN SC_PROLOGUE;
+ "%{" code_start = loc->start; BEGIN SC_PROLOGUE;
/* Code in between braces. */
/* 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}">" {
/* A type. */
"<"{tag}">" {
"%%" {
static int percent_percent_count;
if (++percent_percent_count == 2)
"%%" {
static int percent_percent_count;
if (++percent_percent_count == 2)
+ {
+ code_start = loc->start;
+ BEGIN SC_EPILOGUE;
+ }
return PERCENT_PERCENT;
}
. {
complain_at (*loc, _("invalid character: %s"), quote (yytext));
return PERCENT_PERCENT;
}
. {
complain_at (*loc, _("invalid character: %s"), quote (yytext));
+ }
+}
+
+
+ /*-----------------------------------------------------------------.
+ | Scanning after an identifier, checking whether a colon is next. |
+ `-----------------------------------------------------------------*/
+
+<SC_AFTER_IDENTIFIER>
+{
+ ":" {
+ rule_length = 0;
+ *loc = id_loc;
+ BEGIN INITIAL;
+ return ID_COLON;
+ }
+ . {
+ scanner_cursor.column -= mbsnwidth (yytext, yyleng, 0);
+ yyless (0);
+ *loc = id_loc;
+ BEGIN INITIAL;
+ return ID;
+ }
+ <<EOF>> {
+ *loc = id_loc;
+ BEGIN INITIAL;
+ return ID;
- "*/" {
- STEP;
- BEGIN INITIAL;
- }
-
+ "*/" BEGIN context_state;
- <<EOF>> unexpected_end_of_file (loc, "*/");
+ <<EOF>> unexpected_end_of_file (token_start, "*/");
- "*"{splice}"/" STRING_GROW; BEGIN c_context;
- <<EOF>> unexpected_end_of_file (loc, "*/");
+ "*"{splice}"/" STRING_GROW; BEGIN context_state;
+ <<EOF>> unexpected_end_of_file (token_start, "*/");
- "\n" STRING_GROW; BEGIN c_context;
+ "\n" STRING_GROW; BEGIN context_state;
- <<EOF>> BEGIN c_context;
+ <<EOF>> BEGIN context_state;
"\"" {
STRING_GROW;
STRING_FINISH;
"\"" {
STRING_GROW;
STRING_FINISH;
+ loc->start = token_start;
val->string = last_string;
rule_length++;
BEGIN INITIAL;
val->string = last_string;
rule_length++;
BEGIN INITIAL;
- <<EOF>> unexpected_end_of_file (loc, "\"");
+ <<EOF>> unexpected_end_of_file (token_start, "\"");
}
/*---------------------------------------------------------------.
}
/*---------------------------------------------------------------.
"'" {
STRING_GROW;
STRING_FINISH;
"'" {
STRING_GROW;
STRING_FINISH;
+ loc->start = token_start;
val->symbol = symbol_get (last_string, *loc);
symbol_class_set (val->symbol, token_sym, *loc);
symbol_user_token_number_set (val->symbol,
val->symbol = symbol_get (last_string, *loc);
symbol_class_set (val->symbol, token_sym, *loc);
symbol_user_token_number_set (val->symbol,
- <<EOF>> unexpected_end_of_file (loc, "'");
+ <<EOF>> unexpected_end_of_file (token_start, "'");
\\[0-7]{1,3} {
unsigned long c = strtoul (yytext + 1, 0, 8);
if (UCHAR_MAX < c)
\\[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;
- }
+ complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext));
else
obstack_1grow (&string_obstack, c);
}
else
obstack_1grow (&string_obstack, c);
}
errno = 0;
c = strtoul (yytext + 2, 0, 16);
if (UCHAR_MAX < c || errno)
errno = 0;
c = strtoul (yytext + 2, 0, 16);
if (UCHAR_MAX < c || errno)
- {
- complain_at (*loc, _("invalid escape sequence: %s"),
- quote (yytext));
- STEP;
- }
+ complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext));
else
obstack_1grow (&string_obstack, c);
}
else
obstack_1grow (&string_obstack, c);
}
\\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} {
int c = convert_ucn_to_byte (yytext);
if (c < 0)
\\(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;
- }
+ complain_at (*loc, _("invalid escape sequence: %s"), quote (yytext));
else
obstack_1grow (&string_obstack, c);
}
\\(.|\n) {
else
obstack_1grow (&string_obstack, c);
}
\\(.|\n) {
- complain_at (*loc, _("unrecognized escape sequence: %s"),
- quote (yytext));
+ complain_at (*loc, _("unrecognized escape sequence: %s"), quote (yytext));
- "'" STRING_GROW; BEGIN c_context;
+ "'" STRING_GROW; BEGIN context_state;
\\{splice}[^$@\[\]] STRING_GROW;
\\{splice}[^$@\[\]] STRING_GROW;
- <<EOF>> unexpected_end_of_file (loc, "'");
+ <<EOF>> unexpected_end_of_file (token_start, "'");
- "\"" STRING_GROW; BEGIN c_context;
+ "\"" STRING_GROW; BEGIN context_state;
\\{splice}[^$@\[\]] STRING_GROW;
\\{splice}[^$@\[\]] STRING_GROW;
- <<EOF>> unexpected_end_of_file (loc, "\"");
+ <<EOF>> unexpected_end_of_file (token_start, "\"");
<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
{
<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
{
- "'" 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;
+ }
if (braces_level < 0)
{
STRING_FINISH;
if (braces_level < 0)
{
STRING_FINISH;
+ loc->start = code_start;
val->string = last_string;
rule_length++;
BEGIN INITIAL;
val->string = last_string;
rule_length++;
BEGIN INITIAL;
"@"(-?[0-9]+|"$") { handle_at (current_braced_code,
yytext, *loc); }
"@"(-?[0-9]+|"$") { handle_at (current_braced_code,
yytext, *loc); }
- <<EOF>> unexpected_end_of_file (loc, "}");
+ <<EOF>> unexpected_end_of_file (code_start, "}");
+ loc->start = code_start;
val->string = last_string;
BEGIN INITIAL;
return PROLOGUE;
}
val->string = last_string;
BEGIN INITIAL;
return PROLOGUE;
}
- <<EOF>> unexpected_end_of_file (loc, "%}");
+ <<EOF>> unexpected_end_of_file (code_start, "%}");
{
<<EOF>> {
STRING_FINISH;
{
<<EOF>> {
STRING_FINISH;
+ loc->start = code_start;
val->string = last_string;
BEGIN INITIAL;
return EPILOGUE;
val->string = last_string;
BEGIN INITIAL;
return EPILOGUE;
-/* Extend *LOC to account for token TOKEN of size SIZE. */
+/* Set *LOC and adjust scanner cursor to account for token TOKEN of
+ size SIZE. */
-extend_location (location_t *loc, char const *token, int size)
+adjust_location (location_t *loc, char const *token, size_t size)
- int line = loc->last_line;
- int column = loc->last_column;
+ int line = scanner_cursor.line;
+ int column = scanner_cursor.column;
char const *p0 = token;
char const *p = token;
char const *lim = token + size;
char const *p0 = token;
char const *p = token;
char const *lim = token + size;
+ loc->start = scanner_cursor;
+
for (p = token; p < lim; p++)
switch (*p)
{
for (p = token; p < lim; p++)
switch (*p)
{
- case '\r':
- /* \r shouldn't survive no_cr_read. */
- abort ();
-
case '\n':
line++;
column = 1;
case '\n':
line++;
column = 1;
- loc->last_line = line;
- loc->last_column = column + mbsnwidth (p0, p - p0, 0);
+ scanner_cursor.line = line;
+ scanner_cursor.column = column + mbsnwidth (p0, p - p0, 0);
+
+ loc->end = scanner_cursor;
`----------------------------------------------------------------*/
static void
`----------------------------------------------------------------*/
static void
-handle_syncline (char *args, location_t *location)
+handle_syncline (char *args)
{
int lineno = strtol (args, &args, 10);
const char *file = NULL;
file = strchr (args, '"') + 1;
*strchr (file, '"') = 0;
{
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;
+ scanner_cursor.file = current_file = xstrdup (file);
+ scanner_cursor.line = lineno;
+ scanner_cursor.column = 1;
-/*-------------------------------------------------------------.
-| 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. |
+| After reporting the problem, pretend that TOKEN_END was found. |
+`------------------------------------------------------------------------*/
-unexpected_end_of_file (location_t *loc, char const *token_end)
+unexpected_end_of_file (boundary start, char const *token_end)
{
size_t i = strlen (token_end);
{
size_t i = strlen (token_end);
- complain_at (*loc, _("missing `%s' at end of file"), token_end);
+ location_t location;
+ location.start = start;
+ location.end = scanner_cursor;
+ complain_at (location, _("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;
+ /* Adjust scanner cursor so that any later message does not count
+ the characters about to be inserted. */
+ scanner_cursor.column -= i;
while (i != 0)
unput (token_end[--i]);
while (i != 0)
unput (token_end[--i]);
projects / bison.git / commitdiff
