mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-10 12:53:03 +00:00
This patch contains more fixes to prefer signed to unsigned integer types, as modern tools like 'gcc -fsanitize=undefined' can check for signed integer overflow but not unsigned overflow. * NEWS: Document the API change. * boostrap.conf (gnulib_modules): Add intprops. * data/skeletons/glr.c: Include stddef.h and stdint.h, since this skeleton can assume C99 or later. (YYSIZEMAX): Now signed, and the minimum of SIZE_MAX and PTRDIFF_MAX. (yybool) [!__cplusplus]: Now signed (which is how bool behaves). (YYTRANSLATE): Avoid use of unsigned, and make the macro safe even for values greater than UINT_MAX. (yytnamerr, struct yyGLRState, struct yyGLRStateSet, struct yyGLRStack) (yyaddDeferredAction, yyinitStateSet, yyinitGLRStack) (yyexpandGLRStack, yymarkStackDeleted, yyremoveDeletes) (yyglrShift, yyglrShiftDefer, yy_reduce_print, yydoAction) (yyglrReduce, yysplitStack, yyreportTree, yycompressStack) (yyprocessOneStack, yyreportSyntaxError, yyrecoverSyntaxError) (yyparse, yy_yypstack, yypstack, yypdumpstack): * tests/input.at (Torturing the Scanner): Prefer ptrdiff_t to size_t. * data/skeletons/c++.m4 (b4_yytranslate_define): * src/AnnotationList.c (AnnotationList__computePredecessorAnnotations): * src/AnnotationList.h (AnnotationIndex): * src/InadequacyList.h (InadequacyListNodeCount): * src/closure.c (closure_new): * src/complain.c (error_message, complains, complain_indent) (complain_args, duplicate_directive, duplicate_rule_directive): * src/gram.c (nritems, ritem_print, grammar_dump): * src/ielr.c (ielr_compute_ritem_sees_lookahead_set) (ielr_item_has_lookahead, ielr_compute_annotation_lists) (ielr_compute_lookaheads): * src/location.c (columns, boundary_print, location_print): * src/muscle-tab.c (muscle_percent_define_insert) (muscle_percent_define_check_values): * src/output.c (prepare_rules, prepare_actions): * src/parse-gram.y (id, handle_require): * src/reader.c (record_merge_function_type, packgram): * src/reduce.c (nuseless_productions, nuseless_nonterminals) (inaccessable_symbols): * src/relation.c (relation_print): * src/scan-code.l (variant, variant_table_size, variant_count) (variant_add, get_at_spec, show_sub_message, show_sub_messages) (parse_ref): * src/scan-gram.l (<SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>) (scan_integer, convert_ucn_to_byte, handle_syncline): * src/scan-skel.l (at_complain): * src/symtab.c (complain_symbol_redeclared) (complain_semantic_type_redeclared, complain_class_redeclared) (symbol_class_set, complain_user_token_number_redeclared): * src/tables.c (conflict_tos, conflrow, conflict_table) (conflict_list, save_row, pack_vector): * tests/local.at (AT_YYLEX_DEFINE(c)): Prefer signed to unsigned integer. * data/skeletons/lalr1.cc (yy_lac_check_): * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): * tests/local.at (AT_YYLEX_DEFINE(c)): Omit now-unnecessary casts. * data/skeletons/location.cc (b4_location_define): * doc/bison.texi (Mfcalc Lexer, C++ position, C++ location): Prefer int to unsigned for line and column numbers. Change example to abort explicitly on memory exhaustion, and fix an off-by-one bug that led to undefined behavior. * data/skeletons/stack.hh (stack::operator[]): Also allow ptrdiff_t indexes. (stack::pop, slice::slice, slice::operator[]): Index arg is now ptrdiff_t, not int. (stack::ssize): New method. (slice::range_): Now ptrdiff_t, not int. * data/skeletons/yacc.c (b4_state_num_type): Remove. All uses replaced by b4_int_type. (YY_CONVERT_INT_BEGIN, YY_CONVERT_INT_END): New macros. (yylac, yyparse): Use them around conversions that -Wconversion would give false alarms about. Omit unnecessary casts. (yy_stack_print): Use int rather than unsigned, and omit a cast that doesn’t seem to be needed here any more. * examples/c++/variant.yy (yylex): * examples/c++/variant-11.yy (yylex): Omit no-longer-needed conversions to unsigned. * src/InadequacyList.c (InadequacyList__new_conflict): Don’t assume *node_count is unsigned. * src/output.c (muscle_insert_unsigned_table): Remove; no longer used.
363 lines
9.6 KiB
C++
363 lines
9.6 KiB
C++
# C++ skeleton for Bison
|
|
|
|
# Copyright (C) 2002-2015, 2018-2019 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
m4_pushdef([b4_copyright_years],
|
|
[2002-2015, 2018-2019])
|
|
|
|
|
|
# b4_position_file
|
|
# ----------------
|
|
# Name of the file containing the position class, if we want this file.
|
|
b4_defines_if([b4_required_version_if([302], [],
|
|
[m4_define([b4_position_file], [position.hh])])])])
|
|
|
|
|
|
# b4_location_file
|
|
# ----------------
|
|
# Name of the file containing the position/location class,
|
|
# if we want this file.
|
|
b4_percent_define_check_file([b4_location_file],
|
|
[[api.location.file]],
|
|
b4_defines_if([[location.hh]]))
|
|
|
|
# b4_location_include
|
|
# -------------------
|
|
# If location.hh is to be generated, the name under which should it be
|
|
# included.
|
|
#
|
|
# b4_location_path
|
|
# ----------------
|
|
# The path to use for the CPP guard.
|
|
m4_ifdef([b4_location_file],
|
|
[m4_define([b4_location_include],
|
|
[b4_percent_define_get([[api.location.include]],
|
|
["b4_location_file"])])
|
|
m4_define([b4_location_path],
|
|
b4_percent_define_get([[api.location.include]],
|
|
["b4_dir_prefix[]b4_location_file"]))
|
|
m4_define([b4_location_path],
|
|
m4_substr(m4_defn([b4_location_path]), 1, m4_eval(m4_len(m4_defn([b4_location_path])) - 2)))
|
|
])
|
|
|
|
|
|
|
|
# b4_location_define
|
|
# ------------------
|
|
# Define the position and location classes.
|
|
m4_define([b4_location_define],
|
|
[[ /// A point in a source file.
|
|
class position
|
|
{
|
|
public:]m4_ifdef([b4_location_constructors], [[
|
|
/// Construct a position.
|
|
explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
|
int l = ]b4_location_initial_line[u,
|
|
int c = ]b4_location_initial_column[u)
|
|
: filename (f)
|
|
, line (l)
|
|
, column (c)
|
|
{}
|
|
|
|
]])[
|
|
/// Initialization.
|
|
void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
|
|
int l = ]b4_location_initial_line[u,
|
|
int c = ]b4_location_initial_column[u)
|
|
{
|
|
filename = fn;
|
|
line = l;
|
|
column = c;
|
|
}
|
|
|
|
/** \name Line and Column related manipulators
|
|
** \{ */
|
|
/// (line related) Advance to the COUNT next lines.
|
|
void lines (int count = 1)
|
|
{
|
|
if (count)
|
|
{
|
|
column = ]b4_location_initial_column[u;
|
|
line = add_ (line, count, ]b4_location_initial_line[);
|
|
}
|
|
}
|
|
|
|
/// (column related) Advance to the COUNT next columns.
|
|
void columns (int count = 1)
|
|
{
|
|
column = add_ (column, count, ]b4_location_initial_column[);
|
|
}
|
|
/** \} */
|
|
|
|
/// File name to which this position refers.
|
|
]b4_percent_define_get([[filename_type]])[* filename;
|
|
/// Current line number.
|
|
int line;
|
|
/// Current column number.
|
|
int column;
|
|
|
|
private:
|
|
/// Compute max (min, lhs+rhs).
|
|
static int add_ (int lhs, int rhs, int min)
|
|
{
|
|
return std::max (min, lhs + rhs);
|
|
}
|
|
};
|
|
|
|
/// Add \a width columns, in place.
|
|
inline position&
|
|
operator+= (position& res, int width)
|
|
{
|
|
res.columns (width);
|
|
return res;
|
|
}
|
|
|
|
/// Add \a width columns.
|
|
inline position
|
|
operator+ (position res, int width)
|
|
{
|
|
return res += width;
|
|
}
|
|
|
|
/// Subtract \a width columns, in place.
|
|
inline position&
|
|
operator-= (position& res, int width)
|
|
{
|
|
return res += -width;
|
|
}
|
|
|
|
/// Subtract \a width columns.
|
|
inline position
|
|
operator- (position res, int width)
|
|
{
|
|
return res -= width;
|
|
}
|
|
]b4_percent_define_flag_if([[define_location_comparison]], [[
|
|
/// Compare two position objects.
|
|
inline bool
|
|
operator== (const position& pos1, const position& pos2)
|
|
{
|
|
return (pos1.line == pos2.line
|
|
&& pos1.column == pos2.column
|
|
&& (pos1.filename == pos2.filename
|
|
|| (pos1.filename && pos2.filename
|
|
&& *pos1.filename == *pos2.filename)));
|
|
}
|
|
|
|
/// Compare two position objects.
|
|
inline bool
|
|
operator!= (const position& pos1, const position& pos2)
|
|
{
|
|
return !(pos1 == pos2);
|
|
}
|
|
]])[
|
|
/** \brief Intercept output stream redirection.
|
|
** \param ostr the destination output stream
|
|
** \param pos a reference to the position to redirect
|
|
*/
|
|
template <typename YYChar>
|
|
std::basic_ostream<YYChar>&
|
|
operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
|
|
{
|
|
if (pos.filename)
|
|
ostr << *pos.filename << ':';
|
|
return ostr << pos.line << '.' << pos.column;
|
|
}
|
|
|
|
/// Two points in a source file.
|
|
class location
|
|
{
|
|
public:
|
|
]m4_ifdef([b4_location_constructors], [
|
|
/// Construct a location from \a b to \a e.
|
|
location (const position& b, const position& e)
|
|
: begin (b)
|
|
, end (e)
|
|
{}
|
|
|
|
/// Construct a 0-width location in \a p.
|
|
explicit location (const position& p = position ())
|
|
: begin (p)
|
|
, end (p)
|
|
{}
|
|
|
|
/// Construct a 0-width location in \a f, \a l, \a c.
|
|
explicit location (]b4_percent_define_get([[filename_type]])[* f,
|
|
int l = ]b4_location_initial_line[u,
|
|
int c = ]b4_location_initial_column[u)
|
|
: begin (f, l, c)
|
|
, end (f, l, c)
|
|
{}
|
|
|
|
])[
|
|
/// Initialization.
|
|
void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
|
int l = ]b4_location_initial_line[u,
|
|
int c = ]b4_location_initial_column[u)
|
|
{
|
|
begin.initialize (f, l, c);
|
|
end = begin;
|
|
}
|
|
|
|
/** \name Line and Column related manipulators
|
|
** \{ */
|
|
public:
|
|
/// Reset initial location to final location.
|
|
void step ()
|
|
{
|
|
begin = end;
|
|
}
|
|
|
|
/// Extend the current location to the COUNT next columns.
|
|
void columns (int count = 1)
|
|
{
|
|
end += count;
|
|
}
|
|
|
|
/// Extend the current location to the COUNT next lines.
|
|
void lines (int count = 1)
|
|
{
|
|
end.lines (count);
|
|
}
|
|
/** \} */
|
|
|
|
|
|
public:
|
|
/// Beginning of the located region.
|
|
position begin;
|
|
/// End of the located region.
|
|
position end;
|
|
};
|
|
|
|
/// Join two locations, in place.
|
|
inline location& operator+= (location& res, const location& end)
|
|
{
|
|
res.end = end.end;
|
|
return res;
|
|
}
|
|
|
|
/// Join two locations.
|
|
inline location operator+ (location res, const location& end)
|
|
{
|
|
return res += end;
|
|
}
|
|
|
|
/// Add \a width columns to the end position, in place.
|
|
inline location& operator+= (location& res, int width)
|
|
{
|
|
res.columns (width);
|
|
return res;
|
|
}
|
|
|
|
/// Add \a width columns to the end position.
|
|
inline location operator+ (location res, int width)
|
|
{
|
|
return res += width;
|
|
}
|
|
|
|
/// Subtract \a width columns to the end position, in place.
|
|
inline location& operator-= (location& res, int width)
|
|
{
|
|
return res += -width;
|
|
}
|
|
|
|
/// Subtract \a width columns to the end position.
|
|
inline location operator- (location res, int width)
|
|
{
|
|
return res -= width;
|
|
}
|
|
]b4_percent_define_flag_if([[define_location_comparison]], [[
|
|
/// Compare two location objects.
|
|
inline bool
|
|
operator== (const location& loc1, const location& loc2)
|
|
{
|
|
return loc1.begin == loc2.begin && loc1.end == loc2.end;
|
|
}
|
|
|
|
/// Compare two location objects.
|
|
inline bool
|
|
operator!= (const location& loc1, const location& loc2)
|
|
{
|
|
return !(loc1 == loc2);
|
|
}
|
|
]])[
|
|
/** \brief Intercept output stream redirection.
|
|
** \param ostr the destination output stream
|
|
** \param loc a reference to the location to redirect
|
|
**
|
|
** Avoid duplicate information.
|
|
*/
|
|
template <typename YYChar>
|
|
std::basic_ostream<YYChar>&
|
|
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
|
|
{
|
|
int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
|
|
ostr << loc.begin;
|
|
if (loc.end.filename
|
|
&& (!loc.begin.filename
|
|
|| *loc.begin.filename != *loc.end.filename))
|
|
ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col;
|
|
else if (loc.begin.line < loc.end.line)
|
|
ostr << '-' << loc.end.line << '.' << end_col;
|
|
else if (loc.begin.column < end_col)
|
|
ostr << '-' << end_col;
|
|
return ostr;
|
|
}
|
|
]])
|
|
|
|
|
|
m4_ifdef([b4_position_file], [[
|
|
]b4_output_begin([b4_dir_prefix], [b4_position_file])[
|
|
]b4_generated_by[
|
|
// Starting with Bison 3.2, this file is useless: the structure it
|
|
// used to define is now defined in "]b4_location_file[".
|
|
//
|
|
// To get rid of this file:
|
|
// 1. add 'require "3.2"' (or newer) to your grammar file
|
|
// 2. remove references to this file from your build system
|
|
// 3. if you used to include it, include "]b4_location_file[" instead.
|
|
|
|
#include ]b4_location_include[
|
|
]b4_output_end[
|
|
]])
|
|
|
|
|
|
m4_ifdef([b4_location_file], [[
|
|
]b4_output_begin([b4_dir_prefix], [b4_location_file])[
|
|
]b4_copyright([Locations for Bison parsers in C++])[
|
|
/**
|
|
** \file ]b4_location_path[
|
|
** Define the ]b4_namespace_ref[::location class.
|
|
*/
|
|
|
|
]b4_cpp_guard_open([b4_location_path])[
|
|
|
|
# include <algorithm> // std::max
|
|
# include <iostream>
|
|
# include <string>
|
|
|
|
]b4_null_define[
|
|
|
|
]b4_namespace_open[
|
|
]b4_location_define[
|
|
]b4_namespace_close[
|
|
]b4_cpp_guard_close([b4_location_path])[
|
|
]b4_output_end[
|
|
]])
|
|
|
|
|
|
m4_popdef([b4_copyright_years])
|