mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-14 06:43:03 +00:00
Merge maint into master
* upstream/maint: (48 commits) THANKS: update an address tests: adjust syncline tests to GCC 7 glr: fix improperly placed synclines bison: be git grep friendly Replace ftp with https maint: post-release administrivia version 3.0.5 bison: style: indentation fixes regen bison: please address sanitizer C++: style: fix indentation NEWS: update C++: style: prefer `unsigned` to `unsigned int` C++: style: space before paren C++: fix -Wdeprecated warnings tests: fix -Wdeprecated warning maint: update syntax-check exclusions autoconf: update regen Update copyright years ...
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* Bison Grammar Parser -*- C -*-
|
||||
|
||||
Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of Bison, the GNU Compiler Compiler.
|
||||
|
||||
@@ -780,7 +780,7 @@ translate_code_braceless (char *code, location loc)
|
||||
static void
|
||||
add_param (param_type type, char *decl, location loc)
|
||||
{
|
||||
static char const alphanum[26 + 26 + 1 + 10] =
|
||||
static char const alphanum[26 + 26 + 1 + 10 + 1] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"_"
|
||||
@@ -792,18 +792,18 @@ add_param (param_type type, char *decl, location loc)
|
||||
/* Stop on last actual character. */
|
||||
for (p = decl; p[1]; p++)
|
||||
if ((p == decl
|
||||
|| ! memchr (alphanum, p[-1], sizeof alphanum))
|
||||
&& memchr (alphanum, p[0], sizeof alphanum - 10))
|
||||
|| ! memchr (alphanum, p[-1], sizeof alphanum - 1))
|
||||
&& memchr (alphanum, p[0], sizeof alphanum - 10 - 1))
|
||||
name_start = p;
|
||||
|
||||
/* Strip the surrounding '{' and '}', and any blanks just inside
|
||||
the braces. */
|
||||
--p;
|
||||
while (c_isspace ((unsigned char) *p))
|
||||
while (c_isspace ((unsigned char) *p))
|
||||
--p;
|
||||
p[1] = '\0';
|
||||
++decl;
|
||||
while (c_isspace ((unsigned char) *decl))
|
||||
while (c_isspace ((unsigned char) *decl))
|
||||
++decl;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user