[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [SPAM] Re: [updated PATCH] %language declaration
|
From: |
Joel E. Denny |
|
Subject: |
Re: [SPAM] Re: [updated PATCH] %language declaration |
|
Date: |
Sat, 6 Jan 2007 01:14:14 -0500 (EST) |
On Tue, 12 Dec 2006, Joel E. Denny wrote:
> > > 6. I think your new m4_fatal messages should follow the format of the
> > > existing ones in glr.cc and lalr1.cc.
> >
> > I think there is no reason to mention the skeleton name in the error
> > messages
> > -- and I didn't put it here because it is as ugly as "c-skel.m4". The real
> > fix would be to use another "@foo" directive, parsed by scan-skel.l and
> > executed as a "complain".
> >
> > > By the way, can internationalization work with m4_fatal?
> >
> > No. Calling the gettext function could be achieved with the same solution I
> > outlined above. But this is part of a bigger problem, which is that
> > xgettext
> > does not know about m4 syntax.
>
> I know little about gettext, but an @complain sounds like the right way to
> go to me. Thanks. I think you should keep what you have here for now,
> and we can replace all the m4_fatal's in a separate patch some day.
I committed the following to implement this. I found that the way the
skeletons used the m4_divert family was strange and problematic, so I
rewrote it. I hope someone can look over this to make sure there are no
gotchas.
Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1648
diff -p -u -r1.1648 ChangeLog
--- ChangeLog 5 Jan 2007 08:14:44 -0000 1.1648
+++ ChangeLog 6 Jan 2007 06:01:24 -0000
@@ -1,3 +1,65 @@
+2007-01-05 Joel E. Denny <address@hidden>
+
+ Don't use m4_divert since it makes m4_divert_push and m4_divert_pop
+ unreliable -- especially when they're hidden inside another macro.
+ * data/bison.m4, data/c++-skel.m4, data/c++.m4, data/c-skel.m4,
+ data/c.m4: Remove m4_divert(-1).
+ * data/glr.c, data/glr.cc, data/lalr1.cc, data/location.cc,
+ data/push.c, data/yacc.c: Likewise, and replace m4_divert(0) with
+ m4_divert_push(0) and m4_divert_pop(0).
+ * data/output.c (output_skeleton): Don't add an m4_divert_push(0) and
+ an m4_wrap([m4_divert_pop(0)]) to the M4. Diversion -1, which is
+ pushed and popped by m4sugar, should be first on the stack.
+
+ Provide warn, complain, and fatal function callbacks to the skeletons.
+ This provides more flexibility than m4_fatal, improves the error
+ message format, and captures messages for translation. Discussed
+ starting at
+ <http://lists.gnu.org/archive/html/bison-patches/2006-12/msg00063.html>.
+ * data/bison.m4 (b4_error): New, invoked by...
+ (b4_warn, b4_complain, b4_fatal): ... these new macros to wrap the
+ skeleton scanner's new @warn(...@), @complain(...@), and @fatal(...@)
+ directives. Because these M4 macros might be called when the current
+ diversion is -1 or 0, m4_divert_push and m4_divert_pop is used; thus
+ the previous removal of uses of m4_divert, which caused trouble.
+ (b4_check_percent_code_qualifiers): Use b4_complain instead of
+ m4_fatal to report unrecognized %code qualifiers.
+ * data/c++-skel.m4: Use b4_complain instead of m4_fatal to report C++
+ push parser requests.
+ * data/glr.c: Use b4_complain instead of m4_fatal to report
+ non-deterministic push parser requests.
+ Update @output usage to @output(...@) form.
+ * data/glr.cc, data/lalr1.cc: Use b4_fatal instead of m4_fatal to
+ report missing %defines. Update @output usage to @output(...@) form.
+ * data/location.cc, data/push.c, data/yacc.c: Update @output usage to
+ @output(...@) form.
+ * src/main.c (main): Invoke skel_scanner_free.
+ * src/scan-skel.h (skel_scanner_free): Prototype new function.
+ * src/scan-skel.l (FLEX_NO_OBSTACK): Don't define; we now need the
+ obstack_for_string from flex-scanner.h.
+ (YY_DECL): Use to declare skel_lex static.
+ (decode_at_digraphs): Remove; now handled in the new
+ SC_AT_DIRECTIVE_ARG start condition.
+ (fail_for_at_directive_too_many_args, fail_for_invalid_at): New static
+ functions.
+ (at_directive_name, AT_DIRECTIVE_ARGC_MAX, at_directive_argc,
+ at_directive_argv): New static globals.
+ (INITIAL): Use fail_for_invalid_at.
+ Don't parse address@hidden file_name\n' or address@hidden(...@)'.
Instead,
+ recognize the start of a generalized address@hidden(...@)' form and
+ start...
+ (SC_AT_DIRECTIVE_ARG): ... this new start condition to parse the
+ directive args (using the new obstack_for_string), to decode the
+ contained @ diagraphs, and to perform the directive. It recognizes
+ @basename(...@), @warn(...@), @complain(...@), @fatal(...@), and
+ @output(...@).
+ (SC_AT_DIRECTIVE_SKIP_WS): New start condition started by
+ SC_AT_DIRECTIVE_ARG to skip whitespace after the argument delimiter,
+ `@,'.
+ (scan_skel): Initialize obstack_for_string on the first call.
+ (skel_scanner_free): New function to free obstack_for_string.
+ * tests/input.at (Reject bad %code qualifiers): Update test output.
+
2007-01-04 Joel E. Denny <address@hidden>
Consolidate the 4 prologue alternative directives (%code, %requires,
Index: data/bison.m4
===================================================================
RCS file: /sources/bison/bison/data/bison.m4,v
retrieving revision 1.5
diff -p -u -r1.5 bison.m4
--- data/bison.m4 5 Jan 2007 08:14:44 -0000 1.5
+++ data/bison.m4 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- Autoconf -*-
+ -*- Autoconf -*-
# Language-independent M4 Macros for Bison.
# Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -62,6 +62,71 @@ version 2.2 of Bison.])])
## ---------------- ##
+## Error handling. ##
+## ---------------- ##
+
+# b4_error(KIND, FORMAT, [ARG1], [ARG2], ...)
+# ---------------------------------------------------------------
+# Write @KIND(FORMAT@,ARG1@,ARG2@,...@) to diversion 0.
+m4_define([b4_error],
+[m4_divert_push(0)address@hidden(]$2[]m4_if([$#], [2], [],
+[m4_foreach([b4_arg],
+ m4_dquote(m4_shift(m4_shift($@))),
+ [[@,]b4_arg])])[@)]m4_divert_pop(0)])
+
+# b4_warn(FORMAT, [ARG1], [ARG2], ...)
+# --------------------------------------------------------
+# Write @warn(FORMAT@,ARG1@,ARG2@,...@) to diversion 0.
+#
+# As a simple test suite, this:
+#
+# m4_define([asdf], [ASDF])
+# m4_define([fsa], [FSA])
+# m4_define([fdsa], [FDSA])
+# b4_warn([[[asdf), asdf]]], [[[fsa), fsa]]], [[[fdsa), fdsa]]])
+# m4_divert(0)
+# b4_warn([[asdf), asdf]], [[fsa), fsa]], [[fdsa), fdsa]])
+# m4_divert(0)
+# b4_warn([asdf), asdf], [fsa), fsa], [fdsa), fdsa])
+# m4_divert(0)
+# b4_warn
+# m4_divert(0)
+# b4_warn()
+# m4_divert(0)
+# b4_warn(1)
+# m4_divert(0)
+# b4_warn(1, 2)
+#
+# Should produce this:
+#
+# @warn([asdf), asdf]@,[fsa), fsa]@,[fdsa), fdsa]@)
+# @warn(asdf), asdf@,fsa), fsa@,fdsa), fdsa@)
+# @warn(ASDF), ASDF@,FSA), FSA@,FDSA), FDSA@)
+# @warn(@)
+# @warn(@)
+# @warn(1@)
+# @warn(1@,2@)
+m4_define([b4_warn],
+[b4_error([[warn]], $@)])
+
+# b4_complain(FORMAT, [ARG1], [ARG2], ...)
+# ------------------------------------------------------------
+# Write @complain(FORMAT@,ARG1@,ARG2@,...@) to diversion 0.
+#
+# See the test suite for b4_warn above.
+m4_define([b4_complain],
+[b4_error([[complain]], $@)])
+
+# b4_fatal(FORMAT, [ARG1], [ARG2], ...)
+# ---------------------------------------------------------
+# Write @fatal(FORMAT@,ARG1@,ARG2@,...@) to diversion 0.
+#
+# See the test suite for b4_warn above.
+m4_define([b4_fatal],
+[b4_error([[fatal]], $@)])
+
+
+## ---------------- ##
## Default values. ##
## ---------------- ##
@@ -223,6 +288,8 @@ m4_foreach([b4_qualifier],
[m4_if(m4_index(m4_if($#, 0, [], [[,]m4_quote($*)[,]]),
[,]m4_defn([b4_qualifier])[,]),
[-1],
- [m4_fatal([`]m4_defn([b4_qualifier])[' is not a recognized
%code qualifier.])])
+ [b4_complain([[`%s' is not a recognized %%code qualifier]],
+ [m4_defn([b4_qualifier])])
+ ])
])
])])
Index: data/c++-skel.m4
===================================================================
RCS file: /sources/bison/bison/data/c++-skel.m4,v
retrieving revision 1.1
diff -p -u -r1.1 c++-skel.m4
--- data/c++-skel.m4 19 Dec 2006 00:34:36 -0000 1.1
+++ data/c++-skel.m4 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- Autoconf -*-
+ -*- Autoconf -*-
# C++ skeleton dispatching for Bison.
# Copyright (C) 2006 Free Software Foundation, Inc.
@@ -21,7 +21,7 @@ m4_divert(-1)
b4_glr_if( [m4_define([b4_used_skeleton],
[b4_pkgdatadir/[glr.cc]])])
b4_nondeterministic_if([m4_define([b4_used_skeleton],
[b4_pkgdatadir/[glr.cc]])])
-b4_push_if([m4_fatal([%push-parser is not supported by C++])])
+b4_push_if([b4_complain([[C++ push parsers are not supported]])])
m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])
Index: data/c++.m4
===================================================================
RCS file: /sources/bison/bison/data/c++.m4,v
retrieving revision 1.9
diff -p -u -r1.9 c++.m4
--- data/c++.m4 13 Sep 2006 17:41:19 -0000 1.9
+++ data/c++.m4 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- Autoconf -*-
+ -*- Autoconf -*-
# C++ skeleton for Bison
Index: data/c-skel.m4
===================================================================
RCS file: /sources/bison/bison/data/c-skel.m4,v
retrieving revision 1.1
diff -p -u -r1.1 c-skel.m4
--- data/c-skel.m4 19 Dec 2006 00:34:36 -0000 1.1
+++ data/c-skel.m4 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- Autoconf -*-
+ -*- Autoconf -*-
# C skeleton dispatching for Bison.
# Copyright (C) 2006 Free Software Foundation, Inc.
Index: data/c.m4
===================================================================
RCS file: /sources/bison/bison/data/c.m4,v
retrieving revision 1.68
diff -p -u -r1.68 c.m4
--- data/c.m4 31 Dec 2006 20:29:48 -0000 1.68
+++ data/c.m4 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- Autoconf -*-
+ -*- Autoconf -*-
# C M4 Macros for Bison.
# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
Index: data/glr.c
===================================================================
RCS file: /sources/bison/bison/data/glr.c,v
retrieving revision 1.195
diff -p -u -r1.195 glr.c
--- data/glr.c 5 Jan 2007 08:14:44 -0000 1.195
+++ data/glr.c 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- C -*-
+ -*- C -*-
# GLR skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -23,7 +23,7 @@ m4_include(b4_pkgdatadir/[c.m4])
b4_check_percent_code_qualifiers([[requires]], [[provides]], [[top]])
b4_push_if([
-m4_fatal([Non-deterministic push parsers are not yet supported])])
+b4_complain([[non-deterministic push parsers are not yet supported]])])
## ---------------- ##
## Default values. ##
@@ -145,8 +145,8 @@ m4_define([b4_rhs_location],
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
address@hidden b4_parser_file_name
+m4_divert_push(0)dnl
address@hidden(b4_parser_file_name@)
b4_copyright([Skeleton implementation for Bison GLR parsers in C],
[2002, 2003, 2004, 2005, 2006])
[
@@ -2640,7 +2640,7 @@ dnl glr.cc produces its own header.
dnl
m4_if(b4_skeleton, ["glr.c"],
[b4_defines_if(
address@hidden b4_spec_defines_file
address@hidden(b4_spec_defines_file@)
b4_copyright([Skeleton interface for Bison GLR parsers in C],
[2002, 2003, 2004, 2005, 2006])
@@ -2652,3 +2652,4 @@ b4_locations_if([b4_pure_if([],
[extern YYLTYPE b4_prefix[]lloc;])
])
])])
+m4_divert_pop(0)
Index: data/glr.cc
===================================================================
RCS file: /sources/bison/bison/data/glr.cc,v
retrieving revision 1.30
diff -p -u -r1.30 glr.cc
--- data/glr.cc 5 Jan 2007 08:14:44 -0000 1.30
+++ data/glr.cc 6 Jan 2007 06:01:25 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- C -*-
+ -*- C -*-
# C++ GLR skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -52,7 +52,7 @@ m4_define([b4_pure_flag], [1])
# The header is mandatory.
b4_defines_if([],
- [m4_fatal(b4_skeleton[: using %defines is mandatory])])
+ [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
m4_include(b4_pkgdatadir/[c++.m4])
m4_include(b4_pkgdatadir/[location.cc])
@@ -216,7 +216,8 @@ m4_defn([b4_parse_param])))],
m4_include(b4_pkgdatadir/[glr.c])
m4_popdef([b4_parse_param])
address@hidden b4_spec_defines_file
+m4_divert_push(0)
address@hidden(b4_spec_defines_file@)
b4_copyright([Skeleton interface for Bison GLR parsers in C++],
[2002, 2003, 2004, 2005, 2006])[
@@ -378,3 +379,4 @@ m4_ifset([b4_global_tokens_and_yystype],
]b4_user_code([b4_percent_code_provides])])[]dnl
[#endif /* ! defined PARSER_HEADER_H */]
+m4_divert_pop(0)
Index: data/lalr1.cc
===================================================================
RCS file: /sources/bison/bison/data/lalr1.cc,v
retrieving revision 1.147
diff -p -u -r1.147 lalr1.cc
--- data/lalr1.cc 5 Jan 2007 08:14:44 -0000 1.147
+++ data/lalr1.cc 6 Jan 2007 06:01:26 -0000
@@ -1,5 +1,3 @@
-m4_divert(-1)
-
# C++ skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -24,7 +22,7 @@ b4_check_percent_code_qualifiers([[requi
# The header is mandatory.
b4_defines_if([],
- [m4_fatal(b4_skeleton[: using %defines is mandatory])])
+ [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])
# Backward compatibility.
m4_define([b4_location_constructors])
@@ -32,9 +30,9 @@ m4_include(b4_pkgdatadir/[location.cc])
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
+m4_divert_push(0)dnl
b4_defines_if(
address@hidden b4_spec_defines_file
address@hidden(b4_spec_defines_file@)
b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],
[2002, 2003, 2004, 2005, 2006])
dnl FIXME: This is wrong, we want computed header guards.
@@ -302,7 +300,7 @@ m4_ifdef([b4_percent_code_provides],
[#endif /* ! defined PARSER_HEADER_H */]
])dnl
address@hidden b4_parser_file_name
address@hidden(b4_parser_file_name@)
b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++],
[2002, 2003, 2004, 2005, 2006])
m4_ifdef([b4_percent_code_top],
@@ -1060,7 +1058,7 @@ b4_error_verbose_if([, int tok])[)
]b4_epilogue
dnl
address@hidden b4_dir_prefix[]stack.hh
address@hidden(b4_dir_prefix[]stack.hh@)
b4_copyright([Stack handling for Bison parsers in C++],
[2002, 2003, 2004, 2005, 2006])[
@@ -1159,4 +1157,4 @@ namespace ]b4_namespace[
}
#endif // not BISON_STACK_HH]
-m4_divert(-1)
+m4_divert_pop(0)
Index: data/location.cc
===================================================================
RCS file: /sources/bison/bison/data/location.cc,v
retrieving revision 1.13
diff -p -u -r1.13 location.cc
--- data/location.cc 8 Jul 2006 20:38:14 -0000 1.13
+++ data/location.cc 6 Jan 2007 06:01:26 -0000
@@ -1,5 +1,3 @@
-m4_divert(-1)
-
# C++ skeleton for Bison
# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -21,8 +19,8 @@ m4_divert(-1)
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
address@hidden b4_dir_prefix[]position.hh
+m4_divert_push(0)dnl
address@hidden(b4_dir_prefix[]position.hh@)
b4_copyright([Positions for Bison parsers in C++],
[2002, 2003, 2004, 2005, 2006])[
@@ -147,7 +145,7 @@ namespace ]b4_namespace[
}
#endif // not BISON_POSITION_HH]
address@hidden b4_dir_prefix[]location.hh
address@hidden(b4_dir_prefix[]location.hh@)
b4_copyright([Locations for Bison parsers in C++],
[2002, 2003, 2004, 2005, 2006])[
@@ -276,5 +274,5 @@ namespace ]b4_namespace[
}
#endif // not BISON_LOCATION_HH]
-m4_divert(-1)
+m4_divert_pop(0)
m4_changecom([#])
Index: data/push.c
===================================================================
RCS file: /sources/bison/bison/data/push.c,v
retrieving revision 1.30
diff -p -u -r1.30 push.c
--- data/push.c 5 Jan 2007 08:14:44 -0000 1.30
+++ data/push.c 6 Jan 2007 06:01:26 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- C -*-
+ -*- C -*-
# Yacc compatible skeleton for Bison
@@ -145,8 +145,8 @@ m4_define([b4_rhs_location],
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
address@hidden b4_parser_file_name
+m4_divert_push(0)dnl
address@hidden(b4_parser_file_name@)
b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[
@@ -1659,7 +1659,7 @@ yypushreturn:
]b4_epilogue
b4_defines_if(
address@hidden b4_spec_defines_file
address@hidden(b4_spec_defines_file@)
b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl '
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
@@ -1726,3 +1726,4 @@ m4_ifdef([b4_percent_code_provides],
[[/* Copy the %code "provides" blocks. */
]b4_user_code([b4_percent_code_provides])])[]
])dnl b4_defines_if
+m4_divert_pop(0)
Index: data/yacc.c
===================================================================
RCS file: /sources/bison/bison/data/yacc.c,v
retrieving revision 1.158
diff -p -u -r1.158 yacc.c
--- data/yacc.c 5 Jan 2007 08:14:44 -0000 1.158
+++ data/yacc.c 6 Jan 2007 06:01:27 -0000
@@ -1,4 +1,4 @@
-m4_divert(-1) -*- C -*-
+ -*- C -*-
# Yacc compatible skeleton for Bison
@@ -137,8 +137,8 @@ m4_define([b4_rhs_location],
# We do want M4 expansion after # for CPP macros.
m4_changecom()
-m4_divert(0)dnl
address@hidden b4_parser_file_name
+m4_divert_push(0)dnl
address@hidden(b4_parser_file_name@)
b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl '
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[
@@ -1496,7 +1496,7 @@ yyreturn:
b4_epilogue
b4_defines_if(
address@hidden b4_spec_defines_file
address@hidden(b4_spec_defines_file@)
b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl '
[1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])
@@ -1544,3 +1544,4 @@ m4_ifdef([b4_percent_code_provides],
[[/* Copy the %code "provides" blocks. */
]b4_user_code([b4_percent_code_provides])])[]
])dnl b4_defines_if
+m4_divert_pop(0)
Index: src/main.c
===================================================================
RCS file: /sources/bison/bison/src/main.c,v
retrieving revision 1.92
diff -p -u -r1.92 main.c
--- src/main.c 19 Dec 2006 00:34:36 -0000 1.92
+++ src/main.c 6 Jan 2007 06:01:31 -0000
@@ -46,6 +46,7 @@
#include "reduce.h"
#include "scan-code.h"
#include "scan-gram.h"
+#include "scan-skel.h"
#include "symtab.h"
#include "tables.h"
#include "uniqstr.h"
@@ -175,6 +176,7 @@ main (int argc, char *argv[])
muscle_free ();
uniqstrs_free ();
code_scanner_free ();
+ skel_scanner_free ();
quotearg_free ();
timevar_pop (TV_FREE);
Index: src/output.c
===================================================================
RCS file: /sources/bison/bison/src/output.c,v
retrieving revision 1.264
diff -p -u -r1.264 output.c
--- src/output.c 4 Jan 2007 04:51:22 -0000 1.264
+++ src/output.c 6 Jan 2007 06:01:31 -0000
@@ -536,9 +536,6 @@ output_skeleton (void)
symbol_code_props_output (out, "printers", &symbol_printer_get);
muscles_m4_output (out);
-
- fputs ("m4_wrap([m4_divert_pop(0)])\n", out);
- fputs ("m4_divert_push(0)dnl\n", out);
xfclose (out);
/* Read and process m4's output. */
Index: src/scan-skel.h
===================================================================
RCS file: /sources/bison/bison/src/scan-skel.h,v
retrieving revision 1.2
diff -p -u -r1.2 scan-skel.h
--- src/scan-skel.h 22 Jan 2006 08:17:18 -0000 1.2
+++ src/scan-skel.h 6 Jan 2007 06:01:32 -0000
@@ -26,3 +26,4 @@ extern FILE *skel_in;
extern FILE *skel_out;
extern int skel__flex_debug;
extern int skel_lineno;
+void skel_scanner_free (void);
Index: src/scan-skel.l
===================================================================
RCS file: /sources/bison/bison/src/scan-skel.l,v
retrieving revision 1.44
diff -p -u -r1.44 scan-skel.l
--- src/scan-skel.l 12 Dec 2006 06:47:39 -0000 1.44
+++ src/scan-skel.l 6 Jan 2007 06:01:32 -0000
@@ -29,7 +29,6 @@
#undef skel_wrap
#define skel_wrap() 1
-#define FLEX_NO_OBSTACK
#define FLEX_PREFIX(Id) skel_ ## Id
#include "flex-scanner.h"
@@ -42,13 +41,28 @@
#include "files.h"
#include "scan-skel.h"
-int skel_lex (void);
+#define YY_DECL static int skel_lex (void)
+YY_DECL;
#define QPUTS(String) \
fputs (quotearg_style (c_quoting_style, String), yyout)
-static char *decode_at_digraphs (char *in);
+static void fail_for_at_directive_too_many_args (void);
+static void fail_for_invalid_at (char const *at);
+
+/* In SC_AT_DIRECTIVE_ARG context, the name of the directive. */
+static char *at_directive_name;
+
+/* Currently, only the @warn, @complain, and @fatal directives take multiple
+ arguments, and they already can't take more than 5. */
+#define AT_DIRECTIVE_ARGC_MAX 5
+static int at_directive_argc = 0;
+static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%}
+
+%x SC_AT_DIRECTIVE_ARG
+%x SC_AT_DIRECTIVE_SKIP_WS
+
%%
%{
@@ -56,20 +70,6 @@ static char *decode_at_digraphs (char *i
char *outname = NULL;
%}
-"@output ".*\n {
- char *file_name = yytext + sizeof "@output " - 1;
- yytext[yyleng - 1] = '\0';
- if (outname)
- {
- free (outname);
- xfclose (yyout);
- }
- outname = decode_at_digraphs (file_name);
- output_file_name_check (outname);
- yyout = xfopen (outname, "w");
- lineno = 1;
-}
-
"@@" fputc ('@', yyout);
"@{" fputc ('[', yyout);
"@}" fputc (']', yyout);
@@ -78,20 +78,18 @@ static char *decode_at_digraphs (char *i
"@ofile@" QPUTS (outname);
"@dir_prefix@" QPUTS (dir_prefix);
-"@basename(".*"@)" {
- char *file_name = yytext + sizeof "@basename " - 1;
- yytext[yyleng - 2] = '\0';
- file_name = decode_at_digraphs (file_name);
- fputs (last_component (file_name), yyout);
- free (file_name);
address@hidden"(" {
+ yytext[yyleng-1] = '\0';
+ at_directive_name = xstrdup (yytext);
+ BEGIN SC_AT_DIRECTIVE_ARG;
}
/* This pattern must not match more than the previous @ patterns. */
address@hidden@\n]* fatal ("invalid @ in skeleton: %s", yytext);
address@hidden@{}(\n]* fail_for_invalid_at (yytext);
\n lineno++; ECHO;
address@hidden ECHO;
-<<EOF>> {
+<INITIAL><<EOF>> {
if (outname)
{
free (outname);
@@ -99,6 +97,113 @@ static char *decode_at_digraphs (char *i
}
return EOF;
}
+
+<SC_AT_DIRECTIVE_ARG>{
+ address@hidden { STRING_GROW; }
+ \n { ++lineno; STRING_GROW; }
+
+ "@@" { obstack_1grow (&obstack_for_string, '@'); }
+ "@{" { obstack_1grow (&obstack_for_string, '['); }
+ "@}" { obstack_1grow (&obstack_for_string, ']'); }
+ "@`" /* Emtpy. Useful for starting an argument
+ that begins with whitespace. */
+
+ @[,)] {
+ if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
+ fail_for_at_directive_too_many_args ();
+
+ obstack_1grow (&obstack_for_string, '\0');
+ at_directive_argv[at_directive_argc++] =
+ obstack_finish (&obstack_for_string);
+
+ /* Like M4, skip whitespace after a comma. */
+ if (yytext[1] == ',')
+ BEGIN SC_AT_DIRECTIVE_SKIP_WS;
+ else
+ {
+ if (0 == strcmp (at_directive_name, "@basename"))
+ {
+ if (at_directive_argc > 1)
+ fail_for_at_directive_too_many_args ();
+ fputs (last_component (at_directive_argv[0]), yyout);
+ }
+ else if (0 == strcmp (at_directive_name, "@warn")
+ || 0 == strcmp (at_directive_name, "@complain")
+ || 0 == strcmp (at_directive_name, "@fatal"))
+ {
+ void (*func)(char const *, ...);
+ switch (at_directive_name[1])
+ {
+ case 'w': func = warn; break;
+ case 'c': func = complain; break;
+ case 'f': func = fatal; break;
+ default: aver (false); func = NULL; break;
+ }
+ switch (at_directive_argc)
+ {
+ case 1:
+ func (_(at_directive_argv[0]));
+ break;
+ case 2:
+ func (_(at_directive_argv[0]), at_directive_argv[1]);
+ break;
+ case 3:
+ func (_(at_directive_argv[0]), at_directive_argv[1],
+ at_directive_argv[2]);
+ break;
+ case 4:
+ func (_(at_directive_argv[0]), at_directive_argv[1],
+ at_directive_argv[2], at_directive_argv[3]);
+ break;
+ case 5:
+ func (_(at_directive_argv[0]), at_directive_argv[1],
+ at_directive_argv[2], at_directive_argv[3],
+ at_directive_argv[4]);
+ break;
+ default:
+ fail_for_at_directive_too_many_args ();
+ break;
+ }
+ }
+ else if (0 == strcmp (at_directive_name, "@output"))
+ {
+ if (at_directive_argc > 1)
+ fail_for_at_directive_too_many_args ();
+ if (outname)
+ {
+ free (outname);
+ xfclose (yyout);
+ }
+ outname = xstrdup (at_directive_argv[0]);
+ output_file_name_check (outname);
+ yyout = xfopen (outname, "w");
+ lineno = 1;
+ }
+ else
+ fail_for_invalid_at (at_directive_name);
+
+ obstack_free (&obstack_for_string, at_directive_argv[0]);
+ at_directive_argc = 0;
+ free (at_directive_name);
+ BEGIN INITIAL;
+ }
+ }
+
+ @.? { fail_for_invalid_at (yytext); }
+}
+
+<SC_AT_DIRECTIVE_SKIP_WS>{
+ [ \t\r]
+ \n { ++lineno; }
+ . { yyless (0); BEGIN SC_AT_DIRECTIVE_ARG; }
+}
+
+<SC_AT_DIRECTIVE_ARG,SC_AT_DIRECTIVE_SKIP_WS>{
+ <<EOF>> {
+ fatal (_("unclosed %s directive in skeleton"), at_directive_name);
+ }
+}
+
%%
/*------------------------.
@@ -108,6 +213,12 @@ static char *decode_at_digraphs (char *i
void
scan_skel (FILE *in)
{
+ static bool initialized = false;
+ if (!initialized)
+ {
+ initialized = true;
+ obstack_init (&obstack_for_string);
+ }
skel_in = in;
skel__flex_debug = trace_flag & trace_skeleton;
skel_lex ();
@@ -115,30 +226,21 @@ scan_skel (FILE *in)
yylex_destroy ();
}
-static char *
-decode_at_digraphs (char *in)
+static void
+fail_for_at_directive_too_many_args (void)
{
- char *out_start = xnmalloc (strlen (in)+1, sizeof *out_start);
- char *out;
- for (out = out_start; *in != '\0'; ++in, ++out)
- {
- if (*in == '@')
- {
- switch (*++in)
- {
- case '@': *out = '@'; break;
- case '{': *out = '['; break;
- case '}': *out = ']'; break;
- default:
- if (*in != '\0')
- in[1] = '\0';
- fatal ("invalid @ in skeleton: %s", in-1);
- break;
- }
- }
- else
- *out = *in;
- }
- *out = '\0';
- return out_start;
+ fatal (_("too many arguments for %s directive in skeleton"),
+ at_directive_name);
+}
+
+static void
+fail_for_invalid_at (char const *at)
+{
+ fatal ("invalid @ in skeleton: %s", at);
+}
+
+void
+skel_scanner_free (void)
+{
+ obstack_free (&obstack_for_string, 0);
}
Index: tests/input.at
===================================================================
RCS file: /sources/bison/bison/tests/input.at,v
retrieving revision 1.68
diff -p -u -r1.68 input.at
--- tests/input.at 5 Jan 2007 08:14:45 -0000 1.68
+++ tests/input.at 6 Jan 2007 06:01:32 -0000
@@ -714,27 +714,35 @@ AT_DATA([input-c.y],
%%
start: ;
]])
-AT_CHECK([[bison input-c.y 2>&1 | grep 'error: `'"' is not a recognized" >
/dev/null]])
+AT_CHECK([[bison input-c.y]], [1], [],
+[[input-c.y: `' is not a recognized %code qualifier
+]])
AT_DATA([input-c-glr.y],
[[%code "bad" {}
%%
start: ;
]])
-AT_CHECK([[bison input-c-glr.y 2>&1 | grep 'error: `bad'"' is not a
recognized" > /dev/null]])
+AT_CHECK([[bison input-c-glr.y]], [1], [],
+[[input-c-glr.y: `bad' is not a recognized %code qualifier
+]])
AT_DATA([input-c++.y],
[[%code "bad" {}
%%
start: ;
]])
-AT_CHECK([[bison input-c++.y 2>&1 | grep 'error: `bad'"' is not a recognized"
> /dev/null]])
+AT_CHECK([[bison input-c++.y]], [1], [],
+[[input-c++.y: `bad' is not a recognized %code qualifier
+]])
AT_DATA([input-c++-glr.y],
[[%code "bad" {}
%%
start: ;
]])
-AT_CHECK([[bison input-c++-glr.y 2>&1 | grep 'error: `bad'"' is not a
recognized" > /dev/null]])
+AT_CHECK([[bison input-c++-glr.y]], [1], [],
+[[input-c++-glr.y: `bad' is not a recognized %code qualifier
+]])
AT_CLEANUP
- Re: [SPAM] Re: [updated PATCH] %language declaration,
Joel E. Denny <=