mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
d24cce8e7f
Fix non-numeric exclusive Range#minmax bug
The implementation of Range#minmax added in d5c60214c4 causes the
following incorrect behaviour:
('a'...'c').minmax => ["a", ["a", "b"]]
instead of
('a'...'c').minmax => ["a", "b"]
This is because the C implementation of Range#minmax (range_minmax)
directly delegates to the C implementation of Range#min (range_min) and
Range#max (range_max), without changing the execution context.
Range#max's C implementation (range_max), when given a non-numeric
exclusive range, delegates to super, which is meant to call
Enumerable#max. However, because range_max is called directly by
range_minmax, super calls Enumerable#minmax instead, causing the
incorrect nesting.
Perhaps it is possible to change the execution context in an optimized
manner, but the simplest solution seems to be to just explicitly
delegate from Range#minmax to Range#min and Range#max.
Use static variables in Range#minmax
77 lines
2.3 KiB
C
77 lines
2.3 KiB
C
# define RUBY_VERSION_MAJOR RUBY_API_VERSION_MAJOR
|
|
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
|
|
#define RUBY_VERSION_TEENY 1
|
|
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
|
|
#define RUBY_PATCHLEVEL 97
|
|
|
|
#define RUBY_RELEASE_YEAR 2020
|
|
#define RUBY_RELEASE_MONTH 7
|
|
#define RUBY_RELEASE_DAY 19
|
|
|
|
#include "ruby/version.h"
|
|
|
|
#ifndef TOKEN_PASTE
|
|
#define TOKEN_PASTE(x,y) x##y
|
|
#endif
|
|
#define ONLY_ONE_DIGIT(x) TOKEN_PASTE(10,x) < 1000
|
|
#define WITH_ZERO_PADDING(x) TOKEN_PASTE(0,x)
|
|
#define RUBY_BIRTH_YEAR_STR STRINGIZE(RUBY_BIRTH_YEAR)
|
|
#define RUBY_RELEASE_YEAR_STR STRINGIZE(RUBY_RELEASE_YEAR)
|
|
#if ONLY_ONE_DIGIT(RUBY_RELEASE_MONTH)
|
|
#define RUBY_RELEASE_MONTH_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_MONTH))
|
|
#else
|
|
#define RUBY_RELEASE_MONTH_STR STRINGIZE(RUBY_RELEASE_MONTH)
|
|
#endif
|
|
#if ONLY_ONE_DIGIT(RUBY_RELEASE_DAY)
|
|
#define RUBY_RELEASE_DAY_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_DAY))
|
|
#else
|
|
#define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
|
|
#endif
|
|
|
|
#if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
|
|
# if RUBY_LIB_VERSION_STYLE == 3
|
|
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)"."STRINGIZE(RUBY_API_VERSION_TEENY)
|
|
# elif RUBY_LIB_VERSION_STYLE == 2
|
|
# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)
|
|
# endif
|
|
#endif
|
|
|
|
#if RUBY_PATCHLEVEL == -1
|
|
#define RUBY_PATCHLEVEL_STR "dev"
|
|
#else
|
|
#define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
|
|
#endif
|
|
|
|
#ifndef RUBY_REVISION
|
|
# include "revision.h"
|
|
#endif
|
|
|
|
#ifdef RUBY_REVISION
|
|
# if RUBY_PATCHLEVEL == -1
|
|
# ifndef RUBY_BRANCH_NAME
|
|
# define RUBY_BRANCH_NAME "master"
|
|
# endif
|
|
# define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "RUBY_REVISION
|
|
# else
|
|
# define RUBY_REVISION_STR " revision "RUBY_REVISION
|
|
# endif
|
|
#else
|
|
# define RUBY_REVISION "HEAD"
|
|
# define RUBY_REVISION_STR ""
|
|
#endif
|
|
#if !defined RUBY_RELEASE_DATETIME || RUBY_PATCHLEVEL != -1
|
|
# undef RUBY_RELEASE_DATETIME
|
|
# define RUBY_RELEASE_DATETIME RUBY_RELEASE_DATE
|
|
#endif
|
|
|
|
# define RUBY_DESCRIPTION_WITH(opt) \
|
|
"ruby "RUBY_VERSION \
|
|
RUBY_PATCHLEVEL_STR \
|
|
" ("RUBY_RELEASE_DATETIME \
|
|
RUBY_REVISION_STR")"opt" " \
|
|
"["RUBY_PLATFORM"]"
|
|
# define RUBY_COPYRIGHT \
|
|
"ruby - Copyright (C) " \
|
|
RUBY_BIRTH_YEAR_STR"-" \
|
|
RUBY_RELEASE_YEAR_STR" " \
|
|
RUBY_AUTHOR
|