* src/output.c (prepare_symbols): Avoid trailing spaces in the

output.

diff --git a/ChangeLog b/ChangeLog
index 9387efde4af09b0d78a931dd3bba7e3e8cf88d89..31dc5266e20f9cd2ee5fbd21458d45dd3f4c6264 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-31  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (prepare_symbols): Avoid trailing spaces in the
+       output.
+

 2003-03-31  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo (Strings are Destroyed): s/losses/loses/.
 2003-03-31  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo (Strings are Destroyed): s/losses/loses/.

diff --git a/src/output.c b/src/output.c
index 42646cbfc360b8de996855b08fde9cbcc85d2fba..5dea261a721b526230eaf5582e82f69209a3a73f 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -159,31 +159,30 @@ prepare_symbols (void)
   /* tname -- token names.  */
   {
     int i;
   /* tname -- token names.  */
   {
     int i;

-    int j = 0;
+    /* We assume that the table will be output starting at column 2. */
+    int j = 2;

     for (i = 0; i < nsyms; i++)
       {
     for (i = 0; i < nsyms; i++)
       {

-       /* Be sure not to use twice the same QUOTEARG slot:
-          SYMBOL_TAG_GET uses slot 0.  */
-       const char *cp =
-         quotearg_n_style (1, c_quoting_style,
-                           symbols[i]->tag);
-       /* Width of the next token, including the two quotes, the comma
-          and the space.  */
+       const char *cp = quotearg_style (c_quoting_style, symbols[i]->tag);
+       /* Width of the next token, including the two quotes, the
+          comma and the space.  */

        int width = strlen (cp) + 2;
 
        if (j + width > 75)
          {
        int width = strlen (cp) + 2;
 
        if (j + width > 75)
          {

-           obstack_sgrow (&format_obstack, "\n  ");
-           j = 2;
+           obstack_sgrow (&format_obstack, "\n ");
+           j = 1;

          }
 
          }
 

+       if (i)
+         obstack_1grow (&format_obstack, ' ');

        MUSCLE_OBSTACK_SGROW (&format_obstack, cp);
        MUSCLE_OBSTACK_SGROW (&format_obstack, cp);

-       obstack_sgrow (&format_obstack, ", ");
+       obstack_1grow (&format_obstack, ',');

        j += width;
       }
     /* Add a NULL entry to list of tokens (well, 0, as NULL might not be
        defined).  */
        j += width;
       }
     /* Add a NULL entry to list of tokens (well, 0, as NULL might not be
        defined).  */

-    obstack_sgrow (&format_obstack, "0");
+    obstack_sgrow (&format_obstack, " 0");

 
     /* Finish table and store. */
     obstack_1grow (&format_obstack, 0);
 
     /* Finish table and store. */
     obstack_1grow (&format_obstack, 0);