--report-file=FILE

[Joel E. Denny]

I committed this.

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1756
diff -p -u -r1.1756 ChangeLog
--- ChangeLog   14 Nov 2007 13:18:44 -0000      1.1756
+++ ChangeLog   18 Nov 2007 06:35:22 -0000
@@ -1,3 +1,19 @@
+2007-11-18  Joel E. Denny  <address@hidden>
+
+       Accept --report-file=FILE to override the default `.output' filename.
+       * NEWS (2.3a+): Mention.
+       * doc/bison.texinfo (Bison Options): Add an entry.
+       * src/files.c (compute_output_file_names): Don't override
+       spec_verbose_file if already set.
+       * src/getargs.c (usage): Document --report-file.
+       (REPORT_FILE_OPTION): New anonymous enum member.
+       (long_options): Add entry for it.
+       (getargs): Add case for it setting spec_verbose_file.
+
+       * build-aux/cross-options.pl: Don't record a short option just because
+       there's an arg.
+       * doc/.cvsignore: Add yacc.1.
+
 2007-11-14  Akim Demaille  <address@hidden>
 
        * doc/yacc.1.in: New.
Index: NEWS
===================================================================
RCS file: /sources/bison/bison/NEWS,v
retrieving revision 1.181
diff -p -u -r1.181 NEWS
--- NEWS        10 Nov 2007 03:42:35 -0000      1.181
+++ NEWS        18 Nov 2007 06:35:22 -0000
@@ -78,6 +78,8 @@ Changes in version 2.3a+ (????-??-??):
   bug affected only the `.output' file and not the generated parser source
   code.
 
+* --report-file=FILE is a new flag to override the default `.output' file name.
+
 * The `=' that used to be required in the following directives is now
   deprecated:
 
Index: build-aux/cross-options.pl
===================================================================
RCS file: /sources/bison/bison/build-aux/cross-options.pl,v
retrieving revision 1.1
diff -p -u -r1.1 cross-options.pl
--- build-aux/cross-options.pl  4 Nov 2007 21:15:10 -0000       1.1
+++ build-aux/cross-options.pl  18 Nov 2007 06:35:22 -0000
@@ -17,7 +17,7 @@ while (<>)
            $arg = '@var{' . lc ($arg) . '}';
            $arg = '[' . $arg . ']'
                if defined $opt;
-           $option{"$long=$arg"} = "$short $arg";
+           $option{"$long=$arg"} = $short ? "$short $arg" : '';
        }
        else
        {
Index: doc/.cvsignore
===================================================================
RCS file: /sources/bison/bison/doc/.cvsignore,v
retrieving revision 1.10
diff -p -u -r1.10 .cvsignore
--- doc/.cvsignore      10 Nov 2007 01:36:54 -0000      1.10
+++ doc/.cvsignore      18 Nov 2007 06:35:22 -0000
@@ -13,11 +13,12 @@ bison.ps
 bison.toc
 bison.tp
 bison.vr
+cross-options.texi
+Makefile.in
 refcard.dvi
 refcard.log
 refcard.ps
-Makefile.in
 *.info*
 stamp-vti
 version.texi
-cross-options.texi
+yacc.1
Index: doc/bison.texinfo
===================================================================
RCS file: /sources/bison/bison/doc/bison.texinfo,v
retrieving revision 1.245
diff -p -u -r1.245 bison.texinfo
--- doc/bison.texinfo   10 Nov 2007 03:42:36 -0000      1.245
+++ doc/bison.texinfo   18 Nov 2007 06:35:26 -0000
@@ -7827,6 +7827,9 @@ Implies @code{state} and augments the de
 the full set of items for each state, instead of its core only.
 @end table
 
address@hidden address@hidden
+Specify the @var{file} for the verbose description.
+
 @item -v
 @itemx --verbose
 Pretend that @code{%verbose} was specified, i.e., write an extra output
Index: src/files.c
===================================================================
RCS file: /sources/bison/bison/src/files.c,v
retrieving revision 1.106
diff -p -u -r1.106 files.c
--- src/files.c 21 Sep 2007 22:53:57 -0000      1.106
+++ src/files.c 18 Nov 2007 06:35:26 -0000
@@ -338,7 +338,8 @@ compute_output_file_names (void)
 
   if (report_flag)
     {
-      spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
+      if (!spec_verbose_file)
+        spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
       output_file_name_check (spec_verbose_file);
     }
 
Index: src/getargs.c
===================================================================
RCS file: /sources/bison/bison/src/getargs.c,v
retrieving revision 1.102
diff -p -u -r1.102 getargs.c
--- src/getargs.c       14 Nov 2007 13:18:44 -0000      1.102
+++ src/getargs.c       18 Nov 2007 06:35:29 -0000
@@ -282,6 +282,7 @@ Parser:\n\
 Output:\n\
   -d, --defines[=FILE]       also produce a header file\n\
   -r, --report=THINGS        also produce details on the automaton\n\
+      --report-file=FILE     write report to FILE\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
@@ -408,7 +409,8 @@ enum
 {
   LOCATIONS_OPTION = CHAR_MAX + 1,
   PRINT_LOCALEDIR_OPTION,
-  PRINT_DATADIR_OPTION
+  PRINT_DATADIR_OPTION,
+  REPORT_FILE_OPTION
 };
 
 static struct option const long_options[] =
@@ -431,6 +433,7 @@ static struct option const long_options[
   { "graph",      optional_argument,   0,   'g' },
   { "xml",         optional_argument,   0,   'x' },
   { "report",     required_argument,   0,   'r' },
+  { "report-file", required_argument,   0,   REPORT_FILE_OPTION },
   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */
@@ -536,6 +539,10 @@ getargs (int argc, char *argv[])
        FLAGS_ARGMATCH (report, optarg);
        break;
 
+      case REPORT_FILE_OPTION:
+       spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
+       break;
+
       case 'T':
        FLAGS_ARGMATCH (trace, optarg);
        break;