#include "reader.h"
/* Each time we match a string, move the end cursor to its end. */
+#define YY_USER_INIT \
+do { \
+ LOCATION_RESET (*yylloc); \
+ /* This is only to avoid GCC warnings. */ \
+ if (yycontrol) {;}; \
+} while (0)
+
#define YY_USER_ACTION LOCATION_COLUMNS (*yylloc, yyleng)
#define YY_LINES LOCATION_LINES (*yylloc, yyleng); lineno += yyleng;
#define YY_STEP LOCATION_STEP (*yylloc)
keep (to construct ID, STRINGS etc.). Use the following macros to
use it.
- Use YY_OBS_INIT to initialize a new growing string, YY_OBS_GROW to
- append what has just been matched, and YY_OBS_FINISH to end the
- string (it puts the ending 0). YY_OBS_FINISH also stores this
- string in LAST_STRING, which can be used, and which is used by
- YY_OBS_FREE to free the last string. */
+ Use YY_OBS_GROW to append what has just been matched, and
+ YY_OBS_FINISH to end the string (it puts the ending 0).
+ YY_OBS_FINISH also stores this string in LAST_STRING, which can be
+ used, and which is used by YY_OBS_FREE to free the last string. */
static struct obstack string_obstack;
char *last_string;
-#define YY_OBS_INIT \
- obstack_init (&string_obstack)
-
#define YY_OBS_GROW \
obstack_grow (&string_obstack, yytext, yyleng)
}
-/* This is only to avoid GCC warnings. */
-#define YY_USER_INIT if (yycontrol) {;};
-
static int braces_level = 0;
static int percent_percent_count = 0;
-static void handle_dollar PARAMS ((char *cp));
+static void handle_dollar PARAMS ((char *cp, location_t location));
static void handle_at PARAMS ((char *cp));
%}
start of the next token. */
#define TR_POS 0
#if TR_POS
- fprintf (stderr, "FOO1: ");
+ fprintf (stderr, "FOO1: %p: ", yylloc);
LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, "\n");
#endif
{eols} YY_LINES; YY_STEP;
{blanks} YY_STEP;
{id} {
- yylval->symbol = getsym (yytext);
+ yylval->symbol = getsym (yytext, *yylloc);
return ID;
}
{int} yylval->integer = strtol (yytext, 0, 10); return INT;
/* Characters. We don't check there is only one. */
- \' YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
+ \' YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
/* Strings. */
- \" YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
+ \" YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
/* Comments. */
"/*" yy_push_state (SC_COMMENT);
"//".* YY_STEP;
/* Prologue. */
- "%{" YY_OBS_INIT; yy_push_state (SC_PROLOGUE);
+ "%{" yy_push_state (SC_PROLOGUE);
/* Code in between braces. */
- "{" YY_OBS_INIT; YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);
+ "{" YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);
/* A type. */
"<"[^>]+">" {
- YY_OBS_INIT;
obstack_grow (&string_obstack, yytext + 1, yyleng - 2);
YY_OBS_FINISH;
yylval->string = last_string;
<SC_COMMENT,SC_STRING,SC_CHARACTER,SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
{
- \[ obstack_sgrow (&string_obstack, "@<:@");
- \] obstack_sgrow (&string_obstack, "@:>@");
+ \[ if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@<:@");
+ \] if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");
}
assert (yy_top_state () == INITIAL);
{
YY_OBS_FINISH;
- yylval->symbol = getsym (last_string);
+ yylval->symbol = getsym (last_string, *yylloc);
symbol_class_set (yylval->symbol, token_sym);
symbol_user_token_number_set (yylval->symbol, last_string[1]);
YY_OBS_FREE;
"{" YY_OBS_GROW; braces_level++;
- "$"("<".*">")?(-?[0-9]+|"$") { handle_dollar (yytext); }
+ "$"("<"[^>]+">")?(-?[0-9]+|"$") { handle_dollar (yytext, *yylloc); }
"@"(-?[0-9]+|"$") { handle_at (yytext); }
- [^\[\]$/\'\"@\{\}\n\r]+ YY_OBS_GROW;
+ [^$@\[\]/\'\"\{\}\n\r]+ YY_OBS_GROW;
{eols} YY_OBS_GROW; YY_LINES;
/* A lose $, or /, or etc. */
return PROLOGUE;
}
- [^\[\]%\n\r]+ YY_OBS_GROW;
+ [^%\[\]/\'\"\n\r]+ YY_OBS_GROW;
"%"+[^%\}\n\r]+ YY_OBS_GROW;
{eols} YY_OBS_GROW; YY_LINES;
`------------------------------------------------------------------*/
static void
-handle_dollar (char *cp)
+handle_dollar (char *cp, location_t location)
{
const char *type_name = NULL;
stack. It is not the same as the rule->length in the case of mid
rule actions. */
int rule_length = 0;
- symbol_list *rhs;
+ symbol_list_t *rhs;
for (rhs = current_rule->next; rhs; rhs = rhs->next)
++rule_length;
if (*cp == '$')
{
if (!type_name)
- type_name = get_type_name (0, current_rule);
+ type_name = symbol_list_n_type_name_get (current_rule, location, 0);
if (!type_name && typed)
- complain (_("$$ of `%s' has no declared type"),
- current_rule->sym->tag);
+ complain_at (location, _("$$ of `%s' has no declared type"),
+ current_rule->sym->tag);
if (!type_name)
type_name = "";
obstack_fgrow1 (&string_obstack,
int n = strtol (cp, &cp, 10);
if (n > rule_length)
- complain (_("invalid value: %s%d"), "$", n);
+ complain_at (location, _("invalid value: %s%d"), "$", n);
else
{
if (!type_name && n > 0)
- type_name = get_type_name (n, current_rule);
+ type_name = symbol_list_n_type_name_get (current_rule, location,
+ n);
if (!type_name && typed)
- complain (_("$%d of `%s' has no declared type"),
+ complain_at (location, _("$%d of `%s' has no declared type"),
n, current_rule->sym->tag);
if (!type_name)
type_name = "";
stack. It is not the same as the rule->length in the case of mid
rule actions. */
int rule_length = 0;
- symbol_list *rhs;
+ symbol_list_t *rhs;
for (rhs = current_rule->next; rhs; rhs = rhs->next)
++rule_length;
}
}
+void
+scanner_initialize (void)
+{
+ obstack_init (&string_obstack);
+}
+
+
void
scanner_free (void)
{
projects / bison.git / blobdiff