[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bison v2.2
From: |
Akim Demaille |
Subject: |
Re: bison v2.2 |
Date: |
Thu, 13 Oct 2005 12:13:09 +0200 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) |
I fixed it. Paul, you'll certainly want to have a peek at it. Maybe
you won't like the double semantics I gave to output_parser_name etc.
Index: ChangeLog
from Akim Demaille <address@hidden>
* 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.
Index: THANKS
===================================================================
RCS file: /cvsroot/bison/bison/THANKS,v
retrieving revision 1.61
diff -u -u -r1.61 THANKS
--- THANKS 21 Aug 2005 23:43:56 -0000 1.61
+++ THANKS 13 Oct 2005 10:11:41 -0000
@@ -51,6 +51,7 @@
Nicolas Burrus address@hidden
Nicolas Tisserand address@hidden
Noah Friedman address@hidden
+Oleg Smolsky address@hidden
Pascal Bart address@hidden
Paul Eggert address@hidden
Paul Hilfinger address@hidden
Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.108
diff -u -u -r1.108 lalr1.cc
--- data/lalr1.cc 6 Oct 2005 07:17:21 -0000 1.108
+++ data/lalr1.cc 13 Oct 2005 10:11:41 -0000
@@ -30,7 +30,6 @@
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
Index: src/scan-skel.l
===================================================================
RCS file: /cvsroot/bison/bison/src/scan-skel.l,v
retrieving revision 1.35
diff -u -u -r1.35 scan-skel.l
--- src/scan-skel.l 11 Oct 2005 05:06:16 -0000 1.35
+++ src/scan-skel.l 13 Oct 2005 10:11:41 -0000
@@ -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. */
@address@hidden fatal ("invalid @ in skeleton: %s", yytext);
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.70
diff -u -u -r1.70 system.h
--- src/system.h 2 Oct 2005 21:24:12 -0000 1.70
+++ src/system.h 13 Oct 2005 10:11:41 -0000
@@ -62,6 +62,9 @@
#include <stpcpy.h>
+/* From lib/basename.c. */
+char *base_name (char const *name);
+
/*-----------------.
| GCC extensions. |
Index: tests/output.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/output.at,v
retrieving revision 1.8
diff -u -u -r1.8 output.at
--- tests/output.at 14 May 2005 06:49:48 -0000 1.8
+++ tests/output.at 13 Oct 2005 10:11:41 -0000
@@ -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 @@
AT_CHECK([bison $3 $1 $5], 0)
AT_CHECK([ls $4], [], [ignore])
+$6
AT_CLEANUP
])
@@ -84,3 +89,26 @@
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])])
- Re[2]: bison v2.2, (continued)
- Re[2]: bison v2.2, Oleg Smolsky, 2005/10/13
- Re[3]: bison v2.2, Oleg Smolsky, 2005/10/14
- Re: bison v2.2, Paul Eggert, 2005/10/14
- Re[2]: bison v2.2, Oleg Smolsky, 2005/10/14
- Re: bison v2.2, Paul Eggert, 2005/10/14
- Re[2]: bison v2.2, Oleg Smolsky, 2005/10/14
- Re: bison v2.2, Paul Eggert, 2005/10/15
- Re[2]: bison v2.2, Oleg Smolsky, 2005/10/16
- Re: Re[2]: bison v2.2, Akim Demaille, 2005/10/17
- Re: bison v2.2, Paul Eggert, 2005/10/17
Re: bison v2.2,
Akim Demaille <=