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.
This commit is contained in:
Akim Demaille
2004-12-21 12:26:56 +00:00
parent 9a0d8becd8
commit d390b02b8e
2 changed files with 9 additions and 3 deletions

View File

@@ -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. */

View File

@@ -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++