Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2002-12-08 Paul Eggert <eggert@twinsun.com>
* 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>.
2002-12-06 Paul Eggert <eggert@twinsun.com>
Add support for rules that do not have trailing semicolons, as

8
data/glr.c
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

8
data/lalr1.cc
View File

@@ -111,7 +111,7 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
/* Copy the first part of user declarations. */
]b4_pre_prologue[
]/* Line __line__ of __file__. */
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
/* Enabling traces. */
@@ -128,7 +128,7 @@ b4_syncline([@oline@], [@ofile@])[
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype;
/* Line __line__ of __file__. */
/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])[
# define YYSTYPE yystype
@@ -137,7 +137,7 @@ b4_syncline([@oline@], [@ofile@])],
/* Copy the second part of user declarations. */
]b4_post_prologue[
]/* Line __line__ of __file__. */
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
#ifndef YYLLOC_DEFAULT
# define YYLLOC_DEFAULT(Current, Rhs, N) \
@@ -445,7 +445,7 @@ yy::]b4_parser_class_name[::parse ()
]b4_actions[
}
]/* Line __line__ of __file__. */
]/* Line __line__ of lalr1.cc. */
b4_syncline([@oline@], [@ofile@])[
state_stack_.pop (len_);

8
data/yacc.c
View File

@@ -190,7 +190,7 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[
]m4_ifdef([b4_stype],
[b4_syncline([b4_stype_line], [b4_filename])
typedef union b4_stype yystype;
/* Line __line__ of __file__. */
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])[
# define YYSTYPE yystype
@@ -212,7 +212,7 @@ typedef struct yyltype
/* Copy the second part of user declarations. */
]b4_post_prologue
/* Line __line__ of __file__. */
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])[
#if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -988,7 +988,7 @@ yyreduce:
b4_actions
}
/* Line __line__ of __file__. */
/* Line __line__ of yacc.c. */
b4_syncline([@oline@], [@ofile@])
[ yyvsp -= yylen;
@@ -1197,7 +1197,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 yacc.c. */
b4_syncline([@oline@], [@ofile@])],
[typedef int yystype;])
# define YYSTYPE yystype