mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
08af01c2fc
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.
125 lines
3.5 KiB
Plaintext
125 lines
3.5 KiB
Plaintext
-*- Autoconf -*-
|
|
|
|
# C++ skeleton for Bison
|
|
|
|
# Copyright (C) 2002, 2003, 2004, 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 of the License, 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
|
|
|
|
m4_include(b4_pkgdatadir/[c.m4])
|
|
|
|
## ---------------- ##
|
|
## Default values. ##
|
|
## ---------------- ##
|
|
|
|
# Default parser class name.
|
|
m4_define_default([b4_parser_class_name], [parser])
|
|
m4_define_default([b4_location_type], [location])
|
|
m4_define_default([b4_filename_type], [std::string])
|
|
m4_define_default([b4_namespace], m4_defn([b4_prefix]))
|
|
m4_define_default([b4_define_location_comparison],
|
|
m4_if(b4_filename_type, [std::string], [1], [0]))
|
|
|
|
|
|
# b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
|
|
# -----------------------------------------------------
|
|
# Output the definition of the tokens as enums.
|
|
m4_define([b4_token_enums],
|
|
[/* Tokens. */
|
|
enum yytokentype {
|
|
m4_map_sep([ b4_token_enum], [,
|
|
],
|
|
[$@])
|
|
};
|
|
])
|
|
|
|
|
|
## ----------------- ##
|
|
## Semantic Values. ##
|
|
## ----------------- ##
|
|
|
|
|
|
# b4_lhs_value([TYPE])
|
|
# --------------------
|
|
# Expansion of $<TYPE>$.
|
|
m4_define([b4_lhs_value],
|
|
[(yyval[]m4_ifval([$1], [.$1]))])
|
|
|
|
|
|
# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
|
|
# --------------------------------------
|
|
# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
|
|
# symbols on RHS.
|
|
m4_define([b4_rhs_value],
|
|
[(yysemantic_stack_@{($1) - ($2)@}m4_ifval([$3], [.$3]))])
|
|
|
|
# b4_lhs_location()
|
|
# -----------------
|
|
# Expansion of @$.
|
|
m4_define([b4_lhs_location],
|
|
[(yyloc)])
|
|
|
|
|
|
# b4_rhs_location(RULE-LENGTH, NUM)
|
|
# ---------------------------------
|
|
# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
|
|
# on RHS.
|
|
m4_define([b4_rhs_location],
|
|
[(yylocation_stack_@{($1) - ($2)@})])
|
|
|
|
|
|
# b4_parse_param_decl
|
|
# -------------------
|
|
# Extra formal arguments of the constructor.
|
|
# Change the parameter names from "foo" into "foo_yyarg", so that
|
|
# there is no collision bw the user chosen attribute name, and the
|
|
# argument name in the constructor.
|
|
m4_define([b4_parse_param_decl],
|
|
[m4_ifset([b4_parse_param],
|
|
[m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])])
|
|
|
|
m4_define([b4_parse_param_decl_1],
|
|
[$1_yyarg])
|
|
|
|
|
|
|
|
# b4_parse_param_cons
|
|
# -------------------
|
|
# Extra initialisations of the constructor.
|
|
m4_define([b4_parse_param_cons],
|
|
[m4_ifset([b4_parse_param],
|
|
[
|
|
b4_cc_constructor_calls(b4_parse_param)])])
|
|
m4_define([b4_cc_constructor_calls],
|
|
[m4_map_sep([b4_cc_constructor_call], [,
|
|
], [$@])])
|
|
m4_define([b4_cc_constructor_call],
|
|
[$2 ($2_yyarg)])
|
|
|
|
# b4_parse_param_vars
|
|
# -------------------
|
|
# Extra instance variables.
|
|
m4_define([b4_parse_param_vars],
|
|
[m4_ifset([b4_parse_param],
|
|
[
|
|
/* User arguments. */
|
|
b4_cc_var_decls(b4_parse_param)])])
|
|
m4_define([b4_cc_var_decls],
|
|
[m4_map_sep([b4_cc_var_decl], [
|
|
], [$@])])
|
|
m4_define([b4_cc_var_decl],
|
|
[ $1;])
|