* src/symtab.c (symbol_free): Remove dead deactivated code:

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index ea6d27c5384856b6aff09e66b4e1c86149bf3ada..64601e34a0eef769dac89bb5be4def5b58d028df 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -69,13 +69,10 @@ prologue_augment (const char *prologue, location_t location)
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 

-  if (!no_lines_flag)
-    {
-      obstack_fgrow2 (oout, muscle_find ("linef"),
-                     location.first_line,
-                     quotearg_style (c_quoting_style,
-                                     muscle_find ("filename")));
-    }
+  obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[",
+                 location.first_line);
+  MUSCLE_OBSTACK_SGROW (oout, quotearg_style (c_quoting_style, location.file));
+  obstack_sgrow (oout, "]])[\n");

   obstack_sgrow (oout, prologue);
 }
 
   obstack_sgrow (oout, prologue);
 }
 


@@ -89,13 +86,11 @@ prologue_augment (const char *prologue, location_t location)
 void
 epilogue_set (const char *epilogue, location_t location)
 {
 void
 epilogue_set (const char *epilogue, location_t location)
 {

-  if (!no_lines_flag)
-    {
-      obstack_fgrow2 (&muscle_obstack, muscle_find ("linef"),
-                     location.first_line,
-                     quotearg_style (c_quoting_style,
-                                     muscle_find ("filename")));
-    }
+  obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[",
+                 location.first_line);
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack,
+                       quotearg_style (c_quoting_style, location.file));
+  obstack_sgrow (&muscle_obstack, "]])[\n");

   obstack_sgrow (&muscle_obstack, epilogue);
   obstack_1grow (&muscle_obstack, 0);
   muscle_insert ("epilogue", obstack_finish (&muscle_obstack));
   obstack_sgrow (&muscle_obstack, epilogue);
   obstack_1grow (&muscle_obstack, 0);
   muscle_insert ("epilogue", obstack_finish (&muscle_obstack));


@@ -104,7 +99,7 @@ epilogue_set (const char *epilogue, location_t location)
 
 \f
 
 
 \f
 

- /*-------------------------------------------------------------------.
+/*-------------------------------------------------------------------.

 | Return the merger index for a merging function named NAME, whose   |
 | arguments have type TYPE.  Records the function, if new, in        |
 | merger_list.                                                      |
 | Return the merger index for a merging function named NAME, whose   |
 | arguments have type TYPE.  Records the function, if new, in        |
 | merger_list.                                                      |


@@ -137,8 +132,8 @@ get_merge_function (const char* name, const char* type,
       merge_functions = head.next;
     }
   else if (strcmp (type, syms->next->type) != 0)
       merge_functions = head.next;
     }
   else if (strcmp (type, syms->next->type) != 0)

-    warn_at (loc, _("result type clash (`%s' `%s') on merge function %s"),
-            type, syms->next->type, name);
+    warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"),
+            name, type, syms->next->type);

   return n;
 }
 
   return n;
 }
 


@@ -264,7 +259,7 @@ grammar_current_rule_check (void)
       const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";
       if (strcmp (lhs_type, rhs_type))
        complain_at (current_rule->location,
       const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";
       if (strcmp (lhs_type, rhs_type))
        complain_at (current_rule->location,

-                    _("type clash (`%s' `%s') on default action"),
+                    _("type clash on default action: <%s> != <%s>"),

                     lhs_type, rhs_type);
     }
   /* Warn if there is no default for $$ but we need one.  */
                     lhs_type, rhs_type);
     }
   /* Warn if there is no default for $$ but we need one.  */