Use #define to handle the %name-prefix.

[bison.git] / data / yacc.c

diff --git a/data/yacc.c b/data/yacc.c
index 2e9c9fd0b0d04859b5fa1f8fad95e97b3b19fb82..7331b65c3e3296183af281715173b338cb91abb3 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -153,8 +153,7 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
 
 ]b4_identification
 m4_if(b4_prefix[], [yy], [],
-[/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+[/* Substitute the variable and function names.  */
 #define yyparse b4_prefix[]parse
 #define yylex   b4_prefix[]lex
 #define yyerror b4_prefix[]error
@@ -510,22 +509,25 @@ while (0)
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                    \
-do {                                                                        \
-  if (N)                                                                    \
-    {                                                                       \
-      (Current).first_line   = (Rhs)[1].first_line;                         \
-      (Current).first_column = (Rhs)[1].first_column;                       \
-      (Current).last_line    = (Rhs)[N].last_line;                          \
-      (Current).last_column  = (Rhs)[N].last_column;                        \
-    }                                                                       \
-  else                                                                      \
-    {                                                                       \
-      (Current).first_line   = (Current).last_line   = (Rhs)[0].last_line;   \
-      (Current).first_column = (Current).last_column = (Rhs)[0].last_column; \
-    }                                                                       \
-} while(0)
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (N)                                                           \
+       {                                                               \
+         (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;         \
+         (Current).first_column = YYRHSLOC(Rhs, 1).first_column;       \
+         (Current).last_line    = YYRHSLOC(Rhs, N).last_line;          \
+         (Current).last_column  = YYRHSLOC(Rhs, N).last_column;        \
+       }                                                               \
+      else                                                             \
+       {                                                               \
+         (Current).first_line   = (Current).last_line   =              \
+           YYRHSLOC(Rhs, 0).last_line;                                 \
+         (Current).first_column = (Current).last_column =              \
+           YYRHSLOC(Rhs, 0).last_column;                               \
+       }                                                               \
+    while (0)
 #endif