Adjust to new location_t layout.

diff --git a/src/output.c b/src/output.c
index da0d78525921b66fc73819d7cfce265fbb28e9f7..e20ac59988784ca335ddeee24274ce40a6087ce0 100644 (file)
--- 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. */
       /* 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).  */
       /* 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]], ",
        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);
        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");
           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]]]",
        fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",

-                symbol->destructor_location.first_line,
+                symbol->destructor_location.start.line,

                 symbol->tag,
                 symbol->number,
                 symbol->destructor,
                 symbol->tag,
                 symbol->number,
                 symbol->destructor,


@@ -434,9 +434,9 @@ symbol_printers_output (FILE *out)
           printer, typename. */
        fprintf (out, "%s[",
                 first ? "" : ",\n");
           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]]]",
        fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",

-                symbol->printer_location.first_line,
+                symbol->printer_location.start.line,

                 symbol->tag,
                 symbol->number,
                 symbol->printer,
                 symbol->tag,
                 symbol->number,
                 symbol->printer,

diff --git a/src/reader.c b/src/reader.c
index 7d2c8c7030fffd973f8c72d2b9f67fb06e3e9d5c..52808c039ccdc109963e5ac5ff7d2a240411fd2e 100644 (file)
--- 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]], [[",
     !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);
 }
   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]], [[",
 {
   char *extension = NULL;
   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, epilogue);
   obstack_1grow (&muscle_obstack, 0);
   obstack_sgrow (&muscle_obstack, "]])[\n");
   obstack_sgrow (&muscle_obstack, epilogue);
   obstack_1grow (&muscle_obstack, 0);