* src/bison.s1 (YYLLOC_DEFAULT): New macro.

[bison.git] / src / bison.simple

diff --git a/src/bison.simple b/src/bison.simple
index ee7e88caf1a6f8dc95883b050dd184f0abd6300c..b830d95ff58ffc20d443ca69d8b7a677d40a43c1 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -3,7 +3,7 @@
 /* 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
@@ -117,7 +117,21 @@ while (0)
 #define YYERRCODE      256
 
 
-/* YYLEX -- calling `yylex' with the right arguments. */
+/* 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
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
 
 #if YYPURE
 # if YYLSP_NEEDED
@@ -138,25 +152,6 @@ while (0)
 #endif /* !YYPURE */
 
 
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
-
-# if 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
 # define YYDPRINTF(Args)                       \
@@ -262,10 +257,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.  */
@@ -307,15 +338,6 @@ yyparse (YYPARSE_PARAM_ARG)
   int yystacksize = YYINITDEPTH;
   int yyfree_stacks = 0;
 
-#if YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-# if YYLSP_NEEDED
-  YYLTYPE yylloc;
-# endif
-#endif /* !YYPURE */
-
 
   /* The variables used to return semantic value and location from the
      action routines.  */
@@ -571,22 +593,12 @@ yyreduce:
      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
-  /* 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;
-    }
+  /* 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