summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny@ces.clemson.edu>2009-05-22 17:14:08 -0400
committerJoel E. Denny <jdenny@ces.clemson.edu>2009-05-22 23:37:35 -0400
commit34d419381579dd30642e5646aaeaece36207be94 (patch)
tree90721572a823a9a60ec86a33886b0f82728d0799 /build-aux
parent246c4efafed178058a22b96d7a046340f6119057 (diff)
downloadbison-34d419381579dd30642e5646aaeaece36207be94.tar.gz
-F/--force-define and relative %define/-D/--define priorities.
* 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 invocation. * 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. * 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.
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/cross-options.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 241c741b..7762e276 100755
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -22,7 +22,11 @@ while (<STDIN>)
$short = '' if ! defined $short;
$short = '-d' if $long eq '--defines' && ! $short;
my $dir = '%' . substr($long, 2);
- $dir = '' if index ($scanner, "\"$dir\"") < 0;
+ if (index ($scanner, "\"$dir\"") < 0)
+ {
+ if ($long eq '--force-define') { $dir = '%define'; }
+ else { $dir = ''; }
+ }
if ($arg)
{
# if $opt, $arg contains the closing ].