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

c skeletons: factor the declaration of yylloc and yylval.

Browse Source 
There is one difference: now, even without --defines, we generate
extern declarations for these variables.  The factoring is worth it.
* data/c.m4 (b4_declare_yylstype): Declare them.
* data/glr.c, data/yacc.c: Adjust.
This commit is contained in:
Akim Demaille
2012-06-17 12:10:44 +02:00
parent 18ad57b384
commit 756257ee86
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/c.m4
View File

@@ -537,8 +537,8 @@ b4_locations_if([, yylocationp])[]b4_user_args[);
# b4_declare_yylstype # b4_declare_yylstype
# ------------------ # ------------------
# Declaration that might either go into the header (if --defines) # Declarations that might either go into the header (if --defines) or
# or open coded in the parser body. Declare YYSTYPE and YYLTYPE. # in the parser body. Declare YYSTYPE/YYLTYPE, and yylval/yylloc.
m4_define([b4_declare_yylstype], m4_define([b4_declare_yylstype],
[[#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED [[#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
]m4_ifdef([b4_stype], ]m4_ifdef([b4_stype],
@@ -566,6 +566,9 @@ typedef struct YYLTYPE
# define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_DECLARED 1
# define YYLTYPE_IS_TRIVIAL 1 # define YYLTYPE_IS_TRIVIAL 1
#endif]]) #endif]])
b4_pure_if([], [[extern YYSTYPE ]b4_prefix[lval;
]b4_locations_if([[extern YYLTYPE ]b4_prefix[lloc;]])])[]dnl
]) ])
# b4_declare_yydebug # b4_declare_yydebug

2
data/glr.c
View File

@@ -2635,8 +2635,6 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C],
]b4_cpp_guard_open([b4_spec_defines_file])[ ]b4_cpp_guard_open([b4_spec_defines_file])[
]b4_shared_declarations[ ]b4_shared_declarations[
]b4_pure_if([], [[extern YYSTYPE ]b4_prefix[lval;
]b4_locations_if([[extern YYLTYPE ]b4_prefix[lloc;]])])[
]b4_cpp_guard_close([b4_spec_defines_file])[ ]b4_cpp_guard_close([b4_spec_defines_file])[
]])]) ]])])
m4_divert_pop(0) m4_divert_pop(0)

2
data/yacc.c
View File

@@ -2067,8 +2067,6 @@ b4_copyright([Bison interface for Yacc-like parsers in C],
]b4_cpp_guard_open([b4_spec_defines_file])[ ]b4_cpp_guard_open([b4_spec_defines_file])[
]b4_shared_declarations[ ]b4_shared_declarations[
]b4_pure_if([], [[extern YYSTYPE ]b4_prefix[lval;
]b4_locations_if([[extern YYLTYPE ]b4_prefix[lloc;]])])[
]b4_cpp_guard_close([b4_spec_defines_file])[ ]b4_cpp_guard_close([b4_spec_defines_file])[
]])dnl b4_defines_if ]])dnl b4_defines_if
m4_divert_pop(0) m4_divert_pop(0)