Comment change.

[bison.git] / bison.simple

diff --git a/bison.simple b/bison.simple
index c6d8b4dd08745e7427bb470aed5a2959646b3e7a..0fb74ce714ca9d8bfc43769acf87ea09d07c5567 100644 (file)
--- a/bison.simple
+++ b/bison.simple
@@ -2,11 +2,11 @@
 #line 3 "bison.simple"
 
 /* Skeleton output parser for bison,
 #line 3 "bison.simple"
 
 /* Skeleton output parser for bison,

-   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,6 +18,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 

+/* As a special exception, when this file 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
+   in version 1.24 of Bison.  */

 
 #ifndef alloca
 #ifdef __GNUC__
 
 #ifndef alloca
 #ifdef __GNUC__


@@ -91,10 +95,18 @@ while (0)
 
 #ifdef YYPURE
 #ifdef YYLSP_NEEDED
 
 #ifdef YYPURE
 #ifdef YYLSP_NEEDED

+#ifdef YYLEX_PARAM
+#define YYLEX          yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else

 #define YYLEX          yylex(&yylval, &yylloc)
 #define YYLEX          yylex(&yylval, &yylloc)

+#endif
+#else /* not YYLSP_NEEDED */
+#ifdef YYLEX_PARAM
+#define YYLEX          yylex(&yylval, YYLEX_PARAM)

 #else
 #define YYLEX          yylex(&yylval)
 #endif
 #else
 #define YYLEX          yylex(&yylval)
 #endif

+#endif /* not YYLSP_NEEDED */

 #endif
 
 /* If nonreentrant, generate the variables here */
 #endif
 
 /* If nonreentrant, generate the variables here */


@@ -142,14 +154,14 @@ int yyparse (void);
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #endif
 \f
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */

-#define __yy_bcopy(FROM,TO,COUNT)      __builtin_memcpy(TO,FROM,COUNT)
+#define __yy_memcpy(FROM,TO,COUNT)     __builtin_memcpy(TO,FROM,COUNT)

 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 #else                          /* not GNU C or C++ */
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_bcopy (from, to, count)
+__yy_memcpy (from, to, count)

      char *from;
      char *to;
      int count;
      char *from;
      char *to;
      int count;


@@ -167,7 +179,7 @@ __yy_bcopy (from, to, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void

-__yy_bcopy (char *from, char *to, int count)
+__yy_memcpy (char *from, char *to, int count)

 {
   register char *f = from;
   register char *t = to;
 {
   register char *f = from;
   register char *t = to;


@@ -180,16 +192,31 @@ __yy_bcopy (char *from, char *to, int count)
 #endif
 #endif
 \f
 #endif
 #endif
 \f

-#line 184 "bison.simple"
+#line 192 "bison.simple"
+
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
+
+#ifdef YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#else
+#define YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#endif
+

 int
 int

-yyparse()
+yyparse(YYPARSE_PARAM)
+     YYPARSE_PARAM_DECL

 {
   register int yystate;
   register int yyn;
   register short *yyssp;
   register YYSTYPE *yyvsp;
   int yyerrstatus;     /*  number of tokens to shift before error messages enabled */
 {
   register int yystate;
   register int yyn;
   register short *yyssp;
   register YYSTYPE *yyvsp;
   int yyerrstatus;     /*  number of tokens to shift before error messages enabled */

-  int yychar1;         /*  lookahead token as an internal (translated) token number */
+  int yychar1 = 0;             /*  lookahead token as an internal (translated) token number */

 
   short        yyssa[YYINITDEPTH];     /*  the state stack                     */
   YYSTYPE yyvsa[YYINITDEPTH];  /*  the semantic value stack            */
 
   short        yyssa[YYINITDEPTH];     /*  the state stack                     */
   YYSTYPE yyvsa[YYINITDEPTH];  /*  the semantic value stack            */


@@ -268,13 +295,20 @@ yynewstate:
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
         the data in use in that stack, in bytes.  */
 #ifdef yyoverflow
       /* Each stack pointer address is followed by the size of
         the data in use in that stack, in bytes.  */

+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+        but that might be undefined if yyoverflow is a macro.  */

       yyoverflow("parser stack overflow",
                 &yyss1, size * sizeof (*yyssp),
                 &yyvs1, size * sizeof (*yyvsp),
       yyoverflow("parser stack overflow",
                 &yyss1, size * sizeof (*yyssp),
                 &yyvs1, size * sizeof (*yyvsp),

-#ifdef YYLSP_NEEDED

                 &yyls1, size * sizeof (*yylsp),
                 &yyls1, size * sizeof (*yylsp),

-#endif

                 &yystacksize);
                 &yystacksize);

+#else
+      yyoverflow("parser stack overflow",
+                &yyss1, size * sizeof (*yyssp),
+                &yyvs1, size * sizeof (*yyvsp),
+                &yystacksize);
+#endif

 
       yyss = yyss1; yyvs = yyvs1;
 #ifdef YYLSP_NEEDED
 
       yyss = yyss1; yyvs = yyvs1;
 #ifdef YYLSP_NEEDED


@@ -291,12 +325,12 @@ yynewstate:
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));

-      __yy_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));

       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));

-      __yy_bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));

 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
 #ifdef YYLSP_NEEDED
       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));

-      __yy_bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));

 #endif
 #endif /* no yyoverflow */
 
 #endif
 #endif /* no yyoverflow */
 


@@ -435,7 +469,8 @@ yydefault:
 /* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
   yylen = yyr2[yyn];
 /* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
   yylen = yyr2[yyn];

-  yyval = yyvsp[1-yylen]; /* implement default value of the action */
+  if (yylen > 0)
+    yyval = yyvsp[1-yylen]; /* implement default value of the action */

 
 #if YYDEBUG != 0
   if (yydebug)
 
 #if YYDEBUG != 0
   if (yydebug)


@@ -453,7 +488,7 @@ yyreduce:
 #endif
 
 $   /* the action file gets copied in in place of this dollarsign */
 #endif
 
 $   /* the action file gets copied in in place of this dollarsign */

-#line 457 "bison.simple"
+#line 487 "bison.simple"

 \f
   yyvsp -= yylen;
   yyssp -= yylen;
 \f
   yyvsp -= yylen;
   yyssp -= yylen;