mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33: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.
273 lines
7.0 KiB
C
273 lines
7.0 KiB
C
/* Scan Bison Skeletons. -*- C -*-
|
|
|
|
Copyright (C) 2001-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/>. */
|
|
|
|
%option nodefault noyywrap noinput nounput never-interactive debug
|
|
%option prefix="skel_" outfile="lex.yy.c"
|
|
|
|
%{
|
|
#include <dirname.h>
|
|
#include <error.h>
|
|
#include <path-join.h>
|
|
#include <quotearg.h>
|
|
|
|
#include <src/complain.h>
|
|
#include <src/files.h>
|
|
#include <src/getargs.h>
|
|
#include <src/scan-skel.h>
|
|
|
|
#define FLEX_PREFIX(Id) skel_ ## Id
|
|
#include <src/flex-scanner.h>
|
|
|
|
/* Work around a bug in flex 2.5.31. See Debian bug 333231
|
|
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333231>. */
|
|
#undef skel_wrap
|
|
#define skel_wrap() 1
|
|
|
|
#define YY_DECL static int skel_lex (void)
|
|
YY_DECL;
|
|
|
|
typedef void (*at_directive)(int, char**, char **, int*);
|
|
static void at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun);
|
|
static void at_basename (int argc, char *argv[], char**, int*);
|
|
static void at_complain (int argc, char *argv[], char**, int*);
|
|
static void at_output (int argc, char *argv[], char **name, int *lineno);
|
|
static void fail_for_at_directive_too_many_args (char const *at_directive_name);
|
|
static void fail_for_at_directive_too_few_args (char const *at_directive_name);
|
|
static void fail_for_invalid_at (char const *at);
|
|
%}
|
|
|
|
%x SC_AT_DIRECTIVE_ARGS
|
|
%x SC_AT_DIRECTIVE_SKIP_WS
|
|
|
|
%%
|
|
|
|
%{
|
|
int out_lineno PACIFY_CC (= 0);
|
|
char *out_name = NULL;
|
|
|
|
/* Currently, only the @complain directive takes multiple arguments, and
|
|
never more than 7, with argv[0] being the directive name and argv[1]
|
|
being the type of complaint to dispatch. */
|
|
#define ARGC_MAX 9
|
|
int argc = 0;
|
|
char *argv[ARGC_MAX];
|
|
at_directive at_ptr = NULL;
|
|
%}
|
|
|
|
"@@" fputc ('@', yyout);
|
|
"@{" fputc ('[', yyout);
|
|
"@}" fputc (']', yyout);
|
|
"@'" continue; /* Used by b4_cat in ../data/bison.m4. */
|
|
@\n continue;
|
|
|
|
"@oline@" fprintf (yyout, "%d", out_lineno + 1);
|
|
"@ofile@" fputs (quotearg_style (c_quoting_style, out_name), yyout);
|
|
|
|
"@basename(" at_init (&argc, argv, &at_ptr, &at_basename);
|
|
"@complain(" at_init (&argc, argv, &at_ptr, &at_complain);
|
|
"@output(" at_init (&argc, argv, &at_ptr, &at_output);
|
|
|
|
/* This pattern must not match more than the previous @ patterns. */
|
|
@[^@{}\'(\n]* fail_for_invalid_at (yytext);
|
|
\n out_lineno++; ECHO;
|
|
[^@\n]+ ECHO;
|
|
|
|
<INITIAL><<EOF>> {
|
|
if (out_name)
|
|
{
|
|
free (out_name);
|
|
xfclose (yyout);
|
|
}
|
|
return EOF;
|
|
}
|
|
|
|
<SC_AT_DIRECTIVE_ARGS>
|
|
{
|
|
[^@]+ STRING_GROW;
|
|
|
|
"@@" obstack_1grow (&obstack_for_string, '@');
|
|
"@{" obstack_1grow (&obstack_for_string, '[');
|
|
"@}" obstack_1grow (&obstack_for_string, ']');
|
|
"@'" continue; /* For starting an argument that begins with whitespace. */
|
|
@\n continue;
|
|
|
|
@[,)] {
|
|
if (argc >= ARGC_MAX)
|
|
fail_for_at_directive_too_many_args (argv[0]);
|
|
|
|
argv[argc++] = obstack_finish0 (&obstack_for_string);
|
|
|
|
/* Like M4, skip whitespace after a comma. */
|
|
if (yytext[1] == ',')
|
|
BEGIN SC_AT_DIRECTIVE_SKIP_WS;
|
|
else
|
|
{
|
|
aver (at_ptr);
|
|
at_ptr (argc, argv, &out_name, &out_lineno);
|
|
obstack_free (&obstack_for_string, argv[0]);
|
|
argc = 0;
|
|
BEGIN INITIAL;
|
|
}
|
|
}
|
|
|
|
@.? fail_for_invalid_at (yytext);
|
|
}
|
|
|
|
<SC_AT_DIRECTIVE_SKIP_WS>
|
|
{
|
|
[ \t\r\n] continue;
|
|
. yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS;
|
|
}
|
|
|
|
<SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>
|
|
{
|
|
<<EOF>> complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);
|
|
}
|
|
|
|
%%
|
|
|
|
static void
|
|
at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive fun)
|
|
{
|
|
*at_ptr = fun;
|
|
yytext[yyleng-1] = '\0';
|
|
obstack_grow (&obstack_for_string, yytext, yyleng);
|
|
argv[(*argc)++] = obstack_finish (&obstack_for_string);
|
|
BEGIN SC_AT_DIRECTIVE_ARGS;
|
|
}
|
|
|
|
/*------------------------.
|
|
| Scan a Bison skeleton. |
|
|
`------------------------*/
|
|
|
|
void
|
|
scan_skel (FILE *in)
|
|
{
|
|
static bool initialized = false;
|
|
if (!initialized)
|
|
{
|
|
initialized = true;
|
|
obstack_init (&obstack_for_string);
|
|
}
|
|
skel_in = in;
|
|
skel__flex_debug = trace_flag & trace_skeleton;
|
|
skel_lex ();
|
|
}
|
|
|
|
void
|
|
skel_scanner_free (void)
|
|
{
|
|
obstack_free (&obstack_for_string, 0);
|
|
/* Reclaim Flex's buffers. */
|
|
yylex_destroy ();
|
|
}
|
|
|
|
static inline warnings
|
|
flag (const char *arg)
|
|
{
|
|
/* compare with values issued from b4_error */
|
|
if (STREQ (arg, "complain"))
|
|
return complaint;
|
|
else if (STREQ (arg, "deprecated"))
|
|
return Wdeprecated;
|
|
else if (STREQ (arg, "fatal"))
|
|
return fatal;
|
|
else if (STREQ (arg, "note"))
|
|
return silent | complaint | no_caret;
|
|
else if (STREQ (arg, "warn"))
|
|
return Wother;
|
|
else
|
|
abort ();
|
|
}
|
|
|
|
static void
|
|
at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)
|
|
{
|
|
(void) out_namep;
|
|
(void) out_linenop;
|
|
if (2 < argc)
|
|
fail_for_at_directive_too_many_args (argv[0]);
|
|
fputs (last_component (argv[1]), yyout);
|
|
}
|
|
|
|
static void
|
|
at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
|
|
{
|
|
static int indent;
|
|
warnings w = flag (argv[1]);
|
|
location loc;
|
|
location *locp = NULL;
|
|
|
|
(void) out_namep;
|
|
(void) out_linenop;
|
|
|
|
if (argc < 4)
|
|
fail_for_at_directive_too_few_args (argv[0]);
|
|
if (argv[2] && argv[2][0])
|
|
{
|
|
boundary_set_from_string (&loc.start, argv[2]);
|
|
boundary_set_from_string (&loc.end, argv[3]);
|
|
locp = &loc;
|
|
}
|
|
if (w & silent)
|
|
indent += SUB_INDENT;
|
|
else
|
|
indent = 0;
|
|
complain_args (locp, w, &indent, argc - 4, argv + 4);
|
|
if (w & silent)
|
|
indent -= SUB_INDENT;
|
|
}
|
|
|
|
static void
|
|
at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
|
|
{
|
|
if (3 < argc)
|
|
fail_for_at_directive_too_many_args (argv[0]);
|
|
if (*out_namep)
|
|
{
|
|
free (*out_namep);
|
|
xfclose (yyout);
|
|
}
|
|
*out_namep = xpath_join (argv[1], 2 < argc ? argv[2] : NULL);
|
|
output_file_name_check (out_namep, true);
|
|
/* If there were errors, do not generate the output. */
|
|
yyout = xfopen (complaint_status ? "/dev/null" : *out_namep, "w");
|
|
*out_linenop = 1;
|
|
}
|
|
|
|
static void
|
|
fail_for_at_directive_too_few_args (char const *at_directive_name)
|
|
{
|
|
complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),
|
|
at_directive_name);
|
|
}
|
|
|
|
static void
|
|
fail_for_at_directive_too_many_args (char const *at_directive_name)
|
|
{
|
|
complain (NULL, fatal, _("too many arguments for %s directive in skeleton"),
|
|
at_directive_name);
|
|
}
|
|
|
|
static void
|
|
fail_for_invalid_at (char const *at)
|
|
{
|
|
complain (NULL, fatal, "invalid @ in skeleton: %s", at);
|
|
}
|