Don't impose std::string for filenames.

* data/lalr1.cc (b4_filename_type): New.
(position::filename): Use it.
(parser.hh): Move the inclusion of stack.hh and location.hh below
the user code, so that needed headers for the filename type can be
included first.
Forward declare them before the user code.
* tests/Makefile.am (check-local, installcheck-local): Pass
TESTSUITEFLAGS to the TESTSUITE.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 914bc966d10f779af9ced929cd99f3dac345088b..35606d6053a62fb8d713eec079f46a2445dd383d 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -125,6 +125,12 @@ b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_flag[
 
+namespace yy
+{
+  class position;
+  class location;
+}
+
 ]b4_token_defines(b4_tokens)[
 
 /* Copy the first part of user declarations.  */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6bf2feddb00af76a4844763b76660cd81324cb3..ae8c32793f9764705b5734650b28b5a82b7dfc1f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Bison testsuite.
-## Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2002, 2003, 2004 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
@@ -65,13 +65,13 @@ clean-local:
        test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
 
 check-local: atconfig atlocal $(TESTSUITE)
-       $(SHELL) $(TESTSUITE)
+       $(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
 
 check_SCRIPTS = bison
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
-       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+       $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
 
 # Be real mean with it.
 .PHONY: maintainer-check-g++