* tests/Makefile.am (package.m4): Move to...

($(srcdir)/$(TESTSUITE)): here.

diff --git a/ChangeLog b/ChangeLog
index 0ddd9b4139861e18b9493887e1e9e2b151977411..35b0d8befa416521a87518a6cdb1374673c5404e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-21  Akim Demaille  <akim@epita.fr>
+
+       * tests/Makefile.am (package.m4): Move to...
+       ($(srcdir)/$(TESTSUITE)): here.
+

 2001-09-20  Akim Demaille  <akim@epita.fr>
 
        * src/complain.c: No longer try to be standalone: use system.h.
 2001-09-20  Akim Demaille  <akim@epita.fr>
 
        * src/complain.c: No longer try to be standalone: use system.h.

diff --git a/doc/bison.info b/doc/bison.info
index 017768da9586bbee212e9466c2f959ce4b38f12e..204b69cc92c3f796f0d9e20f9403f562852ce6a7 100644 (file)
--- a/doc/bison.info
+++ b/doc/bison.info
@@ -31,115 +31,115 @@ instead of in the original English.
 \1f
 Indirect:
 bison.info-1: 1313
 \1f
 Indirect:
 bison.info-1: 1313

-bison.info-2: 50688
-bison.info-3: 100578
-bison.info-4: 150128
-bison.info-5: 197515
+bison.info-2: 50691
+bison.info-3: 100581
+bison.info-4: 150131
+bison.info-5: 197908

 \1f
 Tag Table:
 (Indirect)
 Node: Top\7f1313
 \1f
 Tag Table:
 (Indirect)
 Node: Top\7f1313

-Node: Introduction\7f8966
-Node: Conditions\7f10241
-Node: Copying\7f11705
-Node: Concepts\7f30908
-Node: Language and Grammar\7f31987
-Node: Grammar in Bison\7f37003
-Node: Semantic Values\7f38927
-Node: Semantic Actions\7f41028
-Node: Locations Overview\7f42217
-Node: Bison Parser\7f43664
-Node: Stages\7f45976
-Node: Grammar Layout\7f47259
-Node: Examples\7f48516
-Node: RPN Calc\7f49714
-Node: Rpcalc Decls\7f50688
-Node: Rpcalc Rules\7f52275
-Node: Rpcalc Input\7f54075
-Node: Rpcalc Line\7f55536
-Node: Rpcalc Expr\7f56651
-Node: Rpcalc Lexer\7f58596
-Node: Rpcalc Main\7f61168
-Node: Rpcalc Error\7f61566
-Node: Rpcalc Gen\7f62574
-Node: Rpcalc Compile\7f63723
-Node: Infix Calc\7f64598
-Node: Simple Error Recovery\7f67305
-Node: Location Tracking Calc\7f69194
-Node: Ltcalc Decls\7f69924
-Node: Ltcalc Rules\7f70833
-Node: Ltcalc Lexer\7f72894
-Node: Multi-function Calc\7f75232
-Node: Mfcalc Decl\7f76799
-Node: Mfcalc Rules\7f78822
-Node: Mfcalc Symtab\7f80202
-Node: Exercises\7f86575
-Node: Grammar File\7f87081
-Node: Grammar Outline\7f87929
-Node: C Declarations\7f88663
-Node: Bison Declarations\7f89243
-Node: Grammar Rules\7f89655
-Node: C Code\7f90115
-Node: Symbols\7f91045
-Node: Rules\7f96126
-Node: Recursion\7f97765
-Node: Semantics\7f99484
-Node: Value Type\7f100578
-Node: Multiple Types\7f101250
-Node: Actions\7f102267
-Node: Action Types\7f105052
-Node: Mid-Rule Actions\7f106355
-Node: Locations\7f111925
-Node: Location Type\7f112573
-Node: Actions and Locations\7f113131
-Node: Location Default Action\7f115287
-Node: Declarations\7f116750
-Node: Token Decl\7f118069
-Node: Precedence Decl\7f120082
-Node: Union Decl\7f121633
-Node: Type Decl\7f122477
-Node: Expect Decl\7f123383
-Node: Start Decl\7f124929
-Node: Pure Decl\7f125307
-Node: Decl Summary\7f126984
-Node: Multiple Parsers\7f132367
-Node: Interface\7f133861
-Node: Parser Function\7f134733
-Node: Lexical\7f135568
-Node: Calling Convention\7f136974
-Node: Token Values\7f139745
-Node: Token Positions\7f140894
-Node: Pure Calling\7f141779
-Node: Error Reporting\7f144711
-Node: Action Features\7f146833
-Node: Algorithm\7f150128
-Node: Look-Ahead\7f152421
-Node: Shift/Reduce\7f154553
-Node: Precedence\7f157465
-Node: Why Precedence\7f158116
-Node: Using Precedence\7f159981
-Node: Precedence Examples\7f160949
-Node: How Precedence\7f161650
-Node: Contextual Precedence\7f162799
-Node: Parser States\7f164590
-Node: Reduce/Reduce\7f165833
-Node: Mystery Conflicts\7f169394
-Node: Stack Overflow\7f172780
-Node: Error Recovery\7f174153
-Node: Context Dependency\7f179289
-Node: Semantic Tokens\7f180137
-Node: Lexical Tie-ins\7f183154
-Node: Tie-in Recovery\7f184702
-Node: Debugging\7f186874
-Node: Invocation\7f190175
-Node: Bison Options\7f191427
-Node: Environment Variables\7f195039
-Node: Option Cross Key\7f195887
-Node: VMS Invocation\7f196731
-Node: Table of Symbols\7f197515
-Node: Glossary\7f205154
-Node: Copying This Manual\7f211458
-Node: GNU Free Documentation License\7f211667
-Node: Index\7f231532
+Node: Introduction\7f8969
+Node: Conditions\7f10244
+Node: Copying\7f11708
+Node: Concepts\7f30911
+Node: Language and Grammar\7f31990
+Node: Grammar in Bison\7f37006
+Node: Semantic Values\7f38930
+Node: Semantic Actions\7f41031
+Node: Locations Overview\7f42220
+Node: Bison Parser\7f43667
+Node: Stages\7f45979
+Node: Grammar Layout\7f47262
+Node: Examples\7f48519
+Node: RPN Calc\7f49717
+Node: Rpcalc Decls\7f50691
+Node: Rpcalc Rules\7f52278
+Node: Rpcalc Input\7f54078
+Node: Rpcalc Line\7f55539
+Node: Rpcalc Expr\7f56654
+Node: Rpcalc Lexer\7f58599
+Node: Rpcalc Main\7f61171
+Node: Rpcalc Error\7f61569
+Node: Rpcalc Gen\7f62577
+Node: Rpcalc Compile\7f63726
+Node: Infix Calc\7f64601
+Node: Simple Error Recovery\7f67308
+Node: Location Tracking Calc\7f69197
+Node: Ltcalc Decls\7f69927
+Node: Ltcalc Rules\7f70836
+Node: Ltcalc Lexer\7f72897
+Node: Multi-function Calc\7f75235
+Node: Mfcalc Decl\7f76802
+Node: Mfcalc Rules\7f78825
+Node: Mfcalc Symtab\7f80205
+Node: Exercises\7f86578
+Node: Grammar File\7f87084
+Node: Grammar Outline\7f87932
+Node: C Declarations\7f88666
+Node: Bison Declarations\7f89246
+Node: Grammar Rules\7f89658
+Node: C Code\7f90118
+Node: Symbols\7f91048
+Node: Rules\7f96129
+Node: Recursion\7f97768
+Node: Semantics\7f99487
+Node: Value Type\7f100581
+Node: Multiple Types\7f101253
+Node: Actions\7f102270
+Node: Action Types\7f105055
+Node: Mid-Rule Actions\7f106358
+Node: Locations\7f111928
+Node: Location Type\7f112576
+Node: Actions and Locations\7f113134
+Node: Location Default Action\7f115290
+Node: Declarations\7f116753
+Node: Token Decl\7f118072
+Node: Precedence Decl\7f120085
+Node: Union Decl\7f121636
+Node: Type Decl\7f122480
+Node: Expect Decl\7f123386
+Node: Start Decl\7f124932
+Node: Pure Decl\7f125310
+Node: Decl Summary\7f126987
+Node: Multiple Parsers\7f132370
+Node: Interface\7f133864
+Node: Parser Function\7f134736
+Node: Lexical\7f135571
+Node: Calling Convention\7f136977
+Node: Token Values\7f139748
+Node: Token Positions\7f140897
+Node: Pure Calling\7f141782
+Node: Error Reporting\7f144714
+Node: Action Features\7f146836
+Node: Algorithm\7f150131
+Node: Look-Ahead\7f152424
+Node: Shift/Reduce\7f154556
+Node: Precedence\7f157468
+Node: Why Precedence\7f158119
+Node: Using Precedence\7f159984
+Node: Precedence Examples\7f160952
+Node: How Precedence\7f161653
+Node: Contextual Precedence\7f162802
+Node: Parser States\7f164593
+Node: Reduce/Reduce\7f165836
+Node: Mystery Conflicts\7f169397
+Node: Stack Overflow\7f172783
+Node: Error Recovery\7f174156
+Node: Context Dependency\7f179292
+Node: Semantic Tokens\7f180140
+Node: Lexical Tie-ins\7f183157
+Node: Tie-in Recovery\7f184705
+Node: Debugging\7f186877
+Node: Invocation\7f190178
+Node: Bison Options\7f191430
+Node: Environment Variables\7f195398
+Node: Option Cross Key\7f196246
+Node: VMS Invocation\7f197124
+Node: Table of Symbols\7f197908
+Node: Glossary\7f205547
+Node: Copying This Manual\7f211851
+Node: GNU Free Documentation License\7f212060
+Node: Index\7f231925

 \1f
 End Tag Table
 \1f
 End Tag Table

diff --git a/doc/bison.info-1 b/doc/bison.info-1
index 95c98692ac0921a5e8ab7238e2fc7284891984c0..5132c10ea3c08eb7af276435c485b4f071e91377 100644 (file)
--- a/doc/bison.info-1
+++ b/doc/bison.info-1
@@ -34,7 +34,8 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
 Bison
 *****
 

-   This manual documents version 1.29a of Bison, updated 29 August 2001.
+   This manual documents version 1.29a of Bison, updated 20 September
+2001.

 
 * Menu:
 
 
 * Menu:
 

diff --git a/doc/bison.info-4 b/doc/bison.info-4
index 6bd65ae9bf17c2a4c62d400359c2a1ef9912a525..02f50d93d4d8b1df44a1d1128a2c07661310e9f7 100644 (file)
--- a/doc/bison.info-4
+++ b/doc/bison.info-4
@@ -1152,12 +1152,16 @@ Tuning the parser:
 Adjust the output:
 
 `-d'
 Adjust the output:
 
 `-d'

-`--defines'

      Pretend that `%verbose' was specified, i.e., write an extra output
      file containing macro definitions for the token type names defined
      in the grammar and the semantic value type `YYSTYPE', as well as a
      few `extern' variable declarations.  *Note Decl Summary::.
 
      Pretend that `%verbose' was specified, i.e., write an extra output
      file containing macro definitions for the token type names defined
      in the grammar and the semantic value type `YYSTYPE', as well as a
      few `extern' variable declarations.  *Note Decl Summary::.
 

+`--defines=DEFINES-FILE'
+     The behaviour of -DEFINES is the same than `-d'. The only
+     difference is that it has an optionnal argument which is the name
+     of the output filename.
+

 `-b FILE-PREFIX'
 `--file-prefix=PREFIX'
      Specify a prefix to use for all Bison output file names.  The
 `-b FILE-PREFIX'
 `--file-prefix=PREFIX'
      Specify a prefix to use for all Bison output file names.  The


@@ -1177,11 +1181,15 @@ Adjust the output:
      described under the `-v' and `-d' options.
 
 `-g'
      described under the `-v' and `-d' options.
 
 `-g'

-`--graph'

      Output a VCG definition of the LALR(1) grammar automaton computed
      by Bison. If the grammar file is `foo.y', the VCG output file will
      be `foo.vcg'.
 
      Output a VCG definition of the LALR(1) grammar automaton computed
      by Bison. If the grammar file is `foo.y', the VCG output file will
      be `foo.vcg'.
 

+`--graph=GRAPH-FILE'
+     The behaviour of -GRAPH is the same than `-g'. The only difference
+     is that it has an optionnal argument which is the name of the
+     output graph filename.
+

 \1f
 File: bison.info,  Node: Environment Variables,  Next: Option Cross Key,  Prev: Bison Options,  Up: Invocation
 
 \1f
 File: bison.info,  Node: Environment Variables,  Next: Option Cross Key,  Prev: Bison Options,  Up: Invocation
 


@@ -1214,9 +1222,10 @@ Option Cross Key
 find the corresponding short option.
 
      --debug                               -t
 find the corresponding short option.
 
      --debug                               -t

-     --defines                             -d
+     --defines=DEFINES-FILE          -d

      --file-prefix=PREFIX                  -b FILE-PREFIX
      --fixed-output-files --yacc           -y
      --file-prefix=PREFIX                  -b FILE-PREFIX
      --fixed-output-files --yacc           -y

+     --graph=GRAPH-FILE              -d

      --help                                -h
      --name-prefix=PREFIX                  -p NAME-PREFIX
      --no-lines                            -l
      --help                                -h
      --name-prefix=PREFIX                  -p NAME-PREFIX
      --no-lines                            -l

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 0eb1053e515dd6af43467c31206c6c9676e1b462..68b4c8b6ee512919cc7de878a36092f3f8e826fc 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED 20 September 2001
+@set UPDATED-MONTH September 2001

 @set EDITION 1.29a
 @set VERSION 1.29a
 @set EDITION 1.29a
 @set VERSION 1.29a

diff --git a/doc/version.texi b/doc/version.texi
index 0eb1053e515dd6af43467c31206c6c9676e1b462..68b4c8b6ee512919cc7de878a36092f3f8e826fc 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED 20 September 2001
+@set UPDATED-MONTH September 2001

 @set EDITION 1.29a
 @set VERSION 1.29a
 @set EDITION 1.29a
 @set VERSION 1.29a

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f0c28c190df0c41e44b8e0e4d174d6f2471d4cf..1264068f568432ced92aba158f1ecc050701ecee 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,14 @@ TESTSUITE = $(srcdir)/testsuite
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)

+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } >package.m4

        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
        mv $@.tmp $@
 
        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
        mv $@.tmp $@
 


@@ -49,17 +57,3 @@ check-local: atconfig atlocal $(TESTSUITE)
 # Run the test suite on the *installed* tree.
 installcheck-local:
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 # Run the test suite on the *installed* tree.
 installcheck-local:
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin

-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-package.m4: $(top_srcdir)/configure.in
-       {                                       \
-         echo '# Signature of the current package.'; \
-         echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-         echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-         echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-         echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-         echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-       } >package.m4

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 93fc80032e5e49422f034e700256c4cf650bb9e7..3ad11476de97cd39f9f713ce70fc42f792d69abb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -229,6 +229,14 @@ uninstall-am: uninstall-info-am
        uninstall uninstall-am uninstall-info-am
 
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)
        uninstall uninstall-am uninstall-info-am
 
 $(srcdir)/$(TESTSUITE): package.m4 $(TESTSUITE_AT)

+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } >package.m4

        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
        mv $@.tmp $@
 
        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
        mv $@.tmp $@
 


@@ -247,16 +255,6 @@ check-local: atconfig atlocal $(TESTSUITE)
 # Run the test suite on the *installed* tree.
 installcheck-local:
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 # Run the test suite on the *installed* tree.
 installcheck-local:
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin

-
-package.m4: $(top_srcdir)/configure.in
-       {                                       \
-         echo '# Signature of the current package.'; \
-         echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-         echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-         echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-         echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-         echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-       } >package.m4

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: