Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

%require: accept version numbers with three parts ("3.7.4")

Browse Source 
* src/parse-gram.y (str_to_version): Support three parts.
* data/skeletons/location.cc, data/skeletons/stack.hh:
Adjust.
This commit is contained in:
Akim Demaille
2020-11-10 08:19:33 +01:00
parent c47bb87f9f
commit 14c65a35f0
4 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/skeletons/location.cc
View File

@@ -22,7 +22,7 @@ m4_pushdef([b4_copyright_years],
# b4_position_file # b4_position_file
# ---------------- # ----------------
# Name of the file containing the position class, if we want this file. # Name of the file containing the position class, if we want this file.
b4_defines_if([b4_required_version_if([302], [], b4_defines_if([b4_required_version_if([30200], [],
[m4_define([b4_position_file], [position.hh])])])]) [m4_define([b4_position_file], [position.hh])])])])

2
data/skeletons/stack.hh
View File

@@ -19,7 +19,7 @@
# b4_stack_file # b4_stack_file
# ------------- # -------------
# Name of the file containing the stack class, if we want this file. # Name of the file containing the stack class, if we want this file.
b4_defines_if([b4_required_version_if([302], [], b4_defines_if([b4_required_version_if([30200], [],
[m4_define([b4_stack_file], [stack.hh])])]) [m4_define([b4_stack_file], [stack.hh])])])

47
src/parse-gram.c
View File

@@ -3032,11 +3032,9 @@ handle_pure_parser (location const *loc, char const *directive)
} }
/* Convert VERSION into an int (MAJOR * 100 + MINOR). Return -1 on /* Convert VERSION into an int (MAJOR * 10000 + MINOR * 100 + MICRO).
errors. E.g., "3.7.4" => 30704, "3.8" => 30800.
Return -1 on errors. */
Changes of behavior are only on minor version changes, so "3.0.5"
is the same as "3.0": 300. */
static int static int
str_to_version (char const *version) str_to_version (char const *version)
{ {
@@ -3044,18 +3042,35 @@ str_to_version (char const *version)
int res = 0; int res = 0;
errno = 0; errno = 0;
char *cp = NULL; char *cp = NULL;
long major = strtol (version, &cp, 10);
if (errno || cp == version || *cp != '.' || major < 0
|| INT_MULTIPLY_WRAPV (major, 100, &res))
return -1;
++cp; {
char *cp1 = NULL; long major = strtol (version, &cp, 10);
long minor = strtol (cp, &cp1, 10); if (errno || cp == version || *cp != '.' || major < 0
if (errno || cp1 == cp || (*cp1 != '\0' && *cp1 != '.') || INT_MULTIPLY_WRAPV (major, 10000, &res))
|| ! (0 <= minor && minor < 100) return -1;
|| INT_ADD_WRAPV (minor, res, &res)) }
return -1;
{
++cp;
char *prev = cp;
long minor = strtol (cp, &cp, 10);
if (errno || cp == prev || (*cp != '\0' && *cp != '.')
|| ! (0 <= minor && minor < 100)
|| INT_MULTIPLY_WRAPV (minor, 100, &minor)
|| INT_ADD_WRAPV (minor, res, &res))
return -1;
}
if (*cp == '.')
{
++cp;
char *prev = cp;
long micro = strtol (cp, &cp, 10);
if (errno || cp == prev || (*cp != '\0' && *cp != '.')
|| ! (0 <= micro && micro < 100)
|| INT_ADD_WRAPV (micro, res, &res))
return -1;
}
IGNORE_TYPE_LIMITS_END IGNORE_TYPE_LIMITS_END
return res; return res;

47
src/parse-gram.y
View File

@@ -1043,11 +1043,9 @@ handle_pure_parser (location const *loc, char const *directive)
} }
/* Convert VERSION into an int (MAJOR * 100 + MINOR). Return -1 on /* Convert VERSION into an int (MAJOR * 10000 + MINOR * 100 + MICRO).
errors. E.g., "3.7.4" => 30704, "3.8" => 30800.
Return -1 on errors. */
Changes of behavior are only on minor version changes, so "3.0.5"
is the same as "3.0": 300. */
static int static int
str_to_version (char const *version) str_to_version (char const *version)
{ {
@@ -1055,18 +1053,35 @@ str_to_version (char const *version)
int res = 0; int res = 0;
errno = 0; errno = 0;
char *cp = NULL; char *cp = NULL;
long major = strtol (version, &cp, 10);
if (errno || cp == version || *cp != '.' || major < 0
|| INT_MULTIPLY_WRAPV (major, 100, &res))
return -1;
++cp; {
char *cp1 = NULL; long major = strtol (version, &cp, 10);
long minor = strtol (cp, &cp1, 10); if (errno || cp == version || *cp != '.' || major < 0
if (errno || cp1 == cp || (*cp1 != '\0' && *cp1 != '.') || INT_MULTIPLY_WRAPV (major, 10000, &res))
|| ! (0 <= minor && minor < 100) return -1;
|| INT_ADD_WRAPV (minor, res, &res)) }
return -1;
{
++cp;
char *prev = cp;
long minor = strtol (cp, &cp, 10);
if (errno || cp == prev || (*cp != '\0' && *cp != '.')
|| ! (0 <= minor && minor < 100)
|| INT_MULTIPLY_WRAPV (minor, 100, &minor)
|| INT_ADD_WRAPV (minor, res, &res))
return -1;
}
if (*cp == '.')
{
++cp;
char *prev = cp;
long micro = strtol (cp, &cp, 10);
if (errno || cp == prev || (*cp != '\0' && *cp != '.')
|| ! (0 <= micro && micro < 100)
|| INT_ADD_WRAPV (micro, res, &res))
return -1;
}
IGNORE_TYPE_LIMITS_END IGNORE_TYPE_LIMITS_END
return res; return res;