glr.cc: fix the handling of yydebug

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index c481e14e9cac8960b168c80afa9e624efd334f9b..e157460d0863be63828f601f7ba9968733776ab9 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -142,7 +142,6 @@ escaped_output (FILE *out, char const *string)
 static void
 prepare_symbols (void)
 {
-  MUSCLE_INSERT_BOOL ("token_table", token_table_flag);
   MUSCLE_INSERT_INT ("tokens_number", ntokens);
   MUSCLE_INSERT_INT ("nterms_number", nvars);
   MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
@@ -176,7 +175,7 @@ prepare_symbols (void)
 
        if (i)
          obstack_1grow (&format_obstack, ' ');
-       MUSCLE_OBSTACK_SGROW (&format_obstack, cp);
+       obstack_escape (&format_obstack, cp);
         free (cp);
        obstack_1grow (&format_obstack, ',');
        j += width;
@@ -512,7 +511,7 @@ output_skeleton (void)
   full_skeleton = xmalloc (pkgdatadirlen + 1
                           + (skeleton_size < sizeof m4sugar
                              ? sizeof m4sugar : skeleton_size));
-  strncpy (full_skeleton, pkgdatadir, pkgdatadirlen);
+  memcpy (full_skeleton, pkgdatadir, pkgdatadirlen);
   full_skeleton[pkgdatadirlen] = '/';
   strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
   full_m4sugar = xstrdup (full_skeleton);
@@ -624,6 +623,7 @@ prepare (void)
   MUSCLE_INSERT_BOOL ("nondeterministic_flag", nondeterministic_parser);
   MUSCLE_INSERT_BOOL ("synclines_flag", !no_lines_flag);
   MUSCLE_INSERT_BOOL ("tag_seen_flag", tag_seen);
+  MUSCLE_INSERT_BOOL ("token_table_flag", token_table_flag);
   MUSCLE_INSERT_BOOL ("use_push_for_pull_flag", use_push_for_pull_flag);
   MUSCLE_INSERT_BOOL ("yacc_flag", yacc_flag);