* data/glr.c, data/lalr1.cc, data/yacc.c: Do not use __file__,

since this causes problems when __file__ contains character
sequences like "@" that are treated specially by src/scan-skel.l.
Instead, just use the file's basename.  This fixes the bug
reported by Martin Mokrejs in
<http://mail.gnu.org/pipermail/bug-bison/2002-December/001949.html>.
This commit is contained in:
Paul Eggert
2002-12-09 04:48:38 +00:00
parent e19c4e5d1c
commit 996b1c7e8c
4 changed files with 21 additions and 12 deletions

View File

@@ -187,7 +187,7 @@ b4_pre_prologue[
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype;
/* Line __line__ of __file__. */
/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])[
# define YYSTYPE yystype
@@ -217,7 +217,7 @@ static YYLTYPE yyloc_default;
/* Copy the second part of user declarations. */
]b4_post_prologue[
]/* Line __line__ of __file__. */
]/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])
[
#if ! defined (__cplusplus)
@@ -671,7 +671,7 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
# undef YYBACKUP
# undef yyclearin
# undef YYRECOVERING
/* Line __line__ of __file__. */
/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])
}
@@ -1959,7 +1959,7 @@ b4_token_defines(b4_tokens)
m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype;
/* Line __line__ of __file__. */
/* Line __line__ of glr.c. */
b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])
# define YYSTYPE yystype