X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5a35a6cb7199aa58dc0b0cc6386872f5da18e1fe..dc2825ae898c526ea3619450112b2ea44f437151:/src/bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index bc656245..e2b5d6fb 100644
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -1,9 +1,7 @@
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line
-/* This file comes from bison-@bison_version@.  */
-
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 1990, 2000 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
@@ -80,10 +78,6 @@
 # define YYSTACK_ALLOC malloc
 #endif
 
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		-2
@@ -96,7 +90,7 @@
    Once GCC version 2 has supplanted version 1, this can go.  */
 #define YYFAIL		goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
@@ -116,12 +110,25 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-# define YYLEX		yylex ()
+
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).
+
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Last)		\
+   Current.last_line   = Last.last_line;	\
+   Current.last_column = Last.last_column;
 #endif
 
-#ifdef YYPURE
-# ifdef YYLSP_NEEDED
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#if YYPURE
+# if YYLSP_NEEDED
 #  ifdef YYLEX_PARAM
 #   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
 #  else
@@ -134,25 +141,10 @@ while (0)
 #   define YYLEX		yylex (&yylval)
 #  endif
 # endif /* !YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here. */
+#else /* !YYPURE */
+# define YYLEX			yylex ()
+#endif /* !YYPURE */
 
-#ifndef YYPURE
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-# ifdef YYLSP_NEEDED
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
-# endif
-
-/* Number of parse errors so far.  */
-int yynerrs;
-#endif  /* !YYPURE */
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -259,10 +251,46 @@ int yyparse (void);
 # endif
 #endif
 
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define _YY_DECL_VARIABLES				\
+/* The lookahead symbol.  */				\
+int yychar;						\
+							\
+/* The semantic value of the lookahead symbol. */	\
+YYSTYPE yylval;						\
+							\
+/* Number of parse errors so far.  */			\
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+_YY_DECL_VARIABLES				\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES			\
+_YY_DECL_VARIABLES
+#endif
+
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
   /* Number of tokens to shift before error messages enabled.  */
@@ -288,14 +316,14 @@ yyparse (YYPARSE_PARAM_ARG)
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
 #endif
 
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
 # define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
 # define YYPOPSTACK   (yyvsp--, yyssp--)
@@ -304,20 +332,11 @@ yyparse (YYPARSE_PARAM_ARG)
   int yystacksize = YYINITDEPTH;
   int yyfree_stacks = 0;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-# ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-# endif
-#endif
-
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
-# ifdef YYLSP_NEEDED
+# if YYLSP_NEEDED
   YYLTYPE yyloc;
 # endif
 
@@ -339,7 +358,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss - 1;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp = yyls;
 #endif
 
@@ -360,7 +379,7 @@ yynewstate:
 	 */
       YYSTYPE *yyvs1 = yyvs;
       short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
       YYLTYPE *yyls1 = yyls;
 #endif
 
@@ -368,9 +387,9 @@ yynewstate:
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-# ifdef YYLSP_NEEDED
+      /* Each stack pointer address is followed by the size of the
+	 data in use in that stack, in bytes.  */
+# if 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",
@@ -386,7 +405,7 @@ yynewstate:
 # endif
 
       yyss = yyss1; yyvs = yyvs1;
-# ifdef YYLSP_NEEDED
+# if YYLSP_NEEDED
       yyls = yyls1;
 # endif
 #else /* no yyoverflow */
@@ -398,7 +417,7 @@ yynewstate:
 	    {
 	      free (yyss);
 	      free (yyvs);
-# ifdef YYLSP_NEEDED
+# if YYLSP_NEEDED
 	      free (yyls);
 # endif
 	    }
@@ -416,7 +435,7 @@ yynewstate:
       yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
       __yy_memcpy ((char *)yyvs, (char *)yyvs1,
 		   size * (unsigned int) sizeof (*yyvsp));
-# ifdef YYLSP_NEEDED
+# if YYLSP_NEEDED
       yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
       __yy_memcpy ((char *)yyls, (char *)yyls1,
 		   size * (unsigned int) sizeof (*yylsp));
@@ -425,7 +444,7 @@ yynewstate:
 
       yyssp = yyss + size - 1;
       yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
       yylsp = yyls + size - 1;
 #endif
 
@@ -529,7 +548,7 @@ yybackup:
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
@@ -558,26 +577,22 @@ yydefault:
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  /* Implement default value of the action:
-     `{dollar}{dollar} = {dollar}1'. */
-  if (yylen > 0)
-      yyval = yyvsp[1-yylen];
-#ifdef YYLSP_NEEDED
-  /* Implement default location.  If the rhs is empty, extend YYLOC to
-     YYLLOC, which corresponds to the current token, otherwise
-     implement `@{dollar} = Starts at @1, ends at @YYLEN'.  */
-  if (yylen > 0)
-    {
-      yyloc = yylsp[1-yylen];
-      yyloc.last_line = yylsp[0].last_line;
-      yyloc.last_column = yylsp[0].last_column;
-    }
-  else
-    {
-      yyloc.last_line = yylsp[0].last_line;
-      yyloc.last_column = yylsp[0].last_column;
-      yyloc.text = 0;
-    }
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, yylsp[0]);
 #endif
 
 #if YYDEBUG
@@ -596,12 +611,12 @@ yyreduce:
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
-$ /* The action file replaces this line marked with this dollarsign. */
+%% actions /* The action file replaces this line. */
 #line
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp -= yylen;
 #endif
 
@@ -617,7 +632,7 @@ $ /* The action file replaces this line marked with this dollarsign. */
 #endif
 
   *++yyvsp = yyval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yyloc;
 #endif
 
@@ -657,7 +672,7 @@ yyerrlab:
 	  count = 0;
 	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
 	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof (yytname) / sizeof (char *)); x++)
+	       x < (int) (sizeof (yytname) / sizeof (char *)); x++)
 	    if (yycheck[x + yyn] == x)
 	      size += strlen (yytname[x]) + 15, count++;
 	  size += strlen ("parse error, unexpected `") + 1;
@@ -673,7 +688,7 @@ yyerrlab:
 		{
 		  count = 0;
 		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof (yytname) / sizeof (char *)); x++)
+		       x < (int) (sizeof (yytname) / sizeof (char *)); x++)
 		    if (yycheck[x + yyn] == x)
 		      {
 			strcat (msg, count == 0 ? ", expecting `" : " or `");
@@ -745,7 +760,7 @@ yyerrpop:
     YYABORT;
   yyvsp--;
   yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp--;
 #endif
 
@@ -789,7 +804,7 @@ yyerrhandle:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
@@ -805,7 +820,7 @@ yyacceptlab:
     {
       free (yyss);
       free (yyvs);
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
       free (yyls);
 #endif
     }
@@ -820,7 +835,7 @@ yyabortlab:
     {
       free (yyss);
       free (yyvs);
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
       free (yyls);
 #endif
     }