Version 2.4.1a.

[bison.git] / build-aux / cross-options.pl

diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 31733e72d3fdb6ff471d41144546d7f3eab86ea1..58772775372fd17dcb8e2c0b3d41aa4b2d9517e8 100755 (executable)
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -7,22 +7,33 @@ use strict;
 my %option;
 while (<>)
 {
 my %option;
 while (<>)
 {

-    if (/^\s*          # Initial spaces.
-        (?:(-\w),\s+)? # $1: Possible short option.
-        (--[-\w]+)     # $2: Long option.
-        (\[?)          # $3: '[' iff the argument is optional.
-        (?:=([-\w]+))? # $4: Possible argument name.
+    if (/^\s*             # Initial spaces.
+        (?:(-\w),\s+)?    # $1: $short: Possible short option.
+        (--[-\w]+)        # $2: $long:  Long option.
+        (\[?)             # $3: $opt:   '[' iff the argument is optional.
+        (?:=(\S+))?       # $4: $arg:   Possible argument name.
+        \s                # Spaces.

         /x)
     {
        my ($short, $long, $opt, $arg) = ($1, $2, $3, $4);
        $short = defined $short ? '@option{' . $short . '}' : '';
        if ($arg)
        {
         /x)
     {
        my ($short, $long, $opt, $arg) = ($1, $2, $3, $4);
        $short = defined $short ? '@option{' . $short . '}' : '';
        if ($arg)
        {

+            # if $opt, $arg contains the closing ].
+            substr ($arg, -1) = ''
+                if $opt eq '[';

            $arg =~ s/^=//;
            $arg =~ s/^=//;

-           $arg = '@var{' . lc ($arg) . '}';
-           $arg = '[' . $arg . ']'
-               if $opt eq '[';
-           $option{"$long=$arg"} = $short ? "$short $arg" : '';
+            $arg = lc ($arg);
+            # If the argument is compite (e.g., for --define[=NAME[=VALUE]]),
+            # put each word in @var, to build @var{name}[=@var{value}], not
+            # @var{name[=value]}].
+           $arg =~ s/(\w+)/\@var{$1}/g;
+           my $long_arg = "=$arg";
+           if ($opt eq '[') {
+             $long_arg = "[$long_arg]";
+             $arg = "[$arg]";
+           }
+           $option{"$long$long_arg"} = $short ? "$short $arg" : '';

        }
        else
        {
        }
        else
        {


@@ -33,5 +44,8 @@ while (<>)
 
 foreach my $long (sort keys %option)
 {
 
 foreach my $long (sort keys %option)
 {

-    printf "\@item %-40s \@tab %s\n", '@option{' . $long . '}', $option{$long};
+    # Avoid trailing spaces.
+    printf ("\@item %-40s \@tab%s\n",
+            '@option{' . $long . '}',
+            $option{$long} ? " $option{$long}" : "");

 }
 }