aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-07-17 21:58:22 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-07-17 21:58:22 +0000
commitf78755d12f30cfac3dcc1aaaa81545a84b846c73 (patch)
treedeb52ee17a45526d1654d8693dd11af662a883cd
parent9a55a687de80f41235f0e4a74910c6528df3902a (diff)
downloadsrc-f78755d12f30cfac3dcc1aaaa81545a84b846c73.tar.gz
src-f78755d12f30cfac3dcc1aaaa81545a84b846c73.zip
import byacc 20140715vendor/byacc/20140715
Notes
Notes: svn path=/vendor/byacc/dist/; revision=268809 svn path=/vendor/byacc/20140715/; revision=268810; tag=vendor/byacc/20140715
-rw-r--r--CHANGES35
-rw-r--r--MANIFEST2
-rw-r--r--NOTES-btyacc-Changes385
-rw-r--r--NOTES-btyacc-Disposition80
-rw-r--r--VERSION2
-rw-r--r--aclocal.m410
-rw-r--r--main.c3
-rw-r--r--package/byacc.spec4
-rw-r--r--package/debian/changelog12
-rw-r--r--package/mingw-byacc.spec4
-rw-r--r--package/pkgsrc/Makefile2
-rw-r--r--test/btyacc/big_b.output1
-rw-r--r--test/btyacc/big_l.output1
-rw-r--r--test/btyacc/err_inherit1.error2
-rw-r--r--test/btyacc/err_inherit2.error6
-rw-r--r--test/btyacc/err_inherit3.error22
-rw-r--r--test/btyacc/err_inherit4.error10
-rw-r--r--test/btyacc/err_inherit5.error2
-rw-r--r--test/btyacc/err_syntax1.error2
-rw-r--r--test/btyacc/err_syntax10.error6
-rw-r--r--test/btyacc/err_syntax11.error2
-rw-r--r--test/btyacc/err_syntax12.error2
-rw-r--r--test/btyacc/err_syntax13.error2
-rw-r--r--test/btyacc/err_syntax14.error2
-rw-r--r--test/btyacc/err_syntax15.error2
-rw-r--r--test/btyacc/err_syntax16.error2
-rw-r--r--test/btyacc/err_syntax17.error2
-rw-r--r--test/btyacc/err_syntax18.error2
-rw-r--r--test/btyacc/err_syntax19.error2
-rw-r--r--test/btyacc/err_syntax2.error2
-rw-r--r--test/btyacc/err_syntax21.error2
-rw-r--r--test/btyacc/err_syntax22.error2
-rw-r--r--test/btyacc/err_syntax23.error2
-rw-r--r--test/btyacc/err_syntax24.error4
-rw-r--r--test/btyacc/err_syntax25.error2
-rw-r--r--test/btyacc/err_syntax26.error2
-rw-r--r--test/btyacc/err_syntax27.error2
-rw-r--r--test/btyacc/err_syntax3.error2
-rw-r--r--test/btyacc/err_syntax4.error2
-rw-r--r--test/btyacc/err_syntax5.error2
-rw-r--r--test/btyacc/err_syntax6.error2
-rw-r--r--test/btyacc/err_syntax7.error2
-rw-r--r--test/btyacc/err_syntax7a.error2
-rw-r--r--test/btyacc/err_syntax7b.error2
-rw-r--r--test/btyacc/err_syntax8.error2
-rw-r--r--test/btyacc/err_syntax8a.error2
-rw-r--r--test/btyacc/err_syntax9.error2
-rw-r--r--test/btyacc/help.output1
-rw-r--r--test/btyacc/no_b_opt.output1
-rw-r--r--test/btyacc/no_output2.output1
-rw-r--r--test/btyacc/no_p_opt.output1
-rw-r--r--test/btyacc/nostdin.output1
-rwxr-xr-xtest/run_test.sh14
-rw-r--r--test/yacc/big_b.output1
-rw-r--r--test/yacc/big_l.output1
-rw-r--r--test/yacc/err_syntax1.error2
-rw-r--r--test/yacc/err_syntax10.error6
-rw-r--r--test/yacc/err_syntax11.error2
-rw-r--r--test/yacc/err_syntax12.error2
-rw-r--r--test/yacc/err_syntax13.error2
-rw-r--r--test/yacc/err_syntax14.error2
-rw-r--r--test/yacc/err_syntax15.error2
-rw-r--r--test/yacc/err_syntax16.error2
-rw-r--r--test/yacc/err_syntax17.error2
-rw-r--r--test/yacc/err_syntax18.error2
-rw-r--r--test/yacc/err_syntax19.error2
-rw-r--r--test/yacc/err_syntax2.error2
-rw-r--r--test/yacc/err_syntax21.error2
-rw-r--r--test/yacc/err_syntax22.error2
-rw-r--r--test/yacc/err_syntax23.error2
-rw-r--r--test/yacc/err_syntax24.error4
-rw-r--r--test/yacc/err_syntax25.error2
-rw-r--r--test/yacc/err_syntax26.error2
-rw-r--r--test/yacc/err_syntax27.error2
-rw-r--r--test/yacc/err_syntax3.error2
-rw-r--r--test/yacc/err_syntax4.error2
-rw-r--r--test/yacc/err_syntax5.error2
-rw-r--r--test/yacc/err_syntax6.error2
-rw-r--r--test/yacc/err_syntax7.error2
-rw-r--r--test/yacc/err_syntax7a.error2
-rw-r--r--test/yacc/err_syntax7b.error2
-rw-r--r--test/yacc/err_syntax8.error2
-rw-r--r--test/yacc/err_syntax8a.error2
-rw-r--r--test/yacc/err_syntax9.error2
-rw-r--r--test/yacc/help.output1
-rw-r--r--test/yacc/no_b_opt.output1
-rw-r--r--test/yacc/no_output2.output1
-rw-r--r--test/yacc/no_p_opt.output1
-rw-r--r--test/yacc/nostdin.output1
89 files changed, 156 insertions, 581 deletions
diff --git a/CHANGES b/CHANGES
index 57a6c7f3ecc6..c9d73ced986c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,38 @@
+2014-07-15 Thomas E. Dickey <tom@invisible-island.net>
+
+ * aclocal.m4: resync with my-autoconf (no change to configure script)
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * test/run_test.sh:
+ make top-level "make check" work again, by adding another step to filtering
+ the test results.
+
+2014-07-14 Thomas E. Dickey <tom@invisible-island.net>
+
+ * test/run_test.sh: changes from Garrett Cooper's patch:
+ a) ensure that the script returns an error-code if there are differences
+ b) escape "." character in left side of sed expression for $YACC
+ c) ensure that $ifBTYACC has a value
+
+ * test/btyacc/big_b.output, test/btyacc/big_l.output, test/btyacc/help.output, test/btyacc/no_b_opt.output, test/btyacc/no_output2.output, test/btyacc/no_p_opt.output, test/btyacc/nostdin.output:
+ regen (reminder by Garrett Cooper)
+
+2014-07-14 Garrett.Cooper
+
+ * test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error, test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error, test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error, test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error, test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error, test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error, test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error, test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error, test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error, test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error, test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error, test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error, test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error, test/btyacc/err_syntax8.error, test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error, test/yacc/err_syntax1.error, test/yacc/err_syntax10.error, test/yacc/err_syntax11.error, test/yacc/err_syntax12.error, test/yacc/err_syntax13.error, test/yacc/err_syntax14.error, test/yacc/err_syntax15.error, test/yacc/err_syntax16.error, test/yacc/err_syntax17.error, test/yacc/err_syntax18.error, test/yacc/err_syntax19.error, test/yacc/err_syntax2.error, test/yacc/err_syntax21.error, test/yacc/err_syntax22.error, test/yacc/err_syntax23.error, test/yacc/err_syntax24.error, test/yacc/err_syntax25.error, test/yacc/err_syntax26.error, test/yacc/err_syntax27.error, test/yacc/err_syntax3.error, test/yacc/err_syntax4.error, test/yacc/err_syntax5.error, test/yacc/err_syntax6.error, test/yacc/err_syntax7.error, test/yacc/err_syntax7a.error, test/yacc/err_syntax7b.error, test/yacc/err_syntax8.error, test/yacc/err_syntax8a.error, test/yacc/err_syntax9.error:
+ regen
+
+2014-05-27 Tom.Shields
+
+ * main.c: remove obsolete -D option from usage message
+
+2014-05-27 Thomas E. Dickey <tom@invisible-island.net>
+
+ * VERSION, package/byacc.spec, package/debian/changelog, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+ bump
+
2014-04-22 Thomas E. Dickey <tom@invisible-island.net>
* mstring.c:
diff --git a/MANIFEST b/MANIFEST
index 271d9c81dd12..8a2b784c347f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140422, version t20140422
+MANIFEST for byacc-20140715, version t20140715
--------------------------------------------------------------------------------
MANIFEST this file
ACKNOWLEDGEMENTS original version of byacc - 1993
diff --git a/NOTES-btyacc-Changes b/NOTES-btyacc-Changes
deleted file mode 100644
index f074907ee0c9..000000000000
--- a/NOTES-btyacc-Changes
+++ /dev/null
@@ -1,385 +0,0 @@
-Tom Shields, March 17, 2014
-
-PARKING LOT ISSUES:
--------------------
-- verify debian packaging still works?
-
-- there are no #line directives in y.tab.i, other than those that come
- from the input file and the skeleton file; to fix this, would need to
- count output lines in externs_file and add 'write_externs_lineno()'
- similar to 'write_code_lineno()'
-- if there are no defined symbols, the .tab.h file isn't empty (weird case,
- may not be worth fixing)
-- consider: treat []-actions identical to {}-actions if not processing a
- backtracking parser (avoids test case error)?
-
-
-BTYACC CHANGES CURRENTLY DEFERRED, BY FILE:
--------------------------------------------
-
-push.skel
-- skeleton for a 'push' parser
-- needs to be upgraded match the structure of yaccpar.skel
-
-defs.h
-- adopt '%include' changes
-- adopt '%define'/'%ifdef'/'%endif'
-- adopt -E flag to print preprocessed grammar to stdout
-
-error.c
-- adopt '%include' changes
-- NOTE: there is a btyacc change that might be worth adopting in byacc
- [FileError() refactoring to eliminate duplicated code in most of the
- error message functions]
-
-main.c
-- adopt '%define' changes
-- adopt '-DNAME' command line option to define preprocessor variable NAME
-- adopt -E flag to print preprocessed grammar to stdout
-- adopt '-S skeleton_file' command line option to select an alternate parser
- skeleton file
-- the skeleton file named by the -S flag is used as provided to open the
- file; consider a change to this behavior to check whether the named file
- has a path prefix, and if not, look in 'installation' directory if the
- file is not found in the working directory
-
-output.c
-- adopt '%include' changes
-
-reader.c
-- adopt '%include' changes
-- adopt '%define'/'%ifdef'/'%endif' changes
-- adopt -E flag to print preprocessed grammar to stdout
-- NOTE: there is a btyacc change that might be worth adopting in byacc
- [copy_string() & copy_comment() refactoring to eliminate duplicated
- code in copy_text() and copy_union()]
-
-warshall.c
-- NOTE: there is a btyacc change that might be worth adopting in byacc
- [shifting 'mask' incrementally rather than literal '1' by a variable
- amount each time thru the loop]
-
-
-================================================================================
-
-
-new files:
-----------
-
-skel2c
-- modified from btyacc distribution: don't generate #include defs.h
-- extended syntax recognized to include '%% insert VERSION here', generating
- the defines for YYMAJOR, YYMINOR and YYPATCH at that point
-- made generated tables type 'const char *const' to match skelton.c from
- byacc-20130925 baseline
-- added code to append text for write_section() to end of generated skeleton.c
-- remove conversion of tab to \t in generated skeleton.c
-- extended syntax recognized to include '%%ifdef', '%%ifndef', '%%else' and
- '%%endif'; used in yaccpar.skel to bracket code that is specific to
- backtracking
-
-yaccpar.skel.old
-- created from skeleton.c in byacc-20140101 baseline; use of this skeleton
- will create a version of skeleton.c that is close to that in the
- byacc-20140101 baseline
-- eliminated 'body_3' and 'trailer_2' skeleton segments - no need to generate
- yyerror() invocation dynamically; YYERROR_CALL() is already generated
- earlier, and so can be used in the skeleton to simplify
-- added 'const' to types in '%% tables' section to match what skel2c,
- start_int_table() and state_str_table() generate
-- added a few cosmetic changes (e.g., added some additional comments,
- reworded debugging output to match yaccpar.skel, changed yygrowstack()
- to return YYENOMEM for 'out of memory' error, rather than -1, to match
- yaccpar.skel; changed yyparse() return value from 1 to 2 for the
- 'out of memory' error to match yaccpar.skel)
-- added '#ifndef'/'#endif' around '#define YYINITSTACKSIZE 200' to allow
- the value to be changed at compile time
-- changed 'printf(' to 'fprintf(stderr, '; added stack depth (yydepth) to
- debugging output from yaccpar.skel
-- use 'YYINT' rather than 'short' for integer table types
-
-yaccpar.skel
-- renamed from btyaccpa.ske, merged with btyacc-c.ske
-- modified from btyacc distribution to match the latest byacc-20140101
- skeleton structure & data structures
-- make local functions static
-- change "virtual memory exceeded" to "memory exhausted" for bison
- compatibility
-- change debug output generation from printf/puts/putc onto stdout to use
- fprintf/fputs/fputc onto stderr; include
- stack depth and whether or not in trial parsing
-- changed types of generated string tables to be 'const pointer to const char'
-- check all malloc()/realloc() return values, ensure return value of
- yyparse() = 2 if parsing failed due to memory exhaustion
-- change YYDBPR() macro to YYSTYPE_TOSTRING(); define semantics as delivering
- a char* value representing a semantic value (e.g., yylval or yyval, or the
- contents of an entry on the semantic stack); additional parameter passed:
- grammar symbol # (to assist interpretation of semantic value)
-- change YYPOSN to YYLTYPE and yyposn to yylloc (position corresponding to
- yylval) for bison compatibility; add yyloc (corresponding to yyval)
-- move default definition of YYLTYPE into output.c, generating a typedef
-- add '#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)'/'#endif' around
- all lines specific to position processing
-- add '#if defined(YYDESTRUCT_CALL)'/'#endif' around all lines specific to
- semantic & position stack processing to reclaim memory associated with
- discarded symbols
-- add '%%ifdef YYBTYACC'/'%%endif' around all lines specific to backtrack
- parsing; converted by skel2c into '#if defined(YYBTYACC)'/'#endif'
-- distinguish between "yacc stack overflow" and "memory exhausted" situations
-- consolidated termination cleanup code; introduced yyreturn, set to 2 after
- labels yyoverflow/yyenomem, set to 1 after label yyabort, set to 0 after
- label yyaccept; all termination cases jump to label yyreturn, which does
- any cleanup then returns yyreturn value
-- replaced YYDELETEVAL & YYDELETEPOSN user-supplied macro capability by
- implementation of byacc-generated yydestruct() as defined by bison
- compatible %destructor mechanism
-- moved invocation of 'YYREDUCEPOSNFUNC' macro to immediately prior to, rather
- than after, execution of final rule action (so that, at some future
- date, implementation extensions can be added to enable custom calculation
- of locations associated with non-terminals within rule actions); deleted
- unnecessary flag 'reduce_posn'; deleted 'YYCALLREDUCEPOSN' macro; deleted
- C++ variant of 'YYREDUCEPOSNFUNC' invocation
-- adopt approach similar to bison for default computation of yyloc; change
- macro 'YYREDUCEPOSNFUNC' name to 'YYLLOC_DEFAULT' for bison compatibility;
- added 'yyerror_loc_range[2]' to hold start & end locations for error
- situations that pop the stack
-- use 'YYINT' rather than 'short' for integer table types, and for indexing
- parser tables
-
-readskel.c
-http://www.verisign.com/index.html- replaced error() with fprintf()
-
-mstring.h
-- moved contents of mstring.h to defs.h - mstring.h is obsolete
-
-mstring.c
-- replaced include of mstring.h with defs.h
-- changed 'START' to 'HEAD' to remove conflict with 'START' used for
- the start symbol defined in defs.h
-
-modified byacc files:
----------------------
-
-skeleton.c
-- skeleton.c is now generated from the appropriate skeleton file by 'skel2c'
-
-configure.in
-- added configuration for --enable-btyacc option; if 'yes' add '-DYYBTYACC'
- to DEFINES in makefile.in; --enable-btyacc defaults to 'no'
-- added configuration for --with-max-table-size option; if present,
- overrides the value of MAXTABLE defined in defs.h
-- regenerate configure using autoconf
-
-makefile.in
-- added mstring.c to C_FILES
-- added mstring$o to OBJS
-- added @DEFINES@ as value of DEFINES make variable
-- added new make variable SKELETON with value 'yaccpar.skel'
-- added rule to generate skeleton.c from $(SKELETON), depending on skel2c
- and makefile
-- added rm -f skeleton.c distclean rule
-- moved dependency on makefile from only main$o & skeleton$o to $(OBJS),
- since if ./configure is run changing, for example, from --enable-btyacc
- to --disable-btyacc, all files must be recompiled to ensure a clean
- executable
-- add @MAXTABLE@ for optional '-DMAXTABLE=nnn' if configured using
- --with-max-table-size=nnn
-- changed 'cd test && rn 0f test-*'to 'rm -f $(testdir)/test-*'
-
-test/run_test.sh
-- ???
-
-test/run_make.sh
-- ???
-
-defs.h
-- moved contents of mstring.h to defs.h - mstring.h is obsolete
-- added <limits.h> to get the various system defined machine limits;
- changed definitions of MAXCHAR, MAXSHORT, MINSHORT & BITS_PER_WORD to use
- defines from <limits.h>; changed definitions of BIT and SETBIT to use
- value of BITS_PER_WORD
-- added typedef for __compar_fn_t, conditioned on _COMPAR_FN_T being
- undefined (at least for Mac OSX environment)
-- adopt new symbol class values ACTION and ARGUMENT
-- adopt changes/additions used by inherited attribute processing
-- clean up locations of extern function definitions to match where they
- actually live in source files
-- adopt error functions from inherited attribute processing; added new error
- functions
-- added keyword code LOCATIONS for %locations
-- added keyword code DESTRUCTOR for %destructor
-- added extern decl for 'int locations'; true if %locations present
-- added extern decl for 'int backtrack'; initialized to 0 (= false), set to
- 1 (= true) if -B flag is present
-- added extern decl for 'int destructor'; true if at least one %destructor
- present in grammar spec file
-- define 'YYINT' as the smallest C type that can be used to address a
- table of size 'MAXTABLE'; define 'YYINT' based on the value of
- 'MAXTABLE' using the standard system type size definitions from <limits.h>;
- define 'MAXYYINT' and 'MINYYINT' accordingly
-- change 'Value_t' and 'Index_t' to 'YYINT' from 'short'
-- allow 'MAXTABLE' to be defined by '-DMAXTABLE=nnn' at compile-time
-
-closure.c
-- changed print_closure(), print_EFF() and print_first_derives() to 'static';
- added fwd declarations
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-
-error.c
-- adopt error functions from inherited attribute processing; added a few
- additional inherited attribute error functions
-
-graph.c
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-
-lalr.c
-- changed MAXSHORT to MAXYYINT
-
-lr0.c
-- changed MAXSHORT to MAXYYINT
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-
-main.c
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-
-mkpar.c
-- backtracking attempts to resolve shift/reduce and reduce/reduce conflicts
-
-output.c
-- generate prefix & YYPREFIX defines into externs file (-i, .tab.i) and
- code file (-r, .code.c); generate into output file (.tab.c) only if not
- using -r option; eliminates doubled output of prefix aliases if -r with
- no -i in y.tab.c and y.code.c or if -r & -i in y.tab.i and y.code.c
-- changed types of generated string tables to be 'const pointer to const char'
-- adopt backtracking as an alternative in cases where otherwise we have a
- conflict in the parsing actions (3, rather than 2, choices)
-- wrap defines file with (where "yy" is value of 'symbol_prefix')
- #ifndef __yy_defines_h_
- #define _yy_defines_h_
-
- <defines>
-
- #endif
-- avoid writing %%xdecls skeleton section twice if -r used
-- eliminated 'body_3' and 'trailer_2' skeleton segments - no need to generate
- yyerror() invocation dynamically; YYERROR_CALL() is already generated
- earlier, and can be used in the pareser skeleton
-- if -P flag (pure_parser), add yylloc as 2nd parameter to yylex()
- (declaration & call)
-- change YYPOSN to YYLTYPE and yyposn to yylloc (position corresponding to
- yylval) for bison compatibility; add yyloc (corresponding to yyval)
-- generate yylloc parameters for yylex & yyerror if %locations present
-- add location as 1st parameter to declaraion & invocation of yyerror() if
- %locations present
-- output backtrack parsing tables if -B flag is present
-- added generation of yystos[] with output_accessing_symbols() to allow
- translation from a parser internal state number to the corresponding
- grammar symbol number [0 .. nsyms) of the accessing symbol of that parser
- state; used in the generated code for YYDESTRUCT_CALL() &
- YYSTYPE_TOSTRING() to enable the correct semantic value union tag to be
- determined when executing the implementation of YYDESTRUCT_CALL() or
- YYSTYPE_TOSTRING() (similar to yystos[] in bison)
-- added to output_prefix(): yystos; yycindex & yyctable if compiling
- backtracking; yyloc & yylloc if %locations used
-- extended yyname[] to include all grammar symbols, not just the terminal
- symbols: '$end', 'error', '$accept', all non-terminals, including internally
- generated non-terminals for embedded actions in rules, and 'illegal-symbol'
- (which bison spells '$undefined'); '$end' already defined as a symbol 0,
- rathern than adding 'end-of-file' as the name of symbol 0; added
- 'illegal-symbol' from byacc-20140101 (NOTE: the comment in the code that
- says byacc does not predefine '$end' and '$error' is incorrect; however,
- both bison and byacc spell '$error' as 'error')
-- added generation of #define YYTRANSLATE() from byacc-20140101, but changed
- the definition for the undefined symbol case because it is no longer in
- yyname[YYMAXTOKEN+1] but rather occurs after the last non-terminal symbol;
- added #define YYUNDFTOKEN to contain the index in yyname of 'illegal-symbol'
-- generate YYLTYPE in output_ltype() as a struct like for bison rather than
- using #define in yaccpar.skel
-- added 'write_code_lineno' invocation at start of 'output_prefix'
-- added 'write_code_lineno' invocation at start of 'output_pure_parser'
-- added 'write_code_lineno' invocation prior to generation of #include
- for externs file
-- added 'write_code_lineno' invocation after 1st 'write_section(fp, xdecls)'
-- added '++outline;' prior to output of '#define YYTRANSLATE' - this was
- actually causing almost all of the invocations of 'write_code_lineno' to
- put out the correct #line directive
-- corrected 'write_code_lineno' - the line number in a #line directive is
- the number of the next line, not the number of the #line line
-- changed MAXSHORT to MAXYYINT; changed 'high' local static from 'int' to
- 'long' so that it can get higher than 'MAXYYINT' without machine-dependent
- behavior; changed related formats from '%d' to '%ld'
-- generate 'YYINT' rather than 'short' for integer table types
-- generate YYDESTRUCT_DECL & YYDESTRUCT_CALL macros, similar to YYERROR_DECL
- and YYERROR_CALL macros, that can be redefined by user, if desired, to add
- additional parameters to yydestruct() (and even change the 'yydestruct'
- function name)
-- if at least one %destructor present, generate yydestruct(); 1st parameter
- is a string indicating the context in which yydestruct() is invoked
- (e.g., discarding input token, discarding state on stack, cleanup when
- aborting); 2nd parameter is the internal grammar symbol number [0..nsyms)
- of the accessing symbol of the parser state on the top of the stack; 3rd
- parameter is a pointer to the semantic value to be reclaimed associated
- with the grammar symbol in the 2nd parameter; if %locations is defined,
- the 4th parameter is a pointer to the position value to be reclaimed
- associated with the grammar symbol in the 2nd parameter
-
-reader.c
-- adopt []-actions, similar to {}-actions; {}-actions are only executed when
- not in trial mode, but []-actions are executed regardless of mode
-- adopt new symbol class values ACTION and ARGUMENT
-- adopt inherited attributes (syntax resembles arguments to non-terminal
- symbols)
-- adopt keyword table lookup from btyacc, modified to handle equivalence
- of '-' and '_' in spelling of keywords
-- adopt refactoring of tag table creation into cache_tag() for use in
- multiple locations
-- added new error functions in place of btyacc's generic error() function
-- changed '0' to 'NULL' for pointer initialization
-- reworked for-loop at end of get_line (part of DEFERRED '%ifdef/%endif' change)
-- added %locations directive for bison compatibility to enable position
- processing
-- added decl for 'int locations'; true if %locations present
-- added decl 'int backtrack'; initialized to 0 (= false), set to
- 1 (= true) if -B flag is present
-- process %locations if present, set location = 1
-- only process []-actions and only generate 'if (!yytrial)' prefix for
- {}-actions if backtracking is enabled
-- add decl for 'int destructor'; true if at least one %destructor is present
-- add %destructor directive to enable semantic & position stack processing to
- reclaim memory associated with discarded symbols
-- process bison compatible %destructor (set destructor = 1); support @$ in
- %destructor code to reference the position value if %locations is defined
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-- if %locations present, support @N and @$ syntax as for bison to reference
- the locations associated with the N-th rhs symbol and the lhs symbol,
- respectively
-
-symtab.c
-- initialize fields added to 'struct bucket' for non-terminal symbol
- inherited attributes
-
-verbose.c
-- for parse states with conflicts, the contents of the y.output file include
- the trial shift and/or trial reduce actions
-- added output to the end of the verbose report showing the correspondance
- between grammar symbol #, internal parser symbol #, and grammar symbol name
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
- used for variables/parameters that were related to variables/parameters
- declared as 'short'
-
-yacc.1
-- added options 'P', 'V', 'y' and '-o output_file' to the yacc command
- synopsis (already covered in the description section)
-- added options 'B', 'D' and 'L' to the yacc command synopsis; added text in
- the description section
-- added %locations description to the extensions section
diff --git a/NOTES-btyacc-Disposition b/NOTES-btyacc-Disposition
deleted file mode 100644
index 98e527bccab0..000000000000
--- a/NOTES-btyacc-Disposition
+++ /dev/null
@@ -1,80 +0,0 @@
-Tom Shields, March 17, 2014
-
-NOTE: README.BTYACC needs to be re-written (or another README file created)
-to explain how the extensions were adopted into the byacc-20140101 baseline.
-
-bytacc changes adopted; see README.BTYACC for details.
-------------------------------------------------------
-
- Changes to the skeleton to send debugging output to stderr.
-
- Changes to the types of the grammar tables from 'short' to 'int' if
-MAXTABLE is defined to be > MAXSHORT for generation of large grammar tables
-for large grammars. This can be set with the invocation of configure
-using the --with-max-table-size=N option
-
- Changes to add syntactic sugaring for definition and semantic processing
-of inherited attributes associated with non-terminal symbols on the rhs of
-rules. Inherited attributes are implemented as {}-actions, and as such may
-introduce reduce/reduce conflicts. The advantage over manual {}-actions is
-that checking is performed on the number and types of inherited attributes,
-and the positions on the semantic stack are automatically calculated.
-Identical actions produced by the inherited attribute syntax are collapsed
-into a single action, reducing reduce/reduce conflicts.
-
- The %type specification is extended to define the types of inherited
-attributes associated with non-terminal symbols on the lhs of rules, in
-addition to its original purpose in yacc for specifying the type of the
-symbol itself on the parser's value stack. In order to permit the two
- aspects to be used independently, the <type> specification following
-%type is optional.
-
- Added a mechanism to the parser skeleton for computing and propagating
-the text position of grammar symbols if %locations directive is present in
-the grammar specificaion, or if yacc is invoked with the -L flag. Includes
-support for "@$" and "@N" (for N an integer) in actions to refer to symbol
-locations.
-
- Added a bison compatible %destructor directive to define a memory
-management mechanism to the parser skeleton that enables cleanup of semantic
-values and text positions associated with the parsing stack that are
-automatically discarded during error processing.
-
-The following is only available if configure is invoked with the
---enable-btyacc=yes:
-
- Changes to enable backtracking with semantic disambiguation, if yacc is
-invoked with the -B flag. A yacc parser disambiguates shift/reduce conflicts
-by choosing to shift, and reduce/reduce conflicts by reducing using the
-earliest grammar rule (in the grammar specification). A btyacc parser handles
-a conflict by remembering the current parse point and entering into trial parse
-mode. In trial parse mode, the parser tries each of the conflicting options
-until the first successs or until all options are exhausted. If the parser
-runs into an error while in trial parse mode, it backtracks to the most recent
-conflict point and tries the next alternative. If the parser finds a
-successful parse, it backtracks to the point where it first entered trial parse
-mode and continues with normal parsing, using the action at the start of the
-successful trial path. Success in trial parse mode is achieved either by
-successfully reducing the start symbol at the end of input or by invocation of
-YYVALID (or YYVALID_NESTED). Semantic disambiguation is supported within
-[]-actions, which are always executed, with invocation of YYERROR to terminate
-a trial path or YYVALID (and YYVALID_NESTED). Yacc {}-actions are only
-executed during normal parsing.
-
-
-btyacc changes deferred:
-------------------------
-
- The -S command line flag to enable use of an alternate parser skeleton,
-read from an external file.
-
- Preprocessor statements: %define, %ifdef/%endif, %include.
-
-
-btyacc changes rejected:
-------------------------
-
- The yyerror_detailed() option for error messages is replaced by the
-byacc feature for specifying options paramters to yyerror().
-
- C++-specific features in the parser skeleton.
diff --git a/VERSION b/VERSION
index 50894d11578d..088ee4dd9313 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20140422
+20140715
diff --git a/aclocal.m4 b/aclocal.m4
index 5283b2e53cc2..0df47aa1331e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.34 2014/04/06 19:16:18 tom Exp $
+dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -28,7 +28,7 @@ dnl sale, use or other dealings in this Software without prior written
dnl authorization.
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
dnl ------------------
dnl Conditionally generate script according to whether we're using a given autoconf.
dnl
@@ -37,7 +37,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
dnl $3 = code to use if AC_ACVERSION is older than $1.
define([CF_ACVERSION_CHECK],
[
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
ifdef([m4_version_compare],
[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
[CF_ACVERSION_COMPARE(
@@ -930,7 +930,7 @@ AC_PROG_AWK
test -z "$AWK" && AC_MSG_ERROR(No awk program found)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
dnl ----------
dnl standard check for CC, plus followup sanity checks
dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -940,7 +940,7 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS
+CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
diff --git a/main.c b/main.c
index 324c834cba0f..5de92358a053 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.50 2014/04/22 23:34:47 tom Exp $ */
+/* $Id: main.c,v 1.51 2014/05/28 02:01:55 Tom.Shields Exp $ */
#include <signal.h>
#ifndef _WIN32
@@ -208,7 +208,6 @@ usage(void)
," -b file_prefix set filename prefix (default \"y.\")"
," -B create a backtracking parser"
," -d write definitions (" DEFINES_SUFFIX ")"
- ," -D enable value stack memory reclamation"
," -i write interface (y.tab.i)"
," -g write a graphical description"
," -l suppress #line directives"
diff --git a/package/byacc.spec b/package/byacc.spec
index 5444afd4c262..b2ac30eefa2e 100644
--- a/package/byacc.spec
+++ b/package/byacc.spec
@@ -1,8 +1,8 @@
Summary: byacc - public domain Berkeley LALR Yacc parser generator
%define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
%define UseProgram yacc
-# $XTermId: byacc.spec,v 1.20 2014/04/22 08:13:20 tom Exp $
+# $XTermId: byacc.spec,v 1.22 2014/07/15 19:36:54 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
diff --git a/package/debian/changelog b/package/debian/changelog
index efbef7da51a1..33f31faa6278 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,15 @@
+byacc (20140715) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 15 Jul 2014 15:36:54 -0400
+
+byacc (20140527) unstable; urgency=low
+
+ * remove obsolete option from usage message
+
+ -- Thomas E. Dickey <dickey@invisible-island.net> Tue, 27 May 2014 22:01:55 -0400
+
byacc (20140422) unstable; urgency=low
* maintenance updates
diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec
index 0374e9117974..24230cb5b61a 100644
--- a/package/mingw-byacc.spec
+++ b/package/mingw-byacc.spec
@@ -1,8 +1,8 @@
Summary: byacc - public domain Berkeley LALR Yacc parser generator
%define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
%define UseProgram yacc
-# $XTermId: mingw-byacc.spec,v 1.3 2014/04/22 08:13:20 tom Exp $
+# $XTermId: mingw-byacc.spec,v 1.4 2014/07/15 19:36:54 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile
index 2cb387fd2196..750137a64725 100644
--- a/package/pkgsrc/Makefile
+++ b/package/pkgsrc/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
#
-DISTNAME= byacc-20140422
+DISTNAME= byacc-20140715
PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/byacc/
diff --git a/test/btyacc/big_b.output b/test/btyacc/big_b.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/big_b.output
+++ b/test/btyacc/big_b.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/big_l.output b/test/btyacc/big_l.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/big_l.output
+++ b/test/btyacc/big_l.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/err_inherit1.error b/test/btyacc/err_inherit1.error
index 1d662b649485..203b9063e908 100644
--- a/test/btyacc/err_inherit1.error
+++ b/test/btyacc/err_inherit1.error
@@ -1,3 +1,3 @@
-YACC: e - line 64 of "./test/err_inherit1.y", unterminated argument list
+YACC: e - line 64 of "./err_inherit1.y", unterminated argument list
namelist($c, $t
^
diff --git a/test/btyacc/err_inherit2.error b/test/btyacc/err_inherit2.error
index a3fa54a4ff73..c016b63f179d 100644
--- a/test/btyacc/err_inherit2.error
+++ b/test/btyacc/err_inherit2.error
@@ -1,5 +1,5 @@
-YACC: w - line 64 of "./test/err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
-YACC: e - line 64 of "./test/err_inherit2.y", bad formal argument list
+YACC: w - line 64 of "./err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
+YACC: e - line 64 of "./err_inherit2.y", bad formal argument list
namelist($<tval>c, $t, extra): namelist NAME
^
diff --git a/test/btyacc/err_inherit3.error b/test/btyacc/err_inherit3.error
index 6e27dd0504c5..e0ab28a91799 100644
--- a/test/btyacc/err_inherit3.error
+++ b/test/btyacc/err_inherit3.error
@@ -1,23 +1,23 @@
-YACC: w - line 64 of "./test/err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit3.y", wrong number of arguments for namelist
+YACC: w - line 64 of "./err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit3.y", wrong number of arguments for namelist
namelist: namelist($c) NAME
^
-YACC: w - line 64 of "./test/err_inherit3.y", unknown argument $c
-YACC: w - line 64 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 64 of "./err_inherit3.y", unknown argument $c
+YACC: w - line 64 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $t
{ $$->s = mksymbol($<tval>t, $<cval>c, $2);
^
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $c
{ $$->s = mksymbol($<tval>t, $<cval>c, $2);
^
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $t
{ $$->s = mksymbol($t, $c, $1);
^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $t
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $c
{ $$->s = mksymbol($t, $c, $1);
^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 0 of "./test/err_inherit3.y", start symbol declaration requires arguments
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 0 of "./err_inherit3.y", start symbol declaration requires arguments
YACC: 1 rule never reduced
YACC: 3 shift/reduce conflicts.
diff --git a/test/btyacc/err_inherit4.error b/test/btyacc/err_inherit4.error
index 00eb9890a533..20aa216ba239 100644
--- a/test/btyacc/err_inherit4.error
+++ b/test/btyacc/err_inherit4.error
@@ -1,13 +1,13 @@
-YACC: w - line 32 of "./test/err_inherit4.y", destructor redeclared
+YACC: w - line 32 of "./err_inherit4.y", destructor redeclared
%destructor {
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong number of default arguments for namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong number of default arguments for namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 2 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 2 to namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 1 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 1 to namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", @2 references beyond the end of the current rule
+YACC: w - line 77 of "./err_inherit4.y", @2 references beyond the end of the current rule
diff --git a/test/btyacc/err_inherit5.error b/test/btyacc/err_inherit5.error
index edc58c984c59..ceabc34591b2 100644
--- a/test/btyacc/err_inherit5.error
+++ b/test/btyacc/err_inherit5.error
@@ -1 +1 @@
-YACC: e - line 74 of "./test/err_inherit5.y", illegal @$ or @N reference
+YACC: e - line 74 of "./err_inherit5.y", illegal @$ or @N reference
diff --git a/test/btyacc/err_syntax1.error b/test/btyacc/err_syntax1.error
index e3a341d4ee3d..5df5c22ef17b 100644
--- a/test/btyacc/err_syntax1.error
+++ b/test/btyacc/err_syntax1.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
?% {
^
diff --git a/test/btyacc/err_syntax10.error b/test/btyacc/err_syntax10.error
index ceb876ec6037..61a72c0408af 100644
--- a/test/btyacc/err_syntax10.error
+++ b/test/btyacc/err_syntax10.error
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
diff --git a/test/btyacc/err_syntax11.error b/test/btyacc/err_syntax11.error
index df0aee4fb588..b2dd79c50504 100644
--- a/test/btyacc/err_syntax11.error
+++ b/test/btyacc/err_syntax11.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been redeclared
diff --git a/test/btyacc/err_syntax12.error b/test/btyacc/err_syntax12.error
index 9399e82e1d76..358960bdb9ec 100644
--- a/test/btyacc/err_syntax12.error
+++ b/test/btyacc/err_syntax12.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
diff --git a/test/btyacc/err_syntax13.error b/test/btyacc/err_syntax13.error
index dd062569c1dc..9ffa8b40c271 100644
--- a/test/btyacc/err_syntax13.error
+++ b/test/btyacc/err_syntax13.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
diff --git a/test/btyacc/err_syntax14.error b/test/btyacc/err_syntax14.error
index 787a21760b3d..73e9f7c8319f 100644
--- a/test/btyacc/err_syntax14.error
+++ b/test/btyacc/err_syntax14.error
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
YACC: e - the start symbol text2 is undefined
diff --git a/test/btyacc/err_syntax15.error b/test/btyacc/err_syntax15.error
index 63600f1bd126..36dc03fef8bb 100644
--- a/test/btyacc/err_syntax15.error
+++ b/test/btyacc/err_syntax15.error
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
diff --git a/test/btyacc/err_syntax16.error b/test/btyacc/err_syntax16.error
index b8dd094b9409..6ff158970452 100644
--- a/test/btyacc/err_syntax16.error
+++ b/test/btyacc/err_syntax16.error
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a production
diff --git a/test/btyacc/err_syntax17.error b/test/btyacc/err_syntax17.error
index 24032f613202..8a8b64b07123 100644
--- a/test/btyacc/err_syntax17.error
+++ b/test/btyacc/err_syntax17.error
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
S: { error
^
diff --git a/test/btyacc/err_syntax18.error b/test/btyacc/err_syntax18.error
index 305b4cf45e3c..c52fd71a1ecb 100644
--- a/test/btyacc/err_syntax18.error
+++ b/test/btyacc/err_syntax18.error
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the current rule
diff --git a/test/btyacc/err_syntax19.error b/test/btyacc/err_syntax19.error
index 895c8fe16264..2499b7fc4f13 100644
--- a/test/btyacc/err_syntax19.error
+++ b/test/btyacc/err_syntax19.error
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
{ $$ = $<oops>; }
^
diff --git a/test/btyacc/err_syntax2.error b/test/btyacc/err_syntax2.error
index fefda9fcf445..29fe56c28b48 100644
--- a/test/btyacc/err_syntax2.error
+++ b/test/btyacc/err_syntax2.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
%{ /*
^
diff --git a/test/btyacc/err_syntax21.error b/test/btyacc/err_syntax21.error
index 162d82d0c96d..9b0dc17b6629 100644
--- a/test/btyacc/err_syntax21.error
+++ b/test/btyacc/err_syntax21.error
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
diff --git a/test/btyacc/err_syntax22.error b/test/btyacc/err_syntax22.error
index 9c71619c4e25..8622aa73f598 100644
--- a/test/btyacc/err_syntax22.error
+++ b/test/btyacc/err_syntax22.error
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
diff --git a/test/btyacc/err_syntax23.error b/test/btyacc/err_syntax23.error
index bcde6e7fac40..3ccbbd1fee8f 100644
--- a/test/btyacc/err_syntax23.error
+++ b/test/btyacc/err_syntax23.error
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
diff --git a/test/btyacc/err_syntax24.error b/test/btyacc/err_syntax24.error
index bdd3aeda0db3..c1538898ce0b 100644
--- a/test/btyacc/err_syntax24.error
+++ b/test/btyacc/err_syntax24.error
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
diff --git a/test/btyacc/err_syntax25.error b/test/btyacc/err_syntax25.error
index ea45a70310de..234a7b9fcd3c 100644
--- a/test/btyacc/err_syntax25.error
+++ b/test/btyacc/err_syntax25.error
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
%union {
^
diff --git a/test/btyacc/err_syntax26.error b/test/btyacc/err_syntax26.error
index cddd5741bf7a..c9a09ad19929 100644
--- a/test/btyacc/err_syntax26.error
+++ b/test/btyacc/err_syntax26.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
diff --git a/test/btyacc/err_syntax27.error b/test/btyacc/err_syntax27.error
index 4737f99b9a37..2a277087c356 100644
--- a/test/btyacc/err_syntax27.error
+++ b/test/btyacc/err_syntax27.error
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
diff --git a/test/btyacc/err_syntax3.error b/test/btyacc/err_syntax3.error
index 6926214f5e7b..7e4871b87ad2 100644
--- a/test/btyacc/err_syntax3.error
+++ b/test/btyacc/err_syntax3.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
%token <text> '(' '*' '&
^
diff --git a/test/btyacc/err_syntax4.error b/test/btyacc/err_syntax4.error
index 72b683ee7d4b..6a10d4040eb5 100644
--- a/test/btyacc/err_syntax4.error
+++ b/test/btyacc/err_syntax4.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
%{
^
diff --git a/test/btyacc/err_syntax5.error b/test/btyacc/err_syntax5.error
index fd3bf0df6b9f..37a8500b053a 100644
--- a/test/btyacc/err_syntax5.error
+++ b/test/btyacc/err_syntax5.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
%union {
^
diff --git a/test/btyacc/err_syntax6.error b/test/btyacc/err_syntax6.error
index ae83bd2a3735..bde624a71599 100644
--- a/test/btyacc/err_syntax6.error
+++ b/test/btyacc/err_syntax6.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
%token <text) '(' '*' '&
^
diff --git a/test/btyacc/err_syntax7.error b/test/btyacc/err_syntax7.error
index fb6342288f52..ce5717e775e8 100644
--- a/test/btyacc/err_syntax7.error
+++ b/test/btyacc/err_syntax7.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
%token <text> '\777'
^
diff --git a/test/btyacc/err_syntax7a.error b/test/btyacc/err_syntax7a.error
index f6adba64ddc1..213711e11ff0 100644
--- a/test/btyacc/err_syntax7a.error
+++ b/test/btyacc/err_syntax7a.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
%token <text> '\xfff'
^
diff --git a/test/btyacc/err_syntax7b.error b/test/btyacc/err_syntax7b.error
index f3e512fd1a71..19b617ccca1c 100644
--- a/test/btyacc/err_syntax7b.error
+++ b/test/btyacc/err_syntax7b.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
%token <text> '\x.'
^
diff --git a/test/btyacc/err_syntax8.error b/test/btyacc/err_syntax8.error
index 53a3a328d05e..c6a4cc943fa2 100644
--- a/test/btyacc/err_syntax8.error
+++ b/test/btyacc/err_syntax8.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
diff --git a/test/btyacc/err_syntax8a.error b/test/btyacc/err_syntax8a.error
index 3135551633f0..ed503e90451b 100644
--- a/test/btyacc/err_syntax8a.error
+++ b/test/btyacc/err_syntax8a.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol $$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
diff --git a/test/btyacc/err_syntax9.error b/test/btyacc/err_syntax9.error
index 43696bd1f4c3..1f74b7ea0a26 100644
--- a/test/btyacc/err_syntax9.error
+++ b/test/btyacc/err_syntax9.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be declared to be a token
diff --git a/test/btyacc/help.output b/test/btyacc/help.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/help.output
+++ b/test/btyacc/help.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/no_b_opt.output b/test/btyacc/no_b_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/no_b_opt.output
+++ b/test/btyacc/no_b_opt.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/no_output2.output b/test/btyacc/no_output2.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/no_output2.output
+++ b/test/btyacc/no_output2.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/no_p_opt.output b/test/btyacc/no_p_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/no_p_opt.output
+++ b/test/btyacc/no_p_opt.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/btyacc/nostdin.output b/test/btyacc/nostdin.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/btyacc/nostdin.output
+++ b/test/btyacc/nostdin.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/run_test.sh b/test/run_test.sh
index d9faf0bd76a6..22ac61dc9ca9 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -1,7 +1,9 @@
#!/bin/sh
-# $Id: run_test.sh,v 1.22 2014/04/09 11:00:45 tom Exp $
+# $Id: run_test.sh,v 1.24 2014/07/15 19:21:10 tom Exp $
# vi:ts=4 sw=4:
+errors=0
+
# NEW is the file created by the testcase
# REF is the reference file against which to compare
test_diffs() {
@@ -11,13 +13,15 @@ test_diffs() {
if test ! -f $CMP
then
echo "...not found $CMP"
+ errors=1
else
sed -e s,$NEW,$REF, \
- -e "s%$YACC%YACC%" \
+ -e "s%$YACC_escaped%YACC%" \
-e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \
-e '/#define YYPATCH/s/PATCH/CHECK/' \
-e 's,#line \([1-9][0-9]*\) "'$REF_DIR'/,#line \1 ",' \
-e 's,#line \([1-9][0-9]*\) "'$TEST_DIR'/,#line \1 ",' \
+ -e 's,\(YACC:.* line [0-9][0-9]* of "\)'$TEST_DIR/',\1./,' \
< $CMP >$tmpfile \
&& mv $tmpfile $CMP
if test ! -f $REF
@@ -31,6 +35,7 @@ test_diffs() {
else
echo "...diff $REF"
diff -u $REF $CMP
+ errors=1
fi
fi
}
@@ -62,10 +67,11 @@ else
fi
YACC=$PROG_DIR/yacc
+YACC_escaped=`echo "$PROG_DIR/yacc" | sed -e 's/\./\\\./g'`
tmpfile=temp$$
-ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`
+ifBTYACC=`fgrep -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?`
if test $ifBTYACC = 0; then
REF_DIR=${TEST_DIR}/yacc
@@ -236,3 +242,5 @@ do
;;
esac
done
+
+exit $errors
diff --git a/test/yacc/big_b.output b/test/yacc/big_b.output
index 889f0130b120..c98de14b4ad0 100644
--- a/test/yacc/big_b.output
+++ b/test/yacc/big_b.output
@@ -5,7 +5,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/big_l.output b/test/yacc/big_l.output
index 889f0130b120..c98de14b4ad0 100644
--- a/test/yacc/big_l.output
+++ b/test/yacc/big_l.output
@@ -5,7 +5,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/err_syntax1.error b/test/yacc/err_syntax1.error
index e3a341d4ee3d..5df5c22ef17b 100644
--- a/test/yacc/err_syntax1.error
+++ b/test/yacc/err_syntax1.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
?% {
^
diff --git a/test/yacc/err_syntax10.error b/test/yacc/err_syntax10.error
index ceb876ec6037..61a72c0408af 100644
--- a/test/yacc/err_syntax10.error
+++ b/test/yacc/err_syntax10.error
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
diff --git a/test/yacc/err_syntax11.error b/test/yacc/err_syntax11.error
index df0aee4fb588..b2dd79c50504 100644
--- a/test/yacc/err_syntax11.error
+++ b/test/yacc/err_syntax11.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been redeclared
diff --git a/test/yacc/err_syntax12.error b/test/yacc/err_syntax12.error
index 9399e82e1d76..358960bdb9ec 100644
--- a/test/yacc/err_syntax12.error
+++ b/test/yacc/err_syntax12.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
diff --git a/test/yacc/err_syntax13.error b/test/yacc/err_syntax13.error
index dd062569c1dc..9ffa8b40c271 100644
--- a/test/yacc/err_syntax13.error
+++ b/test/yacc/err_syntax13.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
diff --git a/test/yacc/err_syntax14.error b/test/yacc/err_syntax14.error
index 787a21760b3d..73e9f7c8319f 100644
--- a/test/yacc/err_syntax14.error
+++ b/test/yacc/err_syntax14.error
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
YACC: e - the start symbol text2 is undefined
diff --git a/test/yacc/err_syntax15.error b/test/yacc/err_syntax15.error
index 63600f1bd126..36dc03fef8bb 100644
--- a/test/yacc/err_syntax15.error
+++ b/test/yacc/err_syntax15.error
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
diff --git a/test/yacc/err_syntax16.error b/test/yacc/err_syntax16.error
index b8dd094b9409..6ff158970452 100644
--- a/test/yacc/err_syntax16.error
+++ b/test/yacc/err_syntax16.error
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a production
diff --git a/test/yacc/err_syntax17.error b/test/yacc/err_syntax17.error
index 24032f613202..8a8b64b07123 100644
--- a/test/yacc/err_syntax17.error
+++ b/test/yacc/err_syntax17.error
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
S: { error
^
diff --git a/test/yacc/err_syntax18.error b/test/yacc/err_syntax18.error
index 305b4cf45e3c..c52fd71a1ecb 100644
--- a/test/yacc/err_syntax18.error
+++ b/test/yacc/err_syntax18.error
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the current rule
diff --git a/test/yacc/err_syntax19.error b/test/yacc/err_syntax19.error
index 895c8fe16264..2499b7fc4f13 100644
--- a/test/yacc/err_syntax19.error
+++ b/test/yacc/err_syntax19.error
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
{ $$ = $<oops>; }
^
diff --git a/test/yacc/err_syntax2.error b/test/yacc/err_syntax2.error
index fefda9fcf445..29fe56c28b48 100644
--- a/test/yacc/err_syntax2.error
+++ b/test/yacc/err_syntax2.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
%{ /*
^
diff --git a/test/yacc/err_syntax21.error b/test/yacc/err_syntax21.error
index 162d82d0c96d..9b0dc17b6629 100644
--- a/test/yacc/err_syntax21.error
+++ b/test/yacc/err_syntax21.error
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
diff --git a/test/yacc/err_syntax22.error b/test/yacc/err_syntax22.error
index 9c71619c4e25..8622aa73f598 100644
--- a/test/yacc/err_syntax22.error
+++ b/test/yacc/err_syntax22.error
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
diff --git a/test/yacc/err_syntax23.error b/test/yacc/err_syntax23.error
index bcde6e7fac40..3ccbbd1fee8f 100644
--- a/test/yacc/err_syntax23.error
+++ b/test/yacc/err_syntax23.error
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
diff --git a/test/yacc/err_syntax24.error b/test/yacc/err_syntax24.error
index bdd3aeda0db3..c1538898ce0b 100644
--- a/test/yacc/err_syntax24.error
+++ b/test/yacc/err_syntax24.error
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
diff --git a/test/yacc/err_syntax25.error b/test/yacc/err_syntax25.error
index ea45a70310de..234a7b9fcd3c 100644
--- a/test/yacc/err_syntax25.error
+++ b/test/yacc/err_syntax25.error
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
%union {
^
diff --git a/test/yacc/err_syntax26.error b/test/yacc/err_syntax26.error
index cddd5741bf7a..c9a09ad19929 100644
--- a/test/yacc/err_syntax26.error
+++ b/test/yacc/err_syntax26.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
diff --git a/test/yacc/err_syntax27.error b/test/yacc/err_syntax27.error
index 4737f99b9a37..2a277087c356 100644
--- a/test/yacc/err_syntax27.error
+++ b/test/yacc/err_syntax27.error
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
diff --git a/test/yacc/err_syntax3.error b/test/yacc/err_syntax3.error
index 6926214f5e7b..7e4871b87ad2 100644
--- a/test/yacc/err_syntax3.error
+++ b/test/yacc/err_syntax3.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
%token <text> '(' '*' '&
^
diff --git a/test/yacc/err_syntax4.error b/test/yacc/err_syntax4.error
index 72b683ee7d4b..6a10d4040eb5 100644
--- a/test/yacc/err_syntax4.error
+++ b/test/yacc/err_syntax4.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
%{
^
diff --git a/test/yacc/err_syntax5.error b/test/yacc/err_syntax5.error
index fd3bf0df6b9f..37a8500b053a 100644
--- a/test/yacc/err_syntax5.error
+++ b/test/yacc/err_syntax5.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
%union {
^
diff --git a/test/yacc/err_syntax6.error b/test/yacc/err_syntax6.error
index ae83bd2a3735..bde624a71599 100644
--- a/test/yacc/err_syntax6.error
+++ b/test/yacc/err_syntax6.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
%token <text) '(' '*' '&
^
diff --git a/test/yacc/err_syntax7.error b/test/yacc/err_syntax7.error
index fb6342288f52..ce5717e775e8 100644
--- a/test/yacc/err_syntax7.error
+++ b/test/yacc/err_syntax7.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
%token <text> '\777'
^
diff --git a/test/yacc/err_syntax7a.error b/test/yacc/err_syntax7a.error
index f6adba64ddc1..213711e11ff0 100644
--- a/test/yacc/err_syntax7a.error
+++ b/test/yacc/err_syntax7a.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
%token <text> '\xfff'
^
diff --git a/test/yacc/err_syntax7b.error b/test/yacc/err_syntax7b.error
index f3e512fd1a71..19b617ccca1c 100644
--- a/test/yacc/err_syntax7b.error
+++ b/test/yacc/err_syntax7b.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
%token <text> '\x.'
^
diff --git a/test/yacc/err_syntax8.error b/test/yacc/err_syntax8.error
index 53a3a328d05e..c6a4cc943fa2 100644
--- a/test/yacc/err_syntax8.error
+++ b/test/yacc/err_syntax8.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
diff --git a/test/yacc/err_syntax8a.error b/test/yacc/err_syntax8a.error
index 3135551633f0..ed503e90451b 100644
--- a/test/yacc/err_syntax8a.error
+++ b/test/yacc/err_syntax8a.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol $$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
diff --git a/test/yacc/err_syntax9.error b/test/yacc/err_syntax9.error
index 43696bd1f4c3..1f74b7ea0a26 100644
--- a/test/yacc/err_syntax9.error
+++ b/test/yacc/err_syntax9.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be declared to be a token
diff --git a/test/yacc/help.output b/test/yacc/help.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/yacc/help.output
+++ b/test/yacc/help.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/no_b_opt.output b/test/yacc/no_b_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/yacc/no_b_opt.output
+++ b/test/yacc/no_b_opt.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/no_output2.output b/test/yacc/no_output2.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/yacc/no_output2.output
+++ b/test/yacc/no_output2.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/no_p_opt.output b/test/yacc/no_p_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/yacc/no_p_opt.output
+++ b/test/yacc/no_p_opt.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
diff --git a/test/yacc/nostdin.output b/test/yacc/nostdin.output
index 28e455543be0..112b7c7a41c5 100644
--- a/test/yacc/nostdin.output
+++ b/test/yacc/nostdin.output
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives