mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-20 17:53:02 +00:00
Fix a bad interaction with flex 2.5.23 reported by Bruce Lilly in
<http://mail.gnu.org/pipermail/bug-bison/2002-November/001929.html>. (YYLTYPE, struct yyltype): Do not define unless locations are requested. (union yyalloc): Do not depend on YYLTYPE_IS_TRIVIAL unless locations are requested.
This commit is contained in:
@@ -197,7 +197,7 @@ b4_syncline([@oline@], [@ofile@])],
|
|||||||
# define YYSTYPE_IS_TRIVIAL 1
|
# define YYSTYPE_IS_TRIVIAL 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef YYLTYPE
|
]b4_location_if([#ifndef YYLTYPE
|
||||||
typedef struct yyltype
|
typedef struct yyltype
|
||||||
{
|
{
|
||||||
int first_line;
|
int first_line;
|
||||||
@@ -208,6 +208,7 @@ typedef struct yyltype
|
|||||||
# define YYLTYPE ]b4_location_type[
|
# define YYLTYPE ]b4_location_type[
|
||||||
# define YYLTYPE_IS_TRIVIAL 1
|
# define YYLTYPE_IS_TRIVIAL 1
|
||||||
#endif
|
#endif
|
||||||
|
])[
|
||||||
|
|
||||||
/* Copy the second part of user declarations. */
|
/* Copy the second part of user declarations. */
|
||||||
]b4_post_prologue
|
]b4_post_prologue
|
||||||
@@ -249,7 +250,7 @@ b4_syncline([@oline@], [@ofile@])[
|
|||||||
|
|
||||||
#if (! defined (yyoverflow) \
|
#if (! defined (yyoverflow) \
|
||||||
&& (! defined (__cplusplus) \
|
&& (! defined (__cplusplus) \
|
||||||
|| (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
|
|| (]b4_location_if([YYLTYPE_IS_TRIVIAL && ])[YYSTYPE_IS_TRIVIAL)))
|
||||||
|
|
||||||
/* A type that is properly aligned for any stack member. */
|
/* A type that is properly aligned for any stack member. */
|
||||||
union yyalloc
|
union yyalloc
|
||||||
|
|||||||
Reference in New Issue
Block a user