mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
bd9d212b13
`bison ', use m4_index instead of m4_substr since chopping up a string containing M4-special characters causes problems here. Fix a couple of bugs related to special characters in user-specified file names, and make it easier for skeletons to compute output file names with the same file name prefix as Bison-computed output file names. * data/glr.cc, data/push.c, data/yacc.c: In @output, use b4_parser_file_name and b4_spec_defines_file instead of @output_parser_name@ and @output_header_name@, which are now redundant. * data/glr.c, data/lalr1.cc: Likewise. Also, in header #include's, use b4_parser_file_name, b4_spec_defines_file, and the new @basename(FILENAME@) instead of @output_parser_name@ and @output_header_name@, which inappropriately escaped the file names as C string literals. * src/files.c (all_but_ext): Remove static qualifier. (compute_output_file_names): Move `free (all_but_ext)' to... (output_file_names_free): ... here since all_but_ext is needed later. * src/files.h (all_but_ext): Extern. * src/muscle_tab.h (MUSCLE_INSERT_STRING_RAW): New macro that does exactly what MUSCLE_INSERT_STRING used to do. (MUSCLE_INSERT_STRING): Use MUSCLE_OBSTACK_SGROW so that M4-special characters are escaped properly. * src/output.c (prepare): Define muscle file_name_all_but_ext as all_but_ext. For pkgdatadir muscle, maintain previous functionality by using MUSCLE_INSERT_STRING_RAW instead of MUSCLE_INSERT_STRING. The problem is that b4_pkgdatadir is used inside m4_include in the skeletons, so digraphs would never be expanded. Hopefully no one has M4-special characters in his Bison installation path. * src/scan-skel.l: Don't parse @output_header_name@ and @output_parser_name@ anymore since they're now redundant. In @output, use decode_at_digraphs. Parse a new @basename command that invokes last_component. (decode_at_digraphs): New. (BASE_QPUTS): Remove unused. * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): New macro. (Output file name): New tests.
201 lines
5.9 KiB
Plaintext
201 lines
5.9 KiB
Plaintext
# Checking the output filenames. -*- Autotest -*-
|
|
# Copyright (C) 2000, 2001, 2002, 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
# 02110-1301, USA.
|
|
|
|
AT_BANNER([[Output file names.]])
|
|
|
|
|
|
# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [SHELLIO],
|
|
# [ADDITIONAL-TESTS])
|
|
# -----------------------------------------------------------------------------
|
|
m4_define([AT_CHECK_OUTPUT],
|
|
[AT_SETUP([[Output files: $2 $3 $5]])
|
|
case "$1" in
|
|
*/*) mkdir `echo "$1" | sed 's,/.*,,'`;;
|
|
esac
|
|
AT_DATA([$1],
|
|
[[$2
|
|
%%
|
|
foo: {};
|
|
]])
|
|
|
|
AT_CHECK([bison $3 $1 $5], 0)
|
|
AT_CHECK([ls $4], [], [ignore])
|
|
$6
|
|
AT_CLEANUP
|
|
])
|
|
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv],
|
|
[foo.output foo.tab.c foo.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv],
|
|
[foo.output foo.tab.c foo.tab.h],
|
|
[>&-])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],
|
|
[foo.c foo.h foo.output])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],
|
|
[foo.output foo.tab.c foo.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv -y],
|
|
[y.output y.tab.c y.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv -b bar],
|
|
[bar.output bar.tab.c bar.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [], [-dv -g -o foo.c],
|
|
[foo.c foo.dot foo.h foo.output])
|
|
|
|
|
|
AT_CHECK_OUTPUT([foo.y], [%defines %verbose], [],
|
|
[foo.output foo.tab.c foo.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
|
|
[y.output y.tab.c y.tab.h])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [%defines %verbose %yacc],[],
|
|
[y.output y.tab.c y.tab.h])
|
|
|
|
# Exercise %output and %file-prefix including deprecated `='
|
|
AT_CHECK_OUTPUT([foo.y], [%file-prefix "bar" %defines %verbose], [],
|
|
[bar.output bar.tab.c bar.tab.h])
|
|
AT_CHECK_OUTPUT([foo.y], [%output="bar.c" %defines %verbose %yacc],[],
|
|
[bar.output bar.c bar.h])
|
|
AT_CHECK_OUTPUT([foo.y],
|
|
[%file-prefix="baz" %output "bar.c" %defines %verbose %yacc],
|
|
[],
|
|
[bar.output bar.c bar.h])
|
|
|
|
|
|
# Check priorities of extension control.
|
|
AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],
|
|
[foo.output foo.tab.cc foo.tab.hh])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],
|
|
[foo.c foo.h foo.output])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [],
|
|
[--defines=foo.hpp -o foo.c++],
|
|
[foo.c++ foo.hpp])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [%defines "foo.hpp"],
|
|
[-o foo.c++],
|
|
[foo.c++ foo.hpp])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [],
|
|
[-o foo.c++ --graph=foo.gph],
|
|
[foo.c++ foo.gph])
|
|
|
|
|
|
## ------------ ##
|
|
## C++ output. ##
|
|
## ------------ ##
|
|
|
|
m4_define([AT_CHECK_NO_SUBDIR_PART],
|
|
[# Also make sure that the includes do not refer to the subdirectory.
|
|
AT_CHECK([grep 'include .subdir/' $1.cc], 1, [])
|
|
AT_CHECK([grep 'include .subdir/' $1.hh], 1, [])
|
|
])
|
|
|
|
AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],
|
|
[foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh])
|
|
|
|
AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [],
|
|
[foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh],
|
|
[], [AT_CHECK_NO_SUBDIR_PART([foo.tab])])
|
|
|
|
AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose],
|
|
[-o subdir/foo.cc],
|
|
[subdir/foo.cc subdir/foo.hh subdir/foo.output subdir/location.hh subdir/stack.hh subdir/position.hh],
|
|
[], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])])
|
|
|
|
|
|
# AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR)
|
|
# -----------------------------------------------------------------------------
|
|
m4_define([AT_CHECK_CONFLICTING_OUTPUT],
|
|
[AT_SETUP([Conflicting output files: $2 $3])
|
|
case "$1" in
|
|
*/*) mkdir `echo "$1" | sed 's,/.*,,'`;;
|
|
esac
|
|
AT_DATA([$1],
|
|
[[$2
|
|
%%
|
|
foo: {};
|
|
]])
|
|
|
|
AT_CHECK([bison $3 $1], 0, [], [$4])
|
|
AT_CLEANUP
|
|
])
|
|
|
|
AT_CHECK_CONFLICTING_OUTPUT([foo.y],
|
|
[], [--graph="foo.tab.c"],
|
|
[foo.y: warning: conflicting outputs to file `foo.tab.c'
|
|
])
|
|
|
|
AT_CHECK_CONFLICTING_OUTPUT([foo.y],
|
|
[%defines "foo.output"], [-v],
|
|
[foo.y: warning: conflicting outputs to file `foo.output'
|
|
])
|
|
|
|
AT_CHECK_CONFLICTING_OUTPUT([foo.y],
|
|
[%skeleton "lalr1.cc" %defines], [--graph="location.hh"],
|
|
[foo.y: warning: conflicting outputs to file `location.hh'
|
|
])
|
|
|
|
|
|
# AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS])
|
|
# -----------------------------------------------------------------------------
|
|
m4_define([AT_CHECK_OUTPUT_FILE_NAME],
|
|
[AT_SETUP([Output file name: $1])
|
|
|
|
AT_DATA([glr.y],
|
|
[[%glr-parser
|
|
%code {
|
|
int yylex (void);
|
|
void yyerror (const char *);
|
|
}
|
|
%%
|
|
start: {};
|
|
]])
|
|
AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y])
|
|
AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
|
|
AT_COMPILE([glr.o], [-c "AS_ESCAPE([$1.c])"])
|
|
$2
|
|
|
|
AT_DATA([cxx.y],
|
|
[[%skeleton "lalr1.cc"
|
|
%code { int yylex (yy::parser::semantic_type*); }
|
|
%%
|
|
start: {};
|
|
]])
|
|
AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y])
|
|
AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
|
|
AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"])
|
|
$2
|
|
|
|
AT_CLEANUP
|
|
])
|
|
|
|
# Notice that the header file name here cannot contain
|
|
# `"' since FILENAME in `#include "FILENAME"' cannot.
|
|
AT_CHECK_OUTPUT_FILE_NAME([[`~!@#$%^&*()-=_+{}[]|\:;<>, .']])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[(]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[)]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[#]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[@@]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[@{]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[@}]])
|
|
|
|
# Bison isn't M4-quoting file names before inserting them into muscles, so
|
|
# these tests currently fail.
|
|
AT_CHECK_OUTPUT_FILE_NAME([[@<:@]])
|
|
AT_CHECK_OUTPUT_FILE_NAME([[@:>@]])
|