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.
154 lines
5.6 KiB
C
154 lines
5.6 KiB
C
/* IELR's inadequacy list.
|
|
|
|
Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of Bison, the GNU Compiler Compiler.
|
|
|
|
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/>. */
|
|
|
|
#ifndef INADEQUACY_LIST_H_
|
|
# define INADEQUACY_LIST_H_
|
|
|
|
# include <bitset.h>
|
|
# include "gram.h"
|
|
# include "state.h"
|
|
# include "symtab.h"
|
|
|
|
/**
|
|
* A unique ID assigned to every \c InadequacyList node.
|
|
*/
|
|
typedef long long InadequacyListNodeCount;
|
|
|
|
/**
|
|
* For a conflict, each rule in the grammar can have at most one contributing
|
|
* reduction except that rule 0 cannot have any because the reduction on rule 0
|
|
* cannot have lookaheads. For a conflict, exactly one shift can contribute.
|
|
* Thus the number of rules in the grammar is an upper bound on the number of
|
|
* possible contributions to any conflict. The maximum number of possible
|
|
* items in a state is also an upper bound, but the \c nitems member of \c
|
|
* state is currently a \c size_t and thus, if changed, risks becoming out of
|
|
* sync with this type. Whatever the type, it must support negatives for sake
|
|
* of the special values below.
|
|
*/
|
|
typedef rule_number ContributionIndex;
|
|
|
|
/* Special \c ContributionIndex used to indicate null result when looking for a
|
|
contribution. */
|
|
extern ContributionIndex const ContributionIndex__none;
|
|
|
|
/* Special \c ContributionIndex used by
|
|
\c AnnotationList__computeDominantContribution to signal when the action
|
|
chosen in a conflict is a syntax error because of a %nonassoc. */
|
|
extern ContributionIndex const ContributionIndex__error_action;
|
|
|
|
/**
|
|
* The description of a conflict. Don't break encapsulation by modifying the
|
|
* fields directly. Use the provided interface functions for
|
|
* \c InadequacyList.
|
|
*/
|
|
typedef struct {
|
|
/** The \c token passed to \c InadequacyList__new_conflict. */
|
|
symbol *token;
|
|
/** The \c actions passed to \c InadequacyList__new_conflict. */
|
|
bitset actions;
|
|
} Conflict;
|
|
|
|
/**
|
|
* A node in a list that describes all the inadequacies that manifest in a
|
|
* particular state. Don't break encapsulation by modifying the fields
|
|
* directly. Use the provided interface functions.
|
|
*/
|
|
typedef struct InadequacyList {
|
|
struct InadequacyList *next;
|
|
InadequacyListNodeCount id;
|
|
state *manifestingState;
|
|
ContributionIndex contributionCount;
|
|
union {
|
|
Conflict conflict;
|
|
} inadequacy;
|
|
} InadequacyList;
|
|
|
|
/**
|
|
* \pre
|
|
* - <tt>manifesting_state != NULL</tt>.
|
|
* - \c token is a token.
|
|
* - The size of \c actions is
|
|
* <tt>manifesting_state->reductions->num + 1</tt>.
|
|
* - If the set of all \c InadequacyList nodes with which the new
|
|
* \c InadequacyList node might be compared is currently empty, then
|
|
* it is best if <tt>*node_count</tt> is zero so that the node count
|
|
* does not eventually overflow. However, if that set is not
|
|
* currently empty, then <tt>*node_count</tt> has not been modified
|
|
* by any function except \c InadequacyList__new_conflict since the
|
|
* invocation of \c InadequacyList__new_conflict that constructed
|
|
* the first existing member of that set.
|
|
* \post
|
|
* - \c result is a new \c InadequacyList with one node indicating that, in
|
|
* \c manifesting_state, the following actions are in conflict on \c token:
|
|
* - Shift iff
|
|
* <tt>bitset_test (actions, manifesting_state->reductions->num)</tt>.
|
|
* - For any \c i such that
|
|
* <tt>0 <= i < manifesting_state->reductions->num</tt>, the reduction
|
|
* for the rule <tt>manifesting_state->reductions->rules[i]</tt> iff
|
|
* <tt>actions[i]</tt> is set.
|
|
* - Given any node \c n from the set of all existing
|
|
* \c InadequacyList nodes with which \c result might be compared
|
|
* such that <tt>n != result</tt>, then <tt>n->id < result->id</tt>.
|
|
* - \c result assumes responsibility for the memory of \c actions.
|
|
*/
|
|
InadequacyList *InadequacyList__new_conflict (
|
|
state *manifesting_state, symbol *token, bitset actions,
|
|
InadequacyListNodeCount *node_count);
|
|
|
|
/**
|
|
* \post
|
|
* - All memory associated with all nodes in the list \c self was freed.
|
|
*/
|
|
void InadequacyList__delete (InadequacyList *self);
|
|
|
|
/**
|
|
* \pre
|
|
* - <tt>self != NULL</tt>.
|
|
* \post
|
|
* - \c result = either:
|
|
* - \c ContributionIndex__none iff there is no shift contribution in
|
|
* \c self (perhaps because \c self isn't a conflict).
|
|
* - The index of the shift contribution, otherwise.
|
|
*/
|
|
ContributionIndex
|
|
InadequacyList__getShiftContributionIndex (InadequacyList const *self);
|
|
|
|
/**
|
|
* \pre
|
|
* - <tt>self != NULL</tt>.
|
|
* - <tt>0 <= i < self->contributionCount</tt>.
|
|
* \post
|
|
* - \c result = the token associated with contribution \c i in the
|
|
* inadequacy described by the node \c self.
|
|
*/
|
|
symbol *InadequacyList__getContributionToken (InadequacyList const *self,
|
|
ContributionIndex i);
|
|
|
|
/**
|
|
* \pre
|
|
* - \c self is a single node.
|
|
* - <tt>list != NULL</tt>.
|
|
* \post
|
|
* - \c list now contains \c self as its first node.
|
|
* - \c list assumes responsibility for the memory of \c self.
|
|
*/
|
|
void InadequacyList__prependTo (InadequacyList *self, InadequacyList **list);
|
|
|
|
#endif /* !INADEQUACY_LIST_H_ */
|