Version 1.29.

* m4/atconfig.m4: Remove.
* tests/testsuite.at, tests/atlocal.in, tests/output.at,
* tests/bison: New.
* tests/regression.at, tests/calc.at: Use m4_define, AT_BANNER,
m4_if, m4_patsubst, and m4_regexp.
* tests/calc.at (_AT_CHECK_CALC, _AT_CHECK_CALC_ERROR): Use an
`input' file instead of echo.

ChangeLog

@@ -1,3 +1,22 @@
+2001-09-07  Akim Demaille  <[email protected]>
+
+	Version 1.29.
+
+2001-08-30  Akim Demaille  <[email protected]>
+
+	* tests/atgeneral.m4, tests/atconfig.in, tests/suite.at: Remove.
+	* m4/atconfig.m4: Remove.
+	* tests/testsuite.at, tests/atlocal.in, tests/output.at,
+	* tests/bison: New.
+	* tests/regression.at, tests/calc.at: Use m4_define, AT_BANNER,
+	m4_if, m4_patsubst, and m4_regexp.
+	* tests/calc.at (_AT_CHECK_CALC, _AT_CHECK_CALC_ERROR): Use an
+	`input' file instead of echo.
+
+2001-08-29  Akim Demaille  <[email protected]>
+
+	Bump to 1.28e.
+
 2001-08-29  Akim Demaille  <[email protected]>
 
 	Version 1.28d.

Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -137,9 +133,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS \
+	INSTALL Makefile.am Makefile.in NEWS THANKS aclocal.m4 \
-	aclocal.m4 config.hin configure configure.in missing \
+	config.hin configure configure.in
-	mkinstalldirs
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -158,7 +153,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/atconfig.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
@@ -297,7 +292,7 @@ distdir: $(DISTFILES)
 	fi
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/intl $(distdir)/po $(distdir)/tests
+	$(mkinstalldirs) $(distdir)/intl $(distdir)/po
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

NEWS

@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-Changes in version 1.28d:
+Changes in version 1.29:
 
 * Output file does not redefine const; that is now config.h's job.
 

aclocal.m4

@@ -558,26 +558,6 @@ AC_DEFUN([_AM_DIRNAME],
 	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME
 
-
-# serial 2
-
-# Single argument says where are built sources to test, relative to the
-# built test directory.  Maybe omitted if the same (flat distribution).
-
-AC_DEFUN([AT_CONFIG],
-[AT_TESTPATH=ifelse([$1], [], [.], [$1])
-AC_SUBST([AT_TESTPATH])
-# Try to be compatible with both Autoconf 2.13 and 2.50.
-if test -z "$ECHO_C$ECHO_N$ECHO_T"; then
-  ECHO_C="$ac_c"
-  ECHO_N="$ac_n"
-  ECHO_T="$ac_t"
-  AC_SUBST([ECHO_C])
-  AC_SUBST([ECHO_N])
-  AC_SUBST([ECHO_T])
-fi
-])
-
 #serial 1
 # This test replaces the one in autoconf.
 # Currently this macro should have the same name as the autoconf macro

config.hin

@@ -1,4 +1,4 @@
-/* config.hin.  Generated automatically from configure.in by autoheader.  */
+/* config.hin.  Generated from configure.in by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.

config/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

config/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-23'
+timestamp='2001-09-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -393,6 +393,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -414,7 +415,6 @@ EOF
 	  exit (-1);
 	}
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm -f $dummy.c $dummy && exit 0
@@ -484,6 +484,7 @@ EOF
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -495,7 +496,6 @@ EOF
 			exit(0);
 			}
 EOF
-		eval $set_cc_for_build
 		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
@@ -563,6 +563,7 @@ EOF
                   fi ;;
               esac
               if [ "${HP_ARCH}" = "" ]; then
+	      eval $set_cc_for_build
               sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -596,10 +597,9 @@ EOF
                   exit (0);
               }
 EOF
-	eval $set_cc_for_build
+	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	    rm -f $dummy.c $dummy
-	rm -f $dummy.c $dummy
 	fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -609,6 +609,7 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -634,7 +635,6 @@ EOF
 	  exit (0);
 	}
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
@@ -851,6 +851,7 @@ EOF
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -875,7 +876,6 @@ EOF
   return 0;
 }
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
@@ -1122,6 +1122,7 @@ esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1236,7 +1237,6 @@ main ()
 }
 EOF
 
-eval $set_cc_for_build
 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 

config/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-23'
+timestamp='2001-09-04'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -236,7 +236,8 @@ case $basic_machine in
 	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
 	| openrisc \

config/prev-version.txt

@@ -1 +1 @@
-1.28c
+1.28d

configure.in

@@ -1,12 +1,31 @@
-# Process this file with autoconf to produce a configure script.
+# Configure template for GNU Bison.                   -*-Autoconf-*-
-AC_PREREQ(2.52)
+#
-AC_INIT(bison, 1.28d, [email protected])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307  USA
+
+# We need a recent Autoconf to run a recent Autotest.
+AC_PREREQ(2.52c)
+
+AC_INIT([GNU Bison], [1.29], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(bison, 1.28d)
+
+AM_INIT_AUTOMAKE([bison], [1.29])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
-AT_CONFIG(../src)
+AC_CONFIG_TESTDIR(tests)
 
 # Checks for programs.
 AC_PROG_CC
@@ -83,4 +102,4 @@ AC_OUTPUT([Makefile
            intl/Makefile po/Makefile.in
            lib/Makefile src/Makefile doc/Makefile
            m4/Makefile
-           tests/Makefile tests/atconfig])
+           tests/Makefile])

doc/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

doc/bison.info

@@ -31,115 +31,115 @@ instead of in the original English.
 
 Indirect:
 bison.info-1: 1313
-bison.info-2: 50688
+bison.info-2: 50686
-bison.info-3: 100578
+bison.info-3: 100576
-bison.info-4: 150128
+bison.info-4: 150126
-bison.info-5: 197515
+bison.info-5: 197513
 
 Tag Table:
 (Indirect)
 Node: Top1313
-Node: Introduction8966
+Node: Introduction8965
-Node: Conditions10241
+Node: Conditions10239
-Node: Copying11705
+Node: Copying11703
-Node: Concepts30908
+Node: Concepts30906
-Node: Language and Grammar31987
+Node: Language and Grammar31985
-Node: Grammar in Bison37003
+Node: Grammar in Bison37001
-Node: Semantic Values38927
+Node: Semantic Values38925
-Node: Semantic Actions41028
+Node: Semantic Actions41026
-Node: Locations Overview42217
+Node: Locations Overview42215
-Node: Bison Parser43664
+Node: Bison Parser43662
-Node: Stages45976
+Node: Stages45974
-Node: Grammar Layout47259
+Node: Grammar Layout47257
-Node: Examples48516
+Node: Examples48514
-Node: RPN Calc49714
+Node: RPN Calc49712
-Node: Rpcalc Decls50688
+Node: Rpcalc Decls50686
-Node: Rpcalc Rules52275
+Node: Rpcalc Rules52273
-Node: Rpcalc Input54075
+Node: Rpcalc Input54073
-Node: Rpcalc Line55536
+Node: Rpcalc Line55534
-Node: Rpcalc Expr56651
+Node: Rpcalc Expr56649
-Node: Rpcalc Lexer58596
+Node: Rpcalc Lexer58594
-Node: Rpcalc Main61168
+Node: Rpcalc Main61166
-Node: Rpcalc Error61566
+Node: Rpcalc Error61564
-Node: Rpcalc Gen62574
+Node: Rpcalc Gen62572
-Node: Rpcalc Compile63723
+Node: Rpcalc Compile63721
-Node: Infix Calc64598
+Node: Infix Calc64596
-Node: Simple Error Recovery67305
+Node: Simple Error Recovery67303
-Node: Location Tracking Calc69194
+Node: Location Tracking Calc69192
-Node: Ltcalc Decls69924
+Node: Ltcalc Decls69922
-Node: Ltcalc Rules70833
+Node: Ltcalc Rules70831
-Node: Ltcalc Lexer72894
+Node: Ltcalc Lexer72892
-Node: Multi-function Calc75232
+Node: Multi-function Calc75230
-Node: Mfcalc Decl76799
+Node: Mfcalc Decl76797
-Node: Mfcalc Rules78822
+Node: Mfcalc Rules78820
-Node: Mfcalc Symtab80202
+Node: Mfcalc Symtab80200
-Node: Exercises86575
+Node: Exercises86573
-Node: Grammar File87081
+Node: Grammar File87079
-Node: Grammar Outline87929
+Node: Grammar Outline87927
-Node: C Declarations88663
+Node: C Declarations88661
-Node: Bison Declarations89243
+Node: Bison Declarations89241
-Node: Grammar Rules89655
+Node: Grammar Rules89653
-Node: C Code90115
+Node: C Code90113
-Node: Symbols91045
+Node: Symbols91043
-Node: Rules96126
+Node: Rules96124
-Node: Recursion97765
+Node: Recursion97763
-Node: Semantics99484
+Node: Semantics99482
-Node: Value Type100578
+Node: Value Type100576
-Node: Multiple Types101250
+Node: Multiple Types101248
-Node: Actions102267
+Node: Actions102265
-Node: Action Types105052
+Node: Action Types105050
-Node: Mid-Rule Actions106355
+Node: Mid-Rule Actions106353
-Node: Locations111925
+Node: Locations111923
-Node: Location Type112573
+Node: Location Type112571
-Node: Actions and Locations113131
+Node: Actions and Locations113129
-Node: Location Default Action115287
+Node: Location Default Action115285
-Node: Declarations116750
+Node: Declarations116748
-Node: Token Decl118069
+Node: Token Decl118067
-Node: Precedence Decl120082
+Node: Precedence Decl120080
-Node: Union Decl121633
+Node: Union Decl121631
-Node: Type Decl122477
+Node: Type Decl122475
-Node: Expect Decl123383
+Node: Expect Decl123381
-Node: Start Decl124929
+Node: Start Decl124927
-Node: Pure Decl125307
+Node: Pure Decl125305
-Node: Decl Summary126984
+Node: Decl Summary126982
-Node: Multiple Parsers132367
+Node: Multiple Parsers132365
-Node: Interface133861
+Node: Interface133859
-Node: Parser Function134733
+Node: Parser Function134731
-Node: Lexical135568
+Node: Lexical135566
-Node: Calling Convention136974
+Node: Calling Convention136972
-Node: Token Values139745
+Node: Token Values139743
-Node: Token Positions140894
+Node: Token Positions140892
-Node: Pure Calling141779
+Node: Pure Calling141777
-Node: Error Reporting144711
+Node: Error Reporting144709
-Node: Action Features146833
+Node: Action Features146831
-Node: Algorithm150128
+Node: Algorithm150126
-Node: Look-Ahead152421
+Node: Look-Ahead152419
-Node: Shift/Reduce154553
+Node: Shift/Reduce154551
-Node: Precedence157465
+Node: Precedence157463
-Node: Why Precedence158116
+Node: Why Precedence158114
-Node: Using Precedence159981
+Node: Using Precedence159979
-Node: Precedence Examples160949
+Node: Precedence Examples160947
-Node: How Precedence161650
+Node: How Precedence161648
-Node: Contextual Precedence162799
+Node: Contextual Precedence162797
-Node: Parser States164590
+Node: Parser States164588
-Node: Reduce/Reduce165833
+Node: Reduce/Reduce165831
-Node: Mystery Conflicts169394
+Node: Mystery Conflicts169392
-Node: Stack Overflow172780
+Node: Stack Overflow172778
-Node: Error Recovery174153
+Node: Error Recovery174151
-Node: Context Dependency179289
+Node: Context Dependency179287
-Node: Semantic Tokens180137
+Node: Semantic Tokens180135
-Node: Lexical Tie-ins183154
+Node: Lexical Tie-ins183152
-Node: Tie-in Recovery184702
+Node: Tie-in Recovery184700
-Node: Debugging186874
+Node: Debugging186872
-Node: Invocation190175
+Node: Invocation190173
-Node: Bison Options191427
+Node: Bison Options191425
-Node: Environment Variables195039
+Node: Environment Variables195037
-Node: Option Cross Key195887
+Node: Option Cross Key195885
-Node: VMS Invocation196731
+Node: VMS Invocation196729
-Node: Table of Symbols197515
+Node: Table of Symbols197513
-Node: Glossary205154
+Node: Glossary205152
-Node: Copying This Manual211458
+Node: Copying This Manual211456
-Node: GNU Free Documentation License211667
+Node: GNU Free Documentation License211665
-Node: Index231532
+Node: Index231530
 
 End Tag Table

doc/bison.info-1

@@ -34,7 +34,7 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-   This manual documents version 1.28d of Bison, updated 29 August 2001.
+   This manual documents version 1.29 of Bison, updated 29 August 2001.
 
 * Menu:
 
@@ -237,7 +237,7 @@ Bison in detail.
 it Yacc-compatible.  Wilfred Hansen of Carnegie Mellon University added
 multi-character string literals and other features.
 
-   This edition corresponds to version 1.28d of Bison.
+   This edition corresponds to version 1.29 of Bison.
 
 
 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top

doc/stamp-vti

@@ -1,4 +1,4 @@
 @set UPDATED 29 August 2001
 @set UPDATED-MONTH August 2001
-@set EDITION 1.28d
+@set EDITION 1.29
-@set VERSION 1.28d
+@set VERSION 1.29

doc/version.texi

@@ -1,4 +1,4 @@
 @set UPDATED 29 August 2001
 @set UPDATED-MONTH August 2001
-@set EDITION 1.28d
+@set EDITION 1.29
-@set VERSION 1.28d
+@set VERSION 1.29

lib/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

m4/Makefile.am

@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST = 					\
-atconfig.m4					\
 c-bs-a.m4					\
 codeset.m4					\
 error.m4					\

m4/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -101,7 +97,6 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 
 EXTRA_DIST = \
-atconfig.m4					\
 c-bs-a.m4					\
 codeset.m4					\
 error.m4					\

m4/atconfig.m4

@@ -1,22 +0,0 @@
-## ----------------------##
-## Prepare for testing.  ##
-## ----------------------##
-
-# serial 2
-
-# Single argument says where are built sources to test, relative to the
-# built test directory.  Maybe omitted if the same (flat distribution).
-
-AC_DEFUN([AT_CONFIG],
-[AT_TESTPATH=ifelse([$1], [], [.], [$1])
-AC_SUBST([AT_TESTPATH])
-# Try to be compatible with both Autoconf 2.13 and 2.50.
-if test -z "$ECHO_C$ECHO_N$ECHO_T"; then
-  ECHO_C="$ac_c"
-  ECHO_N="$ac_n"
-  ECHO_T="$ac_t"
-  AC_SUBST([ECHO_C])
-  AC_SUBST([ECHO_N])
-  AC_SUBST([ECHO_T])
-fi
-])

po/et.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28c\n"
+"Project-Id-Version: bison 1.28d\n"
 "POT-Creation-Date: 2001-08-29 14:32+0200\n"
-"PO-Revision-Date: 2001-08-21 21:53+02:00\n"
+"PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -189,7 +189,6 @@ msgstr ""
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
 #: src/getargs.c:116
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -204,6 +203,7 @@ msgstr ""
 "  -v, --verbose              väljasta automaadi kohta selgitusi\n"
 "  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
+"  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
 
 #: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
@@ -798,36 +798,3 @@ msgstr "`"
 #: lib/quotearg.c:260
 msgid "'"
 msgstr "'"
-
-#~ msgid "vcg graph: no such color."
-#~ msgstr "vcg graph: sellist värvi pole."
-
-#~ msgid "vcg graph: no such text mode"
-#~ msgstr "vcg graph: sellist teksti moodi pole"
-
-#~ msgid "vcg graph: no such shape"
-#~ msgstr "vcg graph: sellist vormi pole"
-
-#~ msgid "vcg graph: no such decision"
-#~ msgstr "vcg graph: sellist otsust pole"
-
-#~ msgid "vcg graph: no such an orientation"
-#~ msgstr "vcg graph: sellist orientatsiooni pole"
-
-#~ msgid "vcg graph: no such an alignement"
-#~ msgstr "vcg graph: sellist joondamist pole"
-
-#~ msgid "vcg graph: no such an arrow mode"
-#~ msgstr "vcg graph: sellist noole moodi pole"
-
-#~ msgid "vcg graph: no such crossing_type"
-#~ msgstr "vcg graph: sellist ristumise tüüpi pole"
-
-#~ msgid "vcg graph: no such view"
-#~ msgstr "vcg graph: sellist vaadet pole"
-
-#~ msgid "vcg graph: no such linestyle"
-#~ msgstr "vcg graph: sellist joone stiili pole"
-
-#~ msgid "vcg graph: no such an arrowstyle"
-#~ msgstr "vcg graph: sellist noole stiili pole"

po/fr.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU bison 1.28c\n"
+"Project-Id-Version: GNU bison 1.28d\n"
 "POT-Creation-Date: 2001-08-29 14:32+0200\n"
-"PO-Revision-Date: 2001-08-28 08:00-0500\n"
+"PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -194,7 +194,6 @@ msgstr ""
 "  -k, --token-table          inclure la table des noms de jetons\n"
 
 #: src/getargs.c:116
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -209,6 +208,8 @@ msgstr ""
 "  -v, --verbose              produire une explication de l'automate\n"
 "  -b, --file-prefix=PREFIXE  utiliser le PREFIXE pour le fichier de sortie\n"
 "  -o, --output-file=FICHIER  produire la sortie dans le FICHIER\n"
+"  -g, --graph                produire aussi la description du graphe VCG de "
+"l'automate\n"
 
 #: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
@@ -574,7 +575,7 @@ msgstr "deux @prec de suite"
 #: src/reader.c:1519
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%guard est présent mais %%semantic_parser n'est pas spécifié"
+msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
 #: src/reader.c:1528
 msgid "two actions at end of one rule"

po/ru.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28a\n"
+"Project-Id-Version: bison 1.28d\n"
 "POT-Creation-Date: 2001-08-29 14:32+0200\n"
-"PO-Revision-Date: 2000-04-12 13:16+04:00\n"
+"PO-Revision-Date: 2001-08-31 18:28+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -20,16 +20,15 @@ msgstr "
 
 #: lib/error.c:117 src/complain.c:100
 msgid "Unknown system error"
-msgstr ""
+msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
 #: src/complain.c:154
 msgid "warning: "
-msgstr ""
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
 #: src/complain.c:242 src/complain.c:283
-#, fuzzy
 msgid "fatal error: "
-msgstr "ÏÛÉÂËÁ"
+msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
 #: src/conflicts.c:49
 #, c-format
@@ -122,14 +121,8 @@ msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #: src/derives.c:44
-#, fuzzy
 msgid "DERIVES"
-msgstr ""
+msgstr "DERIVES"
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
 
 #: src/derives.c:49
 #, c-format
@@ -139,11 +132,11 @@ msgstr "%s
 #: src/files.c:130
 #, c-format
 msgid "cannot open file `%s'"
-msgstr ""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
 #: src/files.c:149
 msgid "cannot close file"
-msgstr ""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
@@ -178,7 +171,6 @@ msgstr ""
 "  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
 
 #: src/getargs.c:104
-#, fuzzy
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -190,15 +182,15 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 "áÎÁÌÉÚÁÔÏÒ:\n"
+"  -S, --skeleton=æáêì        ÕËÁÚÁÔØ ÆÁÊÌ ÛÁÂÌÏÎÁ\n"
 "  -t, --debug                ÎÁÓÔÒÏÉÔØ ÁÎÁÌÉÚÁÔÏÒ ÄÌÑ ÏÔÌÁÄËÉ\n"
+"      --locations            ×ËÌÀÞÉÔØ ×ÙÞÉÓÌÅÎÉÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÊ\n"
 "  -p, --name-prefix=ðòåæéëó  ÐÏÄÓÔÁ×ÉÔØ ðòåæéëó ÄÌÑ ×ÎÅÛÎÉÈ ÓÉÍ×ÏÌÏ×\n"
 "  -l, --no-lines             ÎÅ ÇÅÎÅÒÉÒÏ×ÁÔØ ÄÉÒÅËÔÉ×Ù `#line'\n"
 "  -n, --no-parser            ÇÅÎÅÒÉÒÏ×ÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÙ\n"
-"  -r, --raw                  ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n"
 "  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
 
 #: src/getargs.c:116
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -213,6 +205,8 @@ msgstr ""
 "  -v, --verbose              ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ × Á×ÔÏÍÁÔÕ\n"
 "  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "  -o, --output-file=æáêì     ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
+"  -g, --graph                ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ Ë Á×ÔÏÍÁÔÕ × ×ÉÄÅ \n"
+"VCG-ÇÒÁÆÁ\n"
 
 #: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
@@ -223,28 +217,34 @@ msgstr "
 #: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
-msgstr ""
+msgstr "bison (GNU Bison) %s"
 
 #: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
+"Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 
 #: src/getargs.c:149
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
+"üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÕÓÌÏ×ÉÑ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ × ÉÓÈÏÄÎÙÈ "
+"ÔÅËÓÔÁÈ.\n"
+"îéëáëéè ÇÁÒÁÎÔÉÊ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ, ÄÁÖÅ ÇÁÒÁÎÔÉÉ ðïìåúîïóôé ÉÌÉ "
+"ðòéçïäîïóôé\n"
+"äìñ ïðòåäåìåîîïê ãåìé.\n"
 
 #: src/getargs.c:210 src/lex.c:636
 #, c-format
 msgid "`%s' is no longer supported"
-msgstr ""
+msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
 #: src/getargs.c:234
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
 #: src/getargs.c:241
 #, c-format
@@ -357,20 +357,13 @@ msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
 #: src/print.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "state %d"
-msgstr ""
+msgstr "ÓÏÓÔÏÑÎÉÅ %d"
-"\n"
-"\n"
-"ÓÏÓÔÏÑÎÉÅ %d\n"
-"\n"
 
 #: src/print.c:233
-#, fuzzy
 msgid "Grammar"
-msgstr ""
+msgstr "çÒÁÍÍÁÔÉËÁ"
-"\n"
-"çÒÁÍÍÁÔÉËÁ\n"
 
 #: src/print.c:240
 #, c-format
@@ -382,20 +375,12 @@ msgid "\t\t/* empty */"
 msgstr "\t\t/* ÐÕÓÔÏ */"
 
 #: src/print.c:253
-#, fuzzy
 msgid "Terminals, with rules where they appear"
-msgstr ""
+msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
-"\n"
-"ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
-"\n"
 
 #: src/print.c:302
-#, fuzzy
 msgid "Nonterminals, with rules where they appear"
-msgstr ""
+msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
-"\n"
-"îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
-"\n"
 
 #: src/print.c:329
 msgid " on left:"
@@ -406,14 +391,14 @@ msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
 #: src/print_graph.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "%-4s\terror (nonassociative)"
-msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
+msgstr "%-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)"
 
 #: src/print_graph.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "$default\treduce using rule %d (%s)"
-msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
+msgstr "$default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)"
 
 #: src/reader.c:79
 msgid "   Skipping to next \\n"
@@ -437,9 +422,9 @@ msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"
 
 #: src/reader.c:326 src/reader.c:390
-#, fuzzy, c-format
+#, c-format
 msgid "%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
+msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
 
 #: src/reader.c:366
 #, c-format
@@ -486,14 +471,14 @@ msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
 #: src/reader.c:561 src/reader.c:721
-#, fuzzy, c-format
+#, c-format
 msgid "multiple %s declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
 #: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s declaration"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
+msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
 #: src/reader.c:583
 msgid "%type declaration has no <typename>"
@@ -520,14 +505,14 @@ msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
 #: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
-#, fuzzy, c-format
+#, c-format
 msgid "unmatched %s"
-msgstr "ÎÅÐÁÒÎÁÑ `{'"
+msgstr "ÎÅÐÁÒÎÁÑ %s"
 
 #: src/reader.c:791
-#, fuzzy, c-format
+#, c-format
 msgid "argument of %%expect is not an integer"
-msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
+msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #: src/reader.c:838
 #, c-format
@@ -540,14 +525,14 @@ msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
 #: src/reader.c:930
-#, fuzzy, c-format
+#, c-format
 msgid "multiple %%header_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
 
 #: src/reader.c:940
-#, fuzzy, c-format
+#, c-format
 msgid "multiple %%source_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension"
 
 #: src/reader.c:1026
 #, c-format
@@ -586,9 +571,9 @@ msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
 #: src/reader.c:1519
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
+msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
 #: src/reader.c:1528
 msgid "two actions at end of one rule"
@@ -649,29 +634,16 @@ msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
 #: src/reduce.c:404
-#, fuzzy
 msgid "Useless nonterminals:"
-msgstr ""
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
-"âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
 
 #: src/reduce.c:419
-#, fuzzy
 msgid "Terminals which are not used:"
-msgstr ""
+msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
-"\n"
-"\n"
-"îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
 
 #: src/reduce.c:430
-#, fuzzy
 msgid "Useless rules:"
-msgstr ""
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
-"\n"
-"\n"
-"âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
-"\n"
 
 #: src/reduce.c:459
 msgid ""
@@ -806,9 +778,8 @@ msgstr "%s:
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
 #: lib/obstack.c:477 lib/xmalloc.c:66
-#, fuzzy
 msgid "memory exhausted"
-msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
+msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
 #. Get translations for open and closing quotation marks.
 #.
@@ -826,11 +797,11 @@ msgstr "%s:
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #: lib/quotearg.c:259
 msgid "`"
-msgstr ""
+msgstr "`"
 
 #: lib/quotearg.c:260
 msgid "'"
-msgstr ""
+msgstr "'"
 
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"

src/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

tests/Makefile.am

@@ -18,23 +18,34 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-# Distribute the testsuite since GNU M4 is needed to build it.
+EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
-noinst_SCRIPTS = testsuite
 
-SUITE = calc.at regression.at
+DISTCLEANFILES       = atconfig atlocal
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
-EXTRA_DIST = atgeneral.m4 suite.at $(SUITE) $(noinst_SCRIPTS)
+TESTSUITE_AT = \
+	testsuite.at \
+	output.at calc.at regression.at
+TESTSUITE = $(srcdir)/testsuite
 
-check-local: atconfig $(srcdir)/testsuite
+AUTOM4TE = autom4te
-	$(SHELL) $(srcdir)/testsuite
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+	mv $@.tmp $@
 
-testsuite: atgeneral.m4 suite.at $(SUITE)
+atconfig: $(top_builddir)/config.status
-	$(M4) -I $(srcdir) atgeneral.m4 suite.at | \
+	cd $(top_builddir) && ./config.status tests/$@
-          sed -e 's/[ 	]*$$//' | \
-	  sed -e '/^$$/N;/\n$$/D' > $@-tmp
-	chmod +x $@-tmp
-	mv $@-tmp $@
 
-CLEANFILES = debug-*.sh empty
+atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
-DISTCLEANFILES = atconfig
+	cd $(top_builddir) && ./config.status tests/$@
-MAINTAINERCLEANFILES = testsuite
+
+clean-local:
+	$(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+	$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin

tests/Makefile.in

@@ -13,8 +13,6 @@
 
 @SET_MAKE@
 
-# Distribute the testsuite since GNU M4 is needed to build it.
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -60,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -69,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -102,23 +96,25 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-noinst_SCRIPTS = testsuite
+EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
 
-SUITE = calc.at regression.at
+DISTCLEANFILES = atconfig atlocal
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
-EXTRA_DIST = atgeneral.m4 suite.at $(SUITE) $(noinst_SCRIPTS)
+TESTSUITE_AT = \
+	testsuite.at \
+	output.at calc.at regression.at
 
-CLEANFILES = debug-*.sh empty
+TESTSUITE = $(srcdir)/testsuite
-DISTCLEANFILES = atconfig
+
-MAINTAINERCLEANFILES = testsuite
+AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = atconfig
+CONFIG_CLEAN_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
-
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in atconfig.in
+DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -129,8 +125,6 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-atconfig: $(top_builddir)/config.status atconfig.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -160,7 +154,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile
 
 installdirs:
 
@@ -180,7 +174,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
@@ -192,7 +185,7 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
 
@@ -214,7 +207,7 @@ install-info: install-info-am
 
 install-man:
 
-installcheck-am:
+installcheck-am: installcheck-local
 
 maintainer-clean: maintainer-clean-am
 
@@ -227,23 +220,33 @@ mostlyclean-am: mostlyclean-generic
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
+	clean-local distclean distclean-generic distdir dvi dvi-am info \
-	install install-am install-data install-data-am install-exec \
+	info-am install install-am install-data install-data-am \
-	install-exec-am install-info install-info-am install-man \
+	install-exec install-exec-am install-info install-info-am \
-	install-strip installcheck installcheck-am installdirs \
+	install-man install-strip installcheck installcheck-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	installcheck-local installdirs maintainer-clean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am uninstall-info-am
 
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+	mv $@.tmp $@
 
-check-local: atconfig $(srcdir)/testsuite
+atconfig: $(top_builddir)/config.status
-	$(SHELL) $(srcdir)/testsuite
+	cd $(top_builddir) && ./config.status tests/$@
 
-testsuite: atgeneral.m4 suite.at $(SUITE)
+atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
-	$(M4) -I $(srcdir) atgeneral.m4 suite.at | \
+	cd $(top_builddir) && ./config.status tests/$@
-          sed -e 's/[ 	]*$$//' | \
+
-	  sed -e '/^$$/N;/\n$$/D' > $@-tmp
+clean-local:
-	chmod +x $@-tmp
+	$(SHELL) $(TESTSUITE) --clean
-	mv $@-tmp $@
+
+check-local: atconfig atlocal $(TESTSUITE)
+	$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 # 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:

tests/atconfig.in

@@ -1,97 +0,0 @@
-# @configure_input@					-*- shell-script -*-
-# Configurable variable values for building test suites.
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# This script is part of Autotest.  Unlimited permission to copy,
-# distribute and modify the testing scripts that are the output of
-# that Autotest script is given.  You need not follow the terms of the
-# GNU General Public License when using or distributing such scripts,
-# even though portions of the text of Autotest appear in them.  The
-# GNU General Public License (GPL) does govern all other use of the
-# material that constitutes the Autotest.
-#
-# Certain portions of the Autotest source text are designed to be
-# copied (in certain cases, depending on the input) into the output of
-# Autotest.  We call these the "data" portions.  The rest of the
-# Autotest source text consists of comments plus executable code that
-# decides which of the data portions to output in any given case.  We
-# call these comments and executable code the "non-data" portions.
-# Autotest never copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autotest
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autotest, you may extend this
-# special exception to the GPL to apply to your modified version as
-# well, *unless* your modified version has the potential to copy into
-# its output some of the text that was the non-data portion of the
-# version that you started with.  (In other words, unless your change
-# moves or copies text from the non-data portions to the data
-# portions.)  If your modification has such potential, you must delete
-# any notice of this special exception to the GPL from your modified
-# version.
-
-# Snippet (1
-# This debugging script has been automatically generated from `make check'.
-# Call it with `--help' to get a quick usage summary.
-
-at_package='@PACKAGE@'
-at_version='@VERSION@'
-# Snippet )1
-# Snippet (2
-at_n='@ECHO_N@'
-at_c='@ECHO_C@'
-test -f atlocal && . ./atlocal
-
-# LC_MESSAGES is always shadowed by LC_ALL.  Here are the only cases:
-# - GNU:       LANGUAGE -> LC_ALL -> LC_MESSAGES -> LANG
-# - POSIX:     LC_ALL -> LC_MESSAGES -> LANG
-# - XPG4:      LC_ALL -> LANG
-# - SysV/XPG2: LANG
-export LANGUAGE; LANGUAGE=C
-export LANG; LANG=C
-export LC_ALL; LC_ALL=C
-
-srcdir=@srcdir@
-top_srcdir=@top_srcdir@
-# Use absolute file notations, as the test might change directories.
-at_srcdir=`cd @srcdir@ && pwd`
-at_top_srcdir=`cd @top_srcdir@ && pwd`
-at_builddir=`pwd`
-at_top_builddir=`cd .. && pwd`
-if test -n "@AT_TESTPATH@"; then
-  export PATH; PATH=`pwd`:`cd @AT_TESTPATH@ && pwd`:$PATH
-else
-  export PATH; PATH=`pwd`:$PATH
-fi
-
-# We need GNU M4.
-M4='@M4@'
-
-# We need a C compiler.
-CC='@CC@'
-CFLAGS='@CFLAGS@'
-
-# We need `config.h'.
-CPPFLAGS="-I$at_top_builddir @CPPFLAGS@"
-
-# We want to use the files shipped with Bison.
-BISON_SIMPLE=$at_top_srcdir/src/bison.simple
-export BISON_SIMPLE
-BISON_HAIRY=$at_top_srcdir/src/bison.hairy
-export BISON_HAIRY
-# Snippet )2

tests/atgeneral.m4

@@ -1,420 +0,0 @@
-divert(-1)						    -*- Autoconf -*-
-# `m4' macros used in building test suites.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# This script is part of Autotest.  Unlimited permission to copy,
-# distribute and modify the testing scripts that are the output of
-# that Autotest script is given.  You need not follow the terms of the
-# GNU General Public License when using or distributing such scripts,
-# even though portions of the text of Autotest appear in them.  The
-# GNU General Public License (GPL) does govern all other use of the
-# material that constitutes the Autotest.
-#
-# Certain portions of the Autotest source text are designed to be
-# copied (in certain cases, depending on the input) into the output of
-# Autotest.  We call these the "data" portions.  The rest of the
-# Autotest source text consists of comments plus executable code that
-# decides which of the data portions to output in any given case.  We
-# call these comments and executable code the "non-data" portions.
-# Autotest never copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autotest
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autotest, you may extend this
-# special exception to the GPL to apply to your modified version as
-# well, *unless* your modified version has the potential to copy into
-# its output some of the text that was the non-data portion of the
-# version that you started with.  (In other words, unless your change
-# moves or copies text from the non-data portions to the data
-# portions.)  If your modification has such potential, you must delete
-# any notice of this special exception to the GPL from your modified
-# version.
-
-changequote()
-changequote([, ])
-
-define([AT_DEFINE], defn([define]))
-define([AT_EVAL], defn([eval]))
-define([AT_FORMAT], defn([format]))
-define([AT_INCLUDE], defn([include]))
-define([AT_SHIFT], defn([shift]))
-define([AT_UNDEFINE], defn([undefine]))
-
-undefine([define])
-undefine([eval])
-undefine([format])
-undefine([include])
-undefine([shift])
-undefine([undefine])
-
-
-# AT_CASE(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)
-# -----------------------------------------------------------
-# m4 equivalent of
-# switch (SWITCH)
-# {
-#   case VAL1:
-#     IF-VAL1;
-#     break;
-#   case VAL2:
-#     IF-VAL2;
-#     break;
-#   ...
-#   default:
-#     DEFAULT;
-#     break;
-# }.
-# All the values are optional, and the macro is robust to active
-# symbols properly quoted.
-AT_DEFINE([AT_CASE],
-[ifelse([$#], 0, [],
-	[$#], 1, [],
-	[$#], 2, [$2],
-        [$1], [$2], [$3],
-        [AT_CASE([$1], AT_SHIFT(AT_SHIFT(AT_SHIFT($@))))])])
-
-
-# Use of diversions:
-#  0 - overall initialization; for each test group: skipping and cleanups;
-#  1 - for each test group: proper code, to reinsert between cleanups;
-#  2 - overall wrap up: generation of debugging scripts and statistics.
-
-
-# AT_LINE
-# -------
-# Return the current file sans directory, a colon, and the current line.
-AT_DEFINE([AT_LINE],
-[patsubst(__file__, ^.*/\(.*\), \1):__line__])
-
-
-# AT_INIT(PROGRAM)
-# ----------------
-# Begin testing suite, using PROGRAM to check version.  The search path
-# should be already preset so the proper executable will be selected.
-AT_DEFINE([AT_INIT],
-[AT_DEFINE(AT_ordinal, 0)
-. ./atconfig
-# Snippet (3
-# -e sets to true
-at_stop_on_error=false;
-# Shall we save and check stdout and stderr?
-# -n sets to false
-at_check_stds=:;
-# Shall we
-# -s sets to false, and -v to true
-at_verbose=false
-
-at_usage="Usage: $[0] [OPTION]...
-
-  -e  Abort the full suite and inhibit normal clean up if a test fails
-  -n  Do not redirect stdout and stderr and do not test their contents
-  -s  Inhibit verbosity while generating or executing debugging scripts
-  -v  Force more detailed output, default for debugging scripts unless -s
-  -x  Have the shell to trace command execution; also implies option -n"
-
-# Snippet )3
-
-# Snippet (4
-while test $[#] -gt 0; do
-  case "$[1]" in
-    --help) echo "$at_usage"; exit 0 ;;
-    --version) echo "$[0] ($at_package) $at_version"; exit 0 ;;
-    -e) at_stop_on_error=:;;
-    -n) at_check_stds=false;;
-    -s) at_verbose=false; at_silent=1;;
-    -v) at_verbose=:; at_silent=;;
-    -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
-    *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
-  esac
-  shift
-done
-
-
-# To check whether a test succeeded or not, we compare an expected
-# output with a reference.  In the testing suite, we just need `cmp'
-# but in debugging scripts, we want more information, so we prefer
-# `diff -u'.  Nonetheless we will use `diff' only, because in DOS
-# environments, `diff' considers that two files are equal included
-# when there are only differences on the coding of new lines. `cmp'
-# does not.
-#
-# Finally, not all the `diff' support `-u', and some, like Tru64, even
-# refuse to `diff' /dev/null.
-: >empty
-
-if diff -u empty empty >/dev/null 2>&1; then
-  at_diff='diff -u'
-else
-  at_diff='diff'
-fi
-
-
-
-# Each generated debugging script, containing a single test group, cleans
-# up files at the beginning only, not at the end.  This is so we can repeat
-# the script many times and browse left over files.  To cope with such left
-# over files, the full test suite cleans up both before and after test groups.
-# Snippet )4
-
-if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
-  at_banner="Testing suite for $at_package, version $at_version"
-  at_dashes=`echo $at_banner | sed s/./=/g`
-  echo "$at_dashes"
-  echo "$at_banner"
-  echo "$at_dashes"
-else
-  echo '======================================================='
-  echo 'ERROR: Not using the proper version, no tests performed'
-  echo '======================================================='
-  exit 1
-fi
-
-# Remove any debugging script resulting from a previous run.
-rm -f debug-*.sh
-
-at_failed_list=
-at_ignore_count=0
-divert(2)[]dnl
-
-# Wrap up the testing suite with summary statistics.
-
-rm -f at-check-line at-setup-line
-at_fail_count=0
-if test -z "$at_failed_list"; then
-  if test "$at_ignore_count" = 0; then
-    at_banner="All $at_test_count tests were successful"
-  else
-    at_banner="All $at_test_count tests were successful ($at_ignore_count ignored)"
-  fi
-else
-  echo
-  echo $at_n "Writing \`debug-NN.sh' scripts, NN =$at_c"
-  for at_group in $at_failed_list; do
-    echo $at_n " $at_group$at_c"
-    ( echo '#!/bin/sh'
-      sed -n '/^[#] Snippet (1/,/^[#] Snippet )1/p' atconfig
-      sed -n '/^[#] Snippet (2/,/^[#] Snippet )2/p' atconfig
-      sed -n "/^[#] Snippet (3/,/^[#] Snippet )3/p" $[0]
-      test -z "$at_silent" && echo 'at_verbose=:'
-      sed -n "/^[#] Snippet (4/,/^[#] Snippet )4/p" $[0]
-      sed -n "/^[#] Snippet (c$at_group(/,/^[#] Snippet )c$at_group)/p" $[0]
-      at_desc=`sed -n \
-        '/^[#] Snippet (d'$at_group'(/,/^[#] Snippet )d'$at_group')/p' $[0] \
-        | sed -n '2s/^[#] //p'`
-      echo 'if $at_verbose; then'
-      echo '  at_banner="$[0]: '$at_desc'"'
-      echo '  at_dashes=`echo $at_banner | sed s/./=/g`'
-      echo '  echo'
-      echo '  echo "$at_dashes"'
-      echo '  echo "$at_banner"'
-      echo '  echo "$at_dashes"'
-      echo 'fi'
-      echo
-      sed -n "/^[#] Snippet (d$at_group(/,/^[#] Snippet )d$at_group)/p" $[0]
-      sed -n "/^[#] Snippet (s$at_group(/,/^[#] Snippet )s$at_group)/p" $[0]
-      echo 'exit 0'
-    ) | grep -v '^[#] Snippet' > debug-$at_group.sh
-    chmod +x debug-$at_group.sh
-    at_fail_count=`expr $at_fail_count + 1`
-  done
-  echo ', done'
-  if $at_stop_on_error; then
-    at_banner='ERROR: One of the tests failed, inhibiting subsequent tests'
-  else
-    at_banner="ERROR: Suite unsuccessful, $at_fail_count of $at_test_count tests failed"
-  fi
-fi
-at_dashes=`echo $at_banner | sed s/./=/g`
-echo
-echo "$at_dashes"
-echo "$at_banner"
-echo "$at_dashes"
-
-if test -n "$at_failed_list"; then
-  if test -z "$at_silent"; then
-    echo
-    echo 'When reporting failed tests to maintainers, do not merely list test'
-    echo 'numbers, as the numbering changes between releases and pretests.'
-    echo 'Be careful to give at least all the information you got about them.'
-    echo 'You may investigate any problem if you feel able to do so, in which'
-    echo 'case the generated debugging scripts provide good starting points.'
-    echo "Go on and modify them at will.  \`./debug-NN --help' gives usage"
-    echo 'information.  Now, failed tests will be executed again, verbosely.'
-    for at_group in $at_failed_list; do
-      ./debug-$at_group.sh
-    done
-  fi
-  exit 1
-fi
-
-exit 0
-divert[]dnl
-])# AT_INIT
-
-
-
-# AT_SETUP(DESCRIPTION)
-# ---------------------
-# Start a group of related tests, all to be executed in the same subshell.
-# The group is testing what DESCRIPTION says.
-AT_DEFINE([AT_SETUP],
-[AT_DEFINE([AT_ordinal], AT_EVAL(AT_ordinal + 1))
-pushdef([AT_group_description], [$1])
-pushdef([AT_data_files], )
-pushdef([AT_data_expout], )
-pushdef([AT_data_experr], )
-if $at_stop_on_error && test -n "$at_failed_list"; then :; else
-divert(1)[]dnl
-  echo AT_LINE > at-check-line
-  echo AT_LINE > at-setup-line
-  if $at_verbose; then
-    echo 'testing AT_group_description'
-    echo $at_n "     $at_c"
-  fi
-  if $at_verbose; then
-    echo "AT_ordinal. $srcdir/AT_LINE..."
-  else
-    echo $at_n "substr(AT_ordinal. $srcdir/AT_LINE                            , 0, 30)[]$at_c"
-  fi
-  if test -z "$at_skip_mode"; then
-    (
-[#] Snippet (d[]AT_ordinal[](
-[#] Testing AT_group_description
-[#] Snippet )d[]AT_ordinal[])
-[#] Snippet (s[]AT_ordinal[](
-[#] starting from `AT_LINE'.
-$at_traceon
-])
-
-
-# AT_CLEANUP(FILES)
-# -----------------
-# Complete a group of related tests, recursively remove those FILES
-# created within the test.  There is no need to list stdout, stderr,
-# nor files created with AT_DATA.
-AT_DEFINE([AT_CLEANUP],
-$at_traceoff
-[[#] Snippet )s[]AT_ordinal[])
-    )
-    at_status=$?
-    $at_verbose &&
-      echo $at_n "     AT_ordinal. $srcdir/`cat at-setup-line`: $at_c"
-    case $at_status in
-      0) echo ok
-         ;;
-      77) echo "ignored near \``cat at-check-line`'"
-          at_ignore_count=`expr $at_ignore_count + 1`
-          ;;
-      *) echo "FAILED near \``cat at-check-line`'"
-         at_failed_list="$at_failed_list AT_ordinal"
-         ;;
-    esac
-  else
-     echo 'ignored (skipped)'
-     at_ignore_count=`expr $at_ignore_count + 1`
-  fi
-  at_test_count=AT_ordinal
-  if $at_stop_on_error && test -n "$at_failed_list"; then :; else
-divert(0)[]dnl
-[#] Snippet (c[]AT_ordinal[](
-
-rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
-[#] Snippet )c[]AT_ordinal[])
-undivert(1)[]dnl
-    rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
-  fi
-fi
-popdef([AT_data_experr])
-popdef([AT_data_expout])
-popdef([AT_data_files])
-popdef([AT_group_description])[]dnl
-])# AT_CLEANUP
-
-
-# AT_DATA(FILE, CONTENTS)
-# -----------------------
-# Initialize an input data FILE with given CONTENTS, which should end with
-# an end of line.
-# This macro is not robust to active symbols in CONTENTS *on purpose*.
-# If you don't want CONTENT to be evaluated, quote it twice.
-AT_DEFINE([AT_DATA],
-[AT_DEFINE([AT_data_files], AT_data_files[ ]$1)
-cat >$1 <<'_ATEOF'
-$2[]_ATEOF
-])
-
-
-# AT_CHECK(COMMANDS, [STATUS], STDOUT, STDERR)
-# --------------------------------------------
-# Execute a test by performing given shell COMMANDS.  These commands
-# should normally exit with STATUS, while producing expected STDOUT and
-# STDERR contents.  The special word `expout' for STDOUT means that file
-# `expout' contents has been set to the expected stdout.  The special word
-# `experr' for STDERR means that file `experr' contents has been set to
-# the expected stderr.
-# STATUS is not checked if it is empty.
-# STDOUT and STDERR can be the special value `ignore', in which case
-# their content is not checked.
-AT_DEFINE([AT_CHECK],
-[$at_traceoff
-$at_verbose && echo "$srcdir/AT_LINE: patsubst([$1], [\([\"`$]\)], \\\1)"
-echo AT_LINE > at-check-line
-$at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
-$at_traceon
-$1
-ifelse([$2], [], [],
-[at_status=$?
-if test $at_status != $2; then
-  $at_verbose && echo "Exit code was $at_status, expected $2" >&6
-dnl Maybe there was an important message to read before it died.
-  $at_verbose && $at_check_stds && cat stderr >&6
-dnl Preserve exit code 77.
-  test $at_status = 77 && exit 77
-  exit 1
-fi
-])dnl
-$at_traceoff
-if $at_check_stds; then
-dnl Restore stdout to fd1 and stderr to fd2.
-  exec 1>&5 2>&6
-dnl If not verbose, neutralize the output of diff.
-  $at_verbose || exec 1>/dev/null 2>/dev/null
-  at_failed=false;
-  AT_CASE([$4],
-          ignore, [$at_verbose && cat stderr;:],
-          experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
-$at_diff experr stderr || at_failed=:],
-          [], [$at_diff empty stderr || at_failed=:],
-          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
-  AT_CASE([$3],
-          ignore, [$at_verbose && cat stdout;:],
-          expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
-$at_diff expout stdout || at_failed=:],
-          [], [$at_diff empty stdout || at_failed=:],
-          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || at_failed=:])
-  if $at_failed; then
-    exit 1
-  else
-    :
-  fi
-fi
-$at_traceon
-])# AT_CHECK
-
-
-divert(0)dnl

tests/atlocal.in

@@ -0,0 +1,10 @@
+# @configure_input@					-*- shell-script -*-
+# Configurable variable values for Bison test suite.
+# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+# We need a C compiler.
+CC='@CC@'
+CFLAGS='@CFLAGS@'
+
+# We need `config.h'.
+CPPFLAGS="-I $top_builddir @CPPFLAGS@"

tests/bison

@@ -0,0 +1,11 @@
+#! /bin/sh
+# Wrapper around a non installed bison to make it work as an installed one.
+. ./atconfig
+
+# We want to use the files shipped with Bison.
+BISON_SIMPLE=$top_srcdir/src/bison.simple
+export BISON_SIMPLE
+BISON_HAIRY=$top_srcdir/src/bison.hairy
+export BISON_HAIRY
+
+exec $top_builddir/src/bison ${1+"$@"}

tests/calc.at

@@ -1,11 +1,22 @@
-#                                                        -*- Autoconf -*-
+# Checking the output filenames.                         -*- Autotest -*-
+# Copyright 2000, 2001 Free Software Foundation, Inc.
 
-cat <<EOF
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 
-Simple Calculator.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-EOF
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
+AT_BANNER([[Simple Calculator.]])
 
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##
@@ -23,11 +34,9 @@ EOF
 # some occurrences of `$1' etc. which will be interpreted by m4.  So
 # you should call it with $1, $2, and $3 as arguments, which is what
 # AT_DATA_CALC_Y does.
-AT_DEFINE([_AT_DATA_CALC_Y],
+m4_define([_AT_DATA_CALC_Y],
-[ifelse([$1$2$3],
+[m4_if([$1$2$3], $[1]$[2]$[3], [],
-        $[1]$[2]$[3], [],
+       [m4_fatal([$0: Invalid arguments: $@])])dnl
-        [errprint([$0: Invalid arguments: $@
-])m4exit(1)])dnl
 AT_DATA([calc.y],
 [[/* Infix notation calculator--calc */
 
@@ -241,11 +250,11 @@ main (int argn, const char **argv)
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------
 # Produce `calc.y'.
-AT_DEFINE([AT_DATA_CALC_Y],
+m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [ifelse(regexp([$1], [--yyerror-verbose]),
+                 [m4_if(m4_regexp([$1], [--yyerror-verbose]),
-                         [-1], [],
+                        [-1], [],
-                         [[#define YYERROR_VERBOSE]])])])
+                        [[#define YYERROR_VERBOSE]])])])
 
 
 
@@ -255,12 +264,15 @@ AT_DEFINE([AT_DATA_CALC_Y],
 # If `--debug' is passed to bison, discard all the debugging traces
 # preserving only the `parse errors'.  Note that since there should be
 # none, the `grep' will fail with exit status 1.
-AT_DEFINE([_AT_CHECK_CALC],
+m4_define([_AT_CHECK_CALC],
-[ifelse(regexp([$1], [--debug]),
+[AT_DATA([[input]],
+[[$2
+]])
+m4_if(m4_regexp([$1], [--debug]),
   [-1],
-     [AT_CHECK([echo "$2" | calc],
+     [AT_CHECK([./calc <input],
                [0], [], [])],
-     [AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2],
+     [AT_CHECK([calc ./input 2>&1 >/dev/null | grep 'parse error' >&2],
                [1], [], [])])])
 
 
@@ -268,14 +280,18 @@ AT_DEFINE([_AT_CHECK_CALC],
 #                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
 # ------------------------------------------------------------
 # Run `calc' on INPUT, and expect STDERR.
-AT_DEFINE([_AT_CHECK_CALC_ERROR],
+m4_define([_AT_CHECK_CALC_ERROR],
-[AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2], 0,
+[AT_DATA([[input]],
+[[$2
+]])
+
+AT_CHECK([./calc <input 2>&1 >/dev/null | grep 'parse error' >&2], 0,
           [],
-[ifelse(regexp([$1], [--location]),
+[m4_if(m4_regexp([$1], [--location]),
-        [-1], [], [$3: ])[]dnl
+       [-1], [], [$3: ])[]dnl
 parse error[]dnl
-ifelse(regexp([$1], [--yyerror-verbose]),
+m4_if(m4_regexp([$1], [--yyerror-verbose]),
-       [-1], [], [$4])[]dnl
+      [-1], [], [$4])[]dnl
 
 ])])
 
@@ -284,14 +300,14 @@ ifelse(regexp([$1], [--yyerror-verbose]),
 # --------------------------------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # BISON-OPTIONS, and performs several tests over the parser.
-AT_DEFINE([AT_CHECK_CALC],
+m4_define([AT_CHECK_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 AT_SETUP([Calculator $1])
 
 AT_DATA_CALC_Y([$1])
 
 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c patsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])],
          [0], [], [])
 AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])
 

tests/output.at

@@ -1,17 +1,27 @@
-#! /bin/sh
+# Checking the output filenames.                    -*- Autotest -*-
-# -*- Autoconf -*-
+# Copyright 2000, 2001 Free Software Foundation, Inc.
-# Validation suite for Bison.
-# Copyright 2000 Free Software Foundation, Inc.
 
-AT_INIT([bison])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AT_BANNER([[Output file names.]])
 
-## ---------------------------- ##
-## Checking output file names.  ##
-## ---------------------------- ##
 
 # AT_CHECK_BISON_FLAGS(FLAGS, EXPECTED-FILES-SORTED)
 # --------------------------------------------------
-AT_DEFINE([AT_CHECK_BISON_FLAGS],
+m4_define([AT_CHECK_BISON_FLAGS],
 [AT_SETUP([Output files: $1.])
 AT_DATA([foo.y],
 [[%%
@@ -33,7 +43,7 @@ AT_CHECK_BISON_FLAGS([-g -o foo.c],  [foo.c foo.h foo.output foo.vcg])
 
 # AT_CHECK_BISON_PERCENT(GRAMMAR-OPTIONS, EXPECTED-FILES-SORTED)
 # --------------------------------------------------------------
-AT_DEFINE([AT_CHECK_BISON_PERCENT],
+m4_define([AT_CHECK_BISON_PERCENT],
 [AT_SETUP([Output files: $1.])
 AT_DATA([foo.y],
 [[$1
@@ -58,7 +68,7 @@ AT_CHECK_BISON_PERCENT([%yacc],             [y.output y.tab.c y.tab.h])
 
 # AT_CHECK_BISON_PERCENT_FLAGS(GRAMMAR_OPTIONS, FLAGS, EXPECTED-FILES-SORTED)
 # ---------------------------------------------------------------------------
-AT_DEFINE([AT_CHECK_BISON_PERCENT_FLAGS],
+m4_define([AT_CHECK_BISON_PERCENT_FLAGS],
 [AT_SETUP([Output files: $1.])
 AT_DATA([foo.yy],
 [[$1
@@ -91,6 +101,3 @@ AT_CHECK_BISON_PERCENT_FLAGS(
 [%source_extension ".cc"] [%header_extension ".hh"],
 [-o foo.c],
 [foo.c foo.h foo.output])
-
-AT_INCLUDE([calc.at])
-AT_INCLUDE([regression.at])

tests/regression.at

@@ -1,11 +1,22 @@
-#                                                        -*- Autoconf -*-
+# Bison Regressions.                               -*- Autotest -*-
+# Copyright 2001 Free Software Foundation, Inc.
 
-cat <<EOF
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 
-Regression tests.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-EOF
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
+AT_BANNER([[Regression tests.]])
 
 ## ------------------ ##
 ## Duplicate string.  ##

tests/testsuite.at

@@ -0,0 +1,28 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+
+# Test suite for GNU Bison.
+# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# We need a recent Autotest.
+m4_version_prereq([2.52c])
+
+AT_INIT([bison])
+
+m4_include([output.at])
+m4_include([calc.at])
+m4_include([regression.at])