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

-F/--force-define and relative %define/-D/--define priorities.

Browse Source 
* NEWS (2.5): Add documentation to -D/--define entry.
* build-aux/cross-options.pl: Hard-code association of
--force-define with %define.
* doc/bison.texinfo (Decl Summary): In %define entry,
cross-reference command-line options.
(Bison Options): Add documentation to -D/--define entry.
(Option Cross Key): Widen column for --force-define row.
* src/getargs.c (usage): Document -F/--force-define.  Realign
options in output.
(short_options, long_options, getargs): Parse -F/--force-define,
and update muscle_percent_define_insert invocations.
* src/muscle-tab.h (muscle_percent_define_how): New enum type.
(muscle_percent_define_insert): Add argument with that type.
* src/muscle-tab.c (muscle_percent_define_insert): Implement
-F/--force-define behavior and priorities.
(muscle_percent_define_ensure): Update
muscle_percent_define_insert invocation.
* src/parse-gram.y (prologue_declaration): Update
muscle_percent_define_insert invocations.
* tests/input.at (`%define, --define'): Rename to...
(`%define, --define, --force-define'): ... this and extend.
(cherry picked from commit 34d4193815)

Conflicts:

	src/getargs.c
	src/parse-gram.c
	src/parse-gram.h
	src/parse-gram.y
This commit is contained in:
Joel E. Denny
2009-05-22 17:14:08 -04:00
parent f8e7258f7f
commit de5ab9400a
11 changed files with 356 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/input.at
View File

@@ -913,27 +913,49 @@ input.y:5.9-16: warning: %define variable `special2' is not used
AT_CLEANUP
## ------------------- ##
## %define, --define. ##
## ------------------- ##
## ----------------------------------- ##
## %define, --define, --force-define. ##
## ----------------------------------- ##
AT_SETUP([%define, --define])
AT_SETUP([%define, --define, --force-define])
AT_DATA([skel.c],
[[m4@&t@_divert_push(0)@
@output(b4_parser_file_name@)@
[var-dd: ]b4_percent_define_get([[var-dd]])[
var-ff: ]b4_percent_define_get([[var-ff]])[
var-dg: ]b4_percent_define_get([[var-dg]])[
var-dfg: ]b4_percent_define_get([[var-dfg]])[
var-fd: ]b4_percent_define_get([[var-fd]])
m4@&t@_divert_pop(0)
]])
AT_DATA([input.y],
[[%define var "value1"
[[%define var-dg "gram"
%define var-dfg "gram"
%%
start: ;
]])
AT_BISON_CHECK([[-DFOO -DFOO -Dvar=value input.y]], [0], [],
[[<command line>:3: warning: %define variable `FOO' redefined
<command line>:2: warning: previous definition
input.y:1.9-11: warning: %define variable `var' redefined
<command line>:4: warning: previous definition
<command line>:2: warning: %define variable `FOO' is not used
<command line>:3: warning: %define variable `FOO' is not used
<command line>:4: warning: %define variable `var' is not used
input.y:1.9-11: warning: %define variable `var' is not used
AT_BISON_CHECK([[-Dvar-dd=cmd-d1 -Dvar-dd=cmd-d2 \
-Fvar-ff=cmd-f1 -Fvar-ff=cmd-f2 \
-Dvar-dg=cmd-d \
-Dvar-dfg=cmd-d -Fvar-dfg=cmd-f \
-Fvar-fd=cmd-f -Dvar-fd=cmd-d \
-Dunused-d -Funused-f \
--skeleton ./skel.c input.y]], [0], [],
[[input.y:1.9-14: warning: %define variable `var-dg' redefined
<command line>:6: warning: previous definition
<command line>:11: warning: %define variable `unused-d' is not used
<command line>:12: warning: %define variable `unused-f' is not used
]])
AT_CHECK([[cat input.tab.c]], [[0]],
[[var-dd: cmd-d2
var-ff: cmd-f2
var-dg: gram
var-dfg: cmd-f
var-fd: cmd-d
]])
AT_CLEANUP