From 7625ec2c8305644991a041afb1c9a707e96e3d93 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 13 Oct 2005 10:13:24 +0000 Subject: [PATCH] * src/scan-skel.l: Output the base name parts of the parser and header file names. * tests/output.at (AT_CHECK_OUTPUT): Support subdirectorioes, and additional checks. Use this to exercise C++ outputs in subdirs. Reported by Oleg Smolsky. --- ChangeLog | 9 +++++++++ THANKS | 1 + data/lalr1.cc | 1 - src/scan-skel.l | 8 ++++++-- src/system.h | 3 +++ tests/output.at | 32 ++++++++++++++++++++++++++++++-- 6 files changed, 49 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f2c3086..ace626ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-10-13 Akim Demaille + + * src/scan-skel.l: Output the base name parts of the parser and + header file names. + * tests/output.at (AT_CHECK_OUTPUT): Support subdirectorioes, and + additional checks. + Use this to exercise C++ outputs in subdirs. + Reported by Oleg Smolsky. + 2005-10-12 Paul Eggert * data/c.m4 (b4_c_function_def): Look at __C99_FUNC__, not at diff --git a/THANKS b/THANKS index 983bf687..4a5492e2 100644 --- a/THANKS +++ b/THANKS @@ -51,6 +51,7 @@ Nelson H. F. Beebe beebe@math.utah.edu Nicolas Burrus nicolas.burrus@epita.fr Nicolas Tisserand nicolas.tisserand@epita.fr Noah Friedman friedman@gnu.org +Oleg Smolsky oleg.smolsky@pacific-simulators.co.nz Pascal Bart pascal.bart@epita.fr Paul Eggert eggert@cs.ucla.edu Paul Hilfinger Hilfinger@CS.Berkeley.EDU diff --git a/data/lalr1.cc b/data/lalr1.cc index 91bc2ec4..91360a52 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -30,7 +30,6 @@ m4_if(b4_defines_flag, 0, [], b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], [2002, 2003, 2004, 2005]) dnl FIXME: This is wrong, we want computed header guards. -dnl FIXME: I do not know why the macros are missing now. :( [ #ifndef PARSER_HEADER_H # define PARSER_HEADER_H diff --git a/src/scan-skel.l b/src/scan-skel.l index 06370fa6..e3a5eabd 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -53,6 +53,10 @@ char const *file_name = yytext + sizeof "@output " - 1; yytext[yyleng - 1] = '\0'; + /* Decode special file names. They include the directory part, + contrary to their "free" occurrences, used for issuing #includes, + which must not include the directory part. */ + if (*file_name == '@') { if (strcmp (file_name, "@output_header_name@") == 0) @@ -80,8 +84,8 @@ "@oline@" fprintf (yyout, "%d", lineno + 1); "@ofile@" QPUTS (outname); "@dir_prefix@" QPUTS (dir_prefix); -"@output_parser_name@" QPUTS (parser_file_name); -"@output_header_name@" QPUTS (spec_defines_file); +"@output_parser_name@" QPUTS (base_name (parser_file_name)); +"@output_header_name@" QPUTS (base_name (spec_defines_file)); /* This pattern must not match more than the previous @ patterns. */ @[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext); diff --git a/src/system.h b/src/system.h index 1e161770..9b874b95 100644 --- a/src/system.h +++ b/src/system.h @@ -62,6 +62,9 @@ typedef size_t uintptr_t; #include +/* From lib/basename.c. */ +char *base_name (char const *name); + /*-----------------. | GCC extensions. | diff --git a/tests/output.at b/tests/output.at index 12a49b90..574f2141 100644 --- a/tests/output.at +++ b/tests/output.at @@ -19,10 +19,14 @@ AT_BANNER([[Output file names.]]) -# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [SHELLIO]) +# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [SHELLIO], +# [ADDITIONAL-TESTS]) # ----------------------------------------------------------------------------- m4_define([AT_CHECK_OUTPUT], -[AT_SETUP([Output files: $2 & $3 $5.]) +[AT_SETUP([Output files: $2 $3 $5]) +case "$1" in + */*) mkdir `echo "$1" | sed 's,/.*,,'`;; +esac AT_DATA([$1], [[$2 %% @@ -31,6 +35,7 @@ foo: {}; AT_CHECK([bison $3 $1 $5], 0) AT_CHECK([ls $4], [], [ignore]) +$6 AT_CLEANUP ]) @@ -84,3 +89,26 @@ AT_CHECK_OUTPUT([foo.yy], [], 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])]) -- 2.45.2