mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
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 `@output file_name\n' or `@basename(...@)'. Instead, recognize the start of a generalized `@directive(...@)' 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.
This commit is contained in:
Joel E. Denny
@@ -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.
|
||||
@@ -61,6 +61,71 @@ This special exception was added by the Free Software Foundation in
|
||||
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)[@]$1[(]$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])])
|
||||
])
|
||||
])
|
||||
])])
|
||||
|
||||
@@ -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) -*- Autoconf -*-
|
||||
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)"])
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_divert(-1) -*- Autoconf -*-
|
||||
-*- Autoconf -*-
|
||||
|
||||
# C++ skeleton for Bison
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_divert(-1) -*- Autoconf -*-
|
||||
-*- Autoconf -*-
|
||||
|
||||
# C skeleton dispatching for Bison.
|
||||
# Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
m4_divert(-1) -*- Autoconf -*-
|
||||
-*- Autoconf -*-
|
||||
|
||||
# C M4 Macros for Bison.
|
||||
# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
|
||||
11
data/glr.c
11
data/glr.c
@@ -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
|
||||
@output b4_parser_file_name
|
||||
m4_divert_push(0)dnl
|
||||
@output(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(
|
||||
[@output b4_spec_defines_file
|
||||
[@output(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)
|
||||
|
||||
@@ -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])
|
||||
|
||||
@output b4_spec_defines_file
|
||||
m4_divert_push(0)
|
||||
@output(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)
|
||||
|
||||
@@ -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([[requires]], [[provides]], [[top]])
|
||||
|
||||
# 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(
|
||||
[@output b4_spec_defines_file
|
||||
[@output(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
|
||||
@output b4_parser_file_name
|
||||
@output(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
|
||||
@output b4_dir_prefix[]stack.hh
|
||||
@output(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)
|
||||
|
||||
@@ -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
|
||||
@output b4_dir_prefix[]position.hh
|
||||
m4_divert_push(0)dnl
|
||||
@output(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]
|
||||
@output b4_dir_prefix[]location.hh
|
||||
@output(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([#])
|
||||
|
||||
@@ -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
|
||||
@output b4_parser_file_name
|
||||
m4_divert_push(0)dnl
|
||||
@output(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(
|
||||
[@output b4_spec_defines_file
|
||||
[@output(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)
|
||||
|
||||
@@ -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
|
||||
@output b4_parser_file_name
|
||||
m4_divert_push(0)dnl
|
||||
@output(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(
|
||||
[@output b4_spec_defines_file
|
||||
[@output(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)
|
||||
|
||||
Reference in New Issue
Block a user