mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-10 04:43: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.
155 lines
3.6 KiB
Plaintext
155 lines
3.6 KiB
Plaintext
/*
|
|
Copyright (C) 2008-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/>.
|
|
*/
|
|
|
|
%require "3.2"
|
|
%debug
|
|
%language "c++"
|
|
%define api.token.constructor
|
|
%define api.value.type variant
|
|
%define api.value.automove
|
|
%define api.location.file none
|
|
%define parse.assert
|
|
%locations
|
|
|
|
%code requires // *.hh
|
|
{
|
|
#include <memory> // std::unique_ptr
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
using string_uptr = std::unique_ptr<std::string>;
|
|
using string_uptrs = std::vector<string_uptr>;
|
|
}
|
|
|
|
%code // *.cc
|
|
{
|
|
#include <climits> // INT_MIN, INT_MAX
|
|
#include <iostream>
|
|
#include <sstream>
|
|
|
|
namespace yy
|
|
{
|
|
// Prototype of the yylex function providing subsequent tokens.
|
|
static parser::symbol_type yylex ();
|
|
|
|
// Print a vector of strings.
|
|
std::ostream&
|
|
operator<< (std::ostream& o, const string_uptrs& ss)
|
|
{
|
|
o << '{';
|
|
const char *sep = "";
|
|
for (const auto& s: ss)
|
|
{
|
|
o << sep << *s;
|
|
sep = ", ";
|
|
}
|
|
return o << '}';
|
|
}
|
|
}
|
|
|
|
template <typename... Args>
|
|
string_uptr
|
|
make_string_uptr (Args&&... args)
|
|
{
|
|
// std::make_unique is C++14.
|
|
return string_uptr (new std::string{std::forward<Args> (args)...});
|
|
}
|
|
}
|
|
|
|
%token <string_uptr> TEXT;
|
|
%token <int> NUMBER;
|
|
%printer { yyo << '(' << &$$ << ") " << $$; } <*>;
|
|
%printer { yyo << *$$; } <string_uptr>;
|
|
%token END_OF_FILE 0;
|
|
|
|
%type <string_uptr> item;
|
|
%type <string_uptrs> list;
|
|
|
|
%%
|
|
|
|
result:
|
|
list { std::cout << $1 << '\n'; }
|
|
;
|
|
|
|
list:
|
|
%empty { /* Generates an empty string list */ }
|
|
| list item { $$ = $1; $$.emplace_back ($2); }
|
|
;
|
|
|
|
item:
|
|
TEXT
|
|
| NUMBER { $$ = make_string_uptr (std::to_string ($1)); }
|
|
;
|
|
%%
|
|
|
|
// The last number return by the scanner is max - 1.
|
|
int max = 4;
|
|
|
|
namespace yy
|
|
{
|
|
// The yylex function providing subsequent tokens:
|
|
// TEXT "I have three numbers for you."
|
|
// NUMBER 1
|
|
// NUMBER 2
|
|
// NUMBER ...
|
|
// NUMBER max - 1
|
|
// TEXT "And that's all!"
|
|
// END_OF_FILE
|
|
|
|
static
|
|
parser::symbol_type
|
|
yylex ()
|
|
{
|
|
static int count = 0;
|
|
const int stage = count;
|
|
++count;
|
|
auto loc = parser::location_type{nullptr, stage + 1, stage + 1};
|
|
if (stage == 0)
|
|
return parser::make_TEXT (make_string_uptr ("I have numbers for you."), std::move (loc));
|
|
else if (stage < max)
|
|
return parser::make_NUMBER (stage, std::move (loc));
|
|
else if (stage == max)
|
|
return parser::make_TEXT (make_string_uptr ("And that's all!"), std::move (loc));
|
|
else
|
|
return parser::make_END_OF_FILE (std::move (loc));
|
|
}
|
|
|
|
// Mandatory error function
|
|
void
|
|
parser::error (const parser::location_type& loc, const std::string& msg)
|
|
{
|
|
std::cerr << loc << ": " << msg << '\n';
|
|
}
|
|
}
|
|
|
|
int
|
|
main (int argc, const char *argv[])
|
|
{
|
|
if (2 <= argc && isdigit (*argv[1]))
|
|
{
|
|
auto maxl = strtol (argv[1], nullptr, 10);
|
|
max = INT_MIN <= maxl && maxl <= INT_MAX ? int(maxl) : 4;
|
|
}
|
|
auto&& p = yy::parser{};
|
|
p.set_debug_level (!!getenv ("YYDEBUG"));
|
|
return p.parse ();
|
|
}
|
|
|
|
// Local Variables:
|
|
// mode: C++
|
|
// End:
|