(YYDPRINTF, YYDSYMPRINT, YYDSYMPRINTF) [!YYDEBUG]: Do not define to

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 63d0202771166f0169e46ee2d9e520d8009b4317..789b2f03a310c5faa67fc96e3ff26f353816595e 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -198,7 +198,7 @@ prepare_symbols (void)
 
 /*-------------------------------------------------------------.
 | Prepare the muscles related to the rules: rhs, prhs, r1, r2, |
 
 /*-------------------------------------------------------------.
 | Prepare the muscles related to the rules: rhs, prhs, r1, r2, |

-| rline, dprec, merger                                         |
+| rline, dprec, merger.                                        |

 `-------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------*/
 
 static void


@@ -230,9 +230,9 @@ prepare_rules (void)
       rhs[i++] = -1;
       /* Line where rule was defined. */
       rline[r] = rules[r].location.first_line;
       rhs[i++] = -1;
       /* Line where rule was defined. */
       rline[r] = rules[r].location.first_line;

-      /* Dynamic precedence (GLR) */
+      /* Dynamic precedence (GLR).  */

       dprec[r] = rules[r].dprec;
       dprec[r] = rules[r].dprec;

-      /* Merger-function index (GLR) */
+      /* Merger-function index (GLR).  */

       merger[r] = rules[r].merger;
     }
   assert (i == nritems);
       merger[r] = rules[r].merger;
     }
   assert (i == nritems);


@@ -526,10 +526,7 @@ output_skeleton (void)
   strcpy (full_path, pkgdatadir);
   full_path[pkgdatadirlen] = '/';
   strcpy (full_path + pkgdatadirlen + 1, m4sugar);
   strcpy (full_path, pkgdatadir);
   full_path[pkgdatadirlen] = '/';
   strcpy (full_path + pkgdatadirlen + 1, m4sugar);

-  in = fopen (full_path, "r");
-  if (! in)
-    error (EXIT_FAILURE, errno, "%s", full_path);
-  xfclose (in);
+  xfclose (xfopen (full_path, "r"));

   strcpy (full_path + pkgdatadirlen + 1, skeleton);
 
   /* Create an m4 subprocess connected to us via two pipes.  */
   strcpy (full_path + pkgdatadirlen + 1, skeleton);
 
   /* Create an m4 subprocess connected to us via two pipes.  */


@@ -591,8 +588,7 @@ prepare (void)
   MUSCLE_INSERT_INT ("pure", pure_parser);
   MUSCLE_INSERT_INT ("synclines_flag", !no_lines_flag);
 
   MUSCLE_INSERT_INT ("pure", pure_parser);
   MUSCLE_INSERT_INT ("synclines_flag", !no_lines_flag);
 

-  /* FIXME: This is wrong: the muscles should decide whether they hold
-     a copy or not, but the situation is too obscure currently.  */
+  /* File names.  */

   MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
 
   /* User Code.  */
   MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
 
   /* User Code.  */