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

* src/bison.simple: Define type yystype instead of YYSTYPE, and

Browse Source 
define CPP macro, which substitute YYSTYPE by yystype.
* src/reader.c (parse_union_decl): Output yystype/YYSTYPE as we do
with yyltype/YYLTYPE.  This allows inclusion of the generated
header within the parser if the compiler, such as GGC, accepts
multiple equivalent #defines.
From Akim.
This commit is contained in:
Akim Demaille
2001-11-12 09:24:14 +00:00
parent e3f1699f55
commit 5f7e08323a
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2001-11-12 Pascal Bart <pascal.bart@epita.fr>
* src/bison.simple: Define type yystype instead of YYSTYPE, and
define CPP macro, which substitute YYSTYPE by yystype.
* src/reader.c (parse_union_decl): Output yystype/YYSTYPE as we do
with yyltype/YYLTYPE. This allows inclusion of the generated
header within the parser if the compiler, such as GGC, accepts
multiple equivalent #defines.
From Akim.
2001-11-05 Akim Demaille <akim@epita.fr>
* src/reader.c (symbols_output): New, extracted from...

3
src/bison.simple
View File

@@ -117,7 +117,8 @@
#line %%input_line "%%filename"
#ifndef YYSTYPE
typedef %%stype YYSTYPE;
typedef %%stype yystype;
# define YYSTYPE yystype
#endif
#ifndef YYLTYPE

13
src/reader.c
View File

@@ -741,6 +741,13 @@ parse_union_decl (void)
int c;
int count = 0;
struct obstack union_obstack;
const char *prologue = "\
#ifndef YYSTYPE\n\
typedef union";
const char *epilogue = "\
yystype;\n\
# define YYSTYPE yystype\n\
#endif\n";
if (typed)
complain (_("multiple %s declarations"), "%union");
@@ -749,13 +756,15 @@ parse_union_decl (void)
/* FIXME: I'm worried: are you sure attrs_obstack is properly
filled? */
/* I don't see any reasons to keep this line, because we should
create a special skeleton for this option. */
if (no_lines_flag)
obstack_1grow (&attrs_obstack, '\n');
obstack_init (&union_obstack);
obstack_sgrow (&union_obstack, "union");
if (defines_flag)
obstack_sgrow (&defines_obstack, "typedef union");
obstack_sgrow (&defines_obstack, prologue);
c = getc (finput);
@@ -790,7 +799,7 @@ parse_union_decl (void)
if (count <= 0)
{
if (defines_flag)
obstack_sgrow (&defines_obstack, " YYSTYPE;\n");
obstack_sgrow (&defines_obstack, epilogue);
/* JF don't choke on trailing semi */
c = skip_white_space ();
if (c != ';')