From 2073702c3762a8e61ec1b7401ef422ec3fa8b7ff Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 7 Dec 2002 06:02:10 +0000 Subject: [PATCH] Adjust to new location_t layout. --- src/output.c | 14 +++++++------- src/reader.c | 9 +++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/output.c b/src/output.c index da0d785..e20ac59 100644 --- a/src/output.c +++ b/src/output.c @@ -229,7 +229,7 @@ prepare_rules (void) /* Separator in RHS. */ rhs[i++] = -1; /* Line where rule was defined. */ - rline[r] = rules[r].location.first_line; + rline[r] = rules[r].location.start.line; /* Dynamic precedence (GLR). */ dprec[r] = rules[r].dprec; /* Merger-function index (GLR). */ @@ -295,8 +295,8 @@ user_actions_output (FILE *out) fprintf (out, " case %d:\n", r + 1); fprintf (out, "]b4_syncline([[%d]], ", - rules[r].action_location.first_line); - escaped_file_name_output (out, rules[r].action_location.file); + rules[r].action_location.start.line); + escaped_file_name_output (out, rules[r].action_location.start.file); fprintf (out, ")[\n"); fprintf (out, " %s\n break;\n\n", rules[r].action); @@ -399,9 +399,9 @@ symbol_destructors_output (FILE *out) destructor, typename. */ fprintf (out, "%s[", 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]]]", - symbol->destructor_location.first_line, + symbol->destructor_location.start.line, symbol->tag, symbol->number, symbol->destructor, @@ -434,9 +434,9 @@ symbol_printers_output (FILE *out) printer, typename. */ fprintf (out, "%s[", 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]]]", - symbol->printer_location.first_line, + symbol->printer_location.start.line, symbol->tag, symbol->number, symbol->printer, diff --git a/src/reader.c b/src/reader.c index 7d2c8c7..52808c0 100644 --- a/src/reader.c +++ b/src/reader.c @@ -70,8 +70,9 @@ prologue_augment (const char *prologue, location_t location) !typed ? &pre_prologue_obstack : &post_prologue_obstack; obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", - location.first_line); - MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, location.file)); + location.start.line); + MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, + location.start.file)); obstack_sgrow (oout, "]])[\n"); obstack_sgrow (oout, prologue); } @@ -88,9 +89,9 @@ epilogue_augment (const char *epilogue, location_t location) { char *extension = NULL; obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", - location.first_line); + location.start.line); 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, epilogue); obstack_1grow (&muscle_obstack, 0); -- 2.7.4