mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 04:13:03 +00:00
style: rename spec_defines_file as spec_header_file
The variable spec_defines_file denotes the name of the generated header. Its name is derived from --defines/%defines, whose name in turn is derived from the fact that the header, in Yacc, contained the Not only does the header now contain a lot more than just the token definitions, but we no longer even generate macros, but an enum... Let's modernize our vocabulary. * src/files.h, src/files.c (spec_defines_file): Rename as... (spec_header_file): this.
This commit is contained in:
@@ -284,14 +284,14 @@ m4_define([b4_declare_yyparse],
|
||||
# Declaration that might either go into the header (if --defines)
|
||||
# or open coded in the parser body.
|
||||
m4_define([b4_shared_declarations],
|
||||
[b4_cpp_guard_open([b4_spec_defines_file])[
|
||||
[b4_cpp_guard_open([b4_spec_header_file])[
|
||||
]b4_declare_yydebug[
|
||||
]b4_percent_code_get([[requires]])[
|
||||
]b4_token_enums_defines[
|
||||
]b4_declare_yylstype[
|
||||
]b4_declare_yyparse[
|
||||
]b4_percent_code_get([[provides]])[
|
||||
]b4_cpp_guard_close([b4_spec_defines_file])[]dnl
|
||||
]b4_cpp_guard_close([b4_spec_header_file])[]dnl
|
||||
])
|
||||
|
||||
|
||||
@@ -300,15 +300,15 @@ m4_define([b4_shared_declarations],
|
||||
# Run IF-TRUE if we generate an output file and api.header.include
|
||||
# is defined.
|
||||
m4_define([b4_header_include_if],
|
||||
[m4_ifval(m4_quote(b4_spec_defines_file),
|
||||
[m4_ifval(m4_quote(b4_spec_header_file),
|
||||
[b4_percent_define_ifdef([[api.header.include]],
|
||||
[$1],
|
||||
[$2])],
|
||||
[$2])])
|
||||
|
||||
m4_if(b4_spec_defines_file, [[y.tab.h]],
|
||||
m4_if(b4_spec_header_file, [[y.tab.h]],
|
||||
[b4_percent_define_default([[api.header.include]],
|
||||
[["@basename(]b4_spec_defines_file[@)"]])])
|
||||
[["@basename(]b4_spec_header_file[@)"]])])
|
||||
|
||||
|
||||
|
||||
@@ -319,7 +319,7 @@ m4_if(b4_spec_defines_file, [[y.tab.h]],
|
||||
|
||||
|
||||
b4_defines_if([[
|
||||
]b4_output_begin([b4_spec_defines_file])[
|
||||
]b4_output_begin([b4_spec_header_file])[
|
||||
]b4_copyright([Bison interface for Yacc-like parsers in C])[
|
||||
]b4_disclaimer[
|
||||
]b4_shared_declarations[
|
||||
|
||||
Reference in New Issue
Block a user