* Makefile.am: DJGPP specific files added to EXTRA_DIST.

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 824ce7676cc3b6a6f78ebcc8930fd742c6fc8d17..52551f035cde146d44f77c04f67d1300629cc7e3 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -53,7 +53,9 @@ b4_location_if([,
                              [yylocationp]]])[]dnl
 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {
                              [yylocationp]]])[]dnl
 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {

-  (void) yyoutput;
+  YYUSE (yyoutput);
+]b4_parse_param_use[]dnl
+[

   yyparser.yysymprint_ (yytype, yyvaluep]b4_location_if([, yylocationp])[);
 }
 ]])
   yyparser.yysymprint_ (yytype, yyvaluep]b4_location_if([, yylocationp])[);
 }
 ]])


@@ -70,6 +72,8 @@ m4_prepend([b4_epilogue],
     b4_parse_param,
     [[const char* msg], [msg]])[
 {
     b4_parse_param,
     [[const char* msg], [msg]])[
 {

+]b4_parse_param_use[]dnl
+[

   yyparser.error (*yylocationp, msg);
 }
 
   yyparser.error (*yylocationp, msg);
 }
 


@@ -106,11 +110,11 @@ m4_popdef([b4_parse_param])dnl
                            const semantic_type* yyvaluep, const location_type* yylocationp)
   {
     /* Pacify ``unused variable'' warnings.  */
                            const semantic_type* yyvaluep, const location_type* yylocationp)
   {
     /* Pacify ``unused variable'' warnings.  */

-    (void) yyvaluep;
-    (void) yylocationp;
+    YYUSE (yyvaluep);
+    YYUSE (yylocationp);

     /* Backward compatibility, but should be removed eventually. */
     std::ostream& cdebug_ = *yycdebug_;
     /* Backward compatibility, but should be removed eventually. */
     std::ostream& cdebug_ = *yycdebug_;

-    (void) cdebug_;
+    YYUSE (cdebug_);

 
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")
               << ' ' << yytname[yytype] << " ("
 
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")
               << ' ' << yytname[yytype] << " ("


@@ -163,6 +167,15 @@ m4_include(b4_pkgdatadir/[glr.c])
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])[
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
              [2002, 2003, 2004, 2005])[

+
+/* As a special exception, when this parser skeleton is copied by
+   Bison into a Bison output file, you may use that output file
+   without restriction.  This special exception was added by the Free
+   Software Foundation for C++ GLR parsers in version 2.2 of
+   Bison.  */
+
+/* C++ GLR parser skeleton written by Akim Demaille.  */
+

 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 
 #ifndef PARSER_HEADER_H
 # define PARSER_HEADER_H
 


@@ -230,7 +243,7 @@ b4_syncline([@oline@], [@ofile@])[
        {                                                               \
          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
        }                                                               \
        {                                                               \
          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
        }                                                               \

-    while (/*CONSTCOND*/ 0)
+    while (0)

 #endif
 
 namespace yy
 #endif
 
 namespace yy