Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust to new location_t layout.

Browse Source
This commit is contained in:
Paul Eggert
2002-12-07 06:02:10 +00:00
parent b729552289
commit 2073702c37
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/output.c
View File

@@ -229,7 +229,7 @@ prepare_rules (void)
/* Separator in RHS. */ /* Separator in RHS. */
rhs[i++] = -1; rhs[i++] = -1;
/* Line where rule was defined. */ /* Line where rule was defined. */
rline[r] = rules[r].location.first_line; rline[r] = rules[r].location.start.line;
/* Dynamic precedence (GLR). */ /* Dynamic precedence (GLR). */
dprec[r] = rules[r].dprec; dprec[r] = rules[r].dprec;
/* Merger-function index (GLR). */ /* Merger-function index (GLR). */
@@ -295,8 +295,8 @@ user_actions_output (FILE *out)
fprintf (out, " case %d:\n", r + 1); fprintf (out, " case %d:\n", r + 1);
fprintf (out, "]b4_syncline([[%d]], ", fprintf (out, "]b4_syncline([[%d]], ",
rules[r].action_location.first_line); rules[r].action_location.start.line);
escaped_file_name_output (out, rules[r].action_location.file); escaped_file_name_output (out, rules[r].action_location.start.file);
fprintf (out, ")[\n"); fprintf (out, ")[\n");
fprintf (out, " %s\n break;\n\n", fprintf (out, " %s\n break;\n\n",
rules[r].action); rules[r].action);
@@ -399,9 +399,9 @@ symbol_destructors_output (FILE *out)
destructor, typename. */ destructor, typename. */
fprintf (out, "%s[", fprintf (out, "%s[",
first ? "" : ",\n"); first ? "" : ",\n");
escaped_file_name_output (out, symbol->destructor_location.file); escaped_file_name_output (out, symbol->destructor_location.start.file);
fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
symbol->destructor_location.first_line, symbol->destructor_location.start.line,
symbol->tag, symbol->tag,
symbol->number, symbol->number,
symbol->destructor, symbol->destructor,
@@ -434,9 +434,9 @@ symbol_printers_output (FILE *out)
printer, typename. */ printer, typename. */
fprintf (out, "%s[", fprintf (out, "%s[",
first ? "" : ",\n"); first ? "" : ",\n");
escaped_file_name_output (out, symbol->printer_location.file); escaped_file_name_output (out, symbol->printer_location.start.file);
fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]", fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
symbol->printer_location.first_line, symbol->printer_location.start.line,
symbol->tag, symbol->tag,
symbol->number, symbol->number,
symbol->printer, symbol->printer,

9
src/reader.c
View File

@@ -70,8 +70,9 @@ prologue_augment (const char *prologue, location_t location)
!typed ? &pre_prologue_obstack : &post_prologue_obstack; !typed ? &pre_prologue_obstack : &post_prologue_obstack;
obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[",
location.first_line); location.start.line);
MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, location.file)); MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style,
location.start.file));
obstack_sgrow (oout, "]])[\n"); obstack_sgrow (oout, "]])[\n");
obstack_sgrow (oout, prologue); obstack_sgrow (oout, prologue);
} }
@@ -88,9 +89,9 @@ epilogue_augment (const char *epilogue, location_t location)
{ {
char *extension = NULL; char *extension = NULL;
obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[",
location.first_line); location.start.line);
MUSCLE_OBSTACK_SGROW (&muscle_obstack, MUSCLE_OBSTACK_SGROW (&muscle_obstack,
quotearg_style (c_quoting_style, location.file)); quotearg_style (c_quoting_style, location.start.file));
obstack_sgrow (&muscle_obstack, "]])[\n"); obstack_sgrow (&muscle_obstack, "]])[\n");
obstack_sgrow (&muscle_obstack, epilogue); obstack_sgrow (&muscle_obstack, epilogue);
obstack_1grow (&muscle_obstack, 0); obstack_1grow (&muscle_obstack, 0);