* data/c.m4 (yydestruct, yysymprint):

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index 56b749e67981d33550ea8241e2acdd3dc652371e..604ad1386608be8333d74e2f9a092e6928682539 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -385,9 +385,8 @@ m4_define_default([b4_yydestruct_generate],
     [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
     [[YYLTYPE *yylocationp], [yylocationp]]]))[
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-]b4_location_if([  (void) yylocationp;
+  YYUSE (yyvaluep);
+]b4_location_if([  YYUSE (yylocationp);
 ])[
   if (!yymsg)
     yymsg = "Deleting";
@@ -420,9 +419,8 @@ m4_define_default([b4_yysymprint_generate],
     [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
     [[YYLTYPE *yylocationp], [yylocationp]]]))
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-b4_location_if([  (void) yylocationp;
+  YYUSE (yyvaluep);
+b4_location_if([  YYUSE (yylocationp);
 ])dnl
 [
   if (yytype < YYNTOKENS)
@@ -431,7 +429,7 @@ b4_location_if([  (void) yylocationp;
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
 ]b4_location_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPUTS (": ", yyoutput);
+  YYFPRINTF (yyoutput, ": ");
 ])dnl
 [
 # ifdef YYPRINT
@@ -444,6 +442,6 @@ b4_location_if([  (void) yylocationp;
 [      default:
         break;
     }
-  YYFPUTC (')', yyoutput);
+  YYFPRINTF (yyoutput, ")");
 }
 ]])