mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
759 lines
18 KiB
C
759 lines
18 KiB
C
/**********************************************************************
|
|
|
|
range.c -
|
|
|
|
$Author$
|
|
$Date$
|
|
created at: Thu Aug 19 17:46:47 JST 1993
|
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
|
|
|
**********************************************************************/
|
|
|
|
#include "ruby.h"
|
|
|
|
VALUE rb_cRange;
|
|
static ID id_cmp, id_succ, id_beg, id_end, id_excl;
|
|
|
|
#define EXCL(r) RTEST(rb_ivar_get((r), id_excl))
|
|
#define SET_EXCL(r,v) rb_ivar_set((r), id_excl, (v) ? Qtrue : Qfalse)
|
|
|
|
static VALUE
|
|
range_failed(void)
|
|
{
|
|
rb_raise(rb_eArgError, "bad value for range");
|
|
return Qnil; /* dummy */
|
|
}
|
|
|
|
static VALUE
|
|
range_check(VALUE *args)
|
|
{
|
|
return rb_funcall(args[0], id_cmp, 1, args[1]);
|
|
}
|
|
|
|
static void
|
|
range_init(VALUE range, VALUE beg, VALUE end, int exclude_end)
|
|
{
|
|
VALUE args[2];
|
|
|
|
args[0] = beg;
|
|
args[1] = end;
|
|
|
|
if (!FIXNUM_P(beg) || !FIXNUM_P(end)) {
|
|
VALUE v;
|
|
|
|
v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
|
|
if (NIL_P(v)) range_failed();
|
|
}
|
|
|
|
SET_EXCL(range, exclude_end);
|
|
rb_ivar_set(range, id_beg, beg);
|
|
rb_ivar_set(range, id_end, end);
|
|
}
|
|
|
|
VALUE
|
|
rb_range_new(VALUE beg, VALUE end, int exclude_end)
|
|
{
|
|
VALUE range = rb_obj_alloc(rb_cRange);
|
|
|
|
range_init(range, beg, end, exclude_end);
|
|
return range;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* Range.new(start, end, exclusive=false) => range
|
|
*
|
|
* Constructs a range using the given <i>start</i> and <i>end</i>. If the third
|
|
* parameter is omitted or is <code>false</code>, the <i>range</i> will include
|
|
* the end object; otherwise, it will be excluded.
|
|
*/
|
|
|
|
static VALUE
|
|
range_initialize(int argc, VALUE *argv, VALUE range)
|
|
{
|
|
VALUE beg, end, flags;
|
|
|
|
rb_scan_args(argc, argv, "21", &beg, &end, &flags);
|
|
/* Ranges are immutable, so that they should be initialized only once. */
|
|
if (rb_ivar_defined(range, id_beg)) {
|
|
rb_name_error(rb_intern("initialize"), "`initialize' called twice");
|
|
}
|
|
range_init(range, beg, end, RTEST(flags));
|
|
return Qnil;
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.exclude_end? => true or false
|
|
*
|
|
* Returns <code>true</code> if <i>rng</i> excludes its end value.
|
|
*/
|
|
|
|
static VALUE
|
|
range_exclude_end_p(VALUE range)
|
|
{
|
|
return EXCL(range) ? Qtrue : Qfalse;
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng == obj => true or false
|
|
*
|
|
* Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
|
|
* beginning and end items (by comparing them with <code>==</code>), and has
|
|
* the same #exclude_end? setting as <i>rng</t>.
|
|
*
|
|
* (0..2) == (0..2) #=> true
|
|
* (0..2) == Range.new(0,2) #=> true
|
|
* (0..2) == (0...2) #=> false
|
|
*
|
|
*/
|
|
|
|
static VALUE
|
|
range_eq(VALUE range, VALUE obj)
|
|
{
|
|
if (range == obj) return Qtrue;
|
|
if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
|
|
return Qfalse;
|
|
|
|
if (!rb_equal(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
|
|
return Qfalse;
|
|
if (!rb_equal(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end)))
|
|
return Qfalse;
|
|
|
|
if (EXCL(range) != EXCL(obj)) return Qfalse;
|
|
|
|
return Qtrue;
|
|
}
|
|
|
|
static int
|
|
r_lt(VALUE a, VALUE b)
|
|
{
|
|
VALUE r = rb_funcall(a, id_cmp, 1, b);
|
|
|
|
if (NIL_P(r)) return Qfalse;
|
|
if (rb_cmpint(r, a, b) < 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
static int
|
|
r_le(VALUE a, VALUE b)
|
|
{
|
|
int c;
|
|
VALUE r = rb_funcall(a, id_cmp, 1, b);
|
|
|
|
if (NIL_P(r)) return Qfalse;
|
|
c = rb_cmpint(r, a, b);
|
|
if (c == 0) return INT2FIX(0);
|
|
if (c < 0) return Qtrue;
|
|
return Qfalse;
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.eql?(obj) => true or false
|
|
*
|
|
* Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
|
|
* beginning and end items (by comparing them with #eql?), and has the same
|
|
* #exclude_end? setting as <i>rng</i>.
|
|
*
|
|
* (0..2) == (0..2) #=> true
|
|
* (0..2) == Range.new(0,2) #=> true
|
|
* (0..2) == (0...2) #=> false
|
|
*
|
|
*/
|
|
|
|
static VALUE
|
|
range_eql(VALUE range, VALUE obj)
|
|
{
|
|
if (range == obj) return Qtrue;
|
|
if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
|
|
return Qfalse;
|
|
|
|
if (!rb_eql(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
|
|
return Qfalse;
|
|
if (!rb_eql(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end)))
|
|
return Qfalse;
|
|
|
|
if (EXCL(range) != EXCL(obj)) return Qfalse;
|
|
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.hash => fixnum
|
|
*
|
|
* Generate a hash value such that two ranges with the same start and
|
|
* end points, and the same value for the "exclude end" flag, generate
|
|
* the same hash value.
|
|
*/
|
|
|
|
static VALUE
|
|
range_hash(VALUE range)
|
|
{
|
|
long hash = EXCL(range);
|
|
VALUE v;
|
|
|
|
v = rb_hash(rb_ivar_get(range, id_beg));
|
|
hash ^= v << 1;
|
|
v = rb_hash(rb_ivar_get(range, id_end));
|
|
hash ^= v << 9;
|
|
hash ^= EXCL(range) << 24;
|
|
|
|
return LONG2FIX(hash);
|
|
}
|
|
|
|
static VALUE
|
|
str_step(VALUE arg)
|
|
{
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
return rb_str_upto(args[0], args[1], EXCL(args[2]));
|
|
}
|
|
|
|
static void
|
|
range_each_func(VALUE range, VALUE (*func) (VALUE, void *), VALUE v, VALUE e, void *arg)
|
|
{
|
|
int c;
|
|
|
|
if (EXCL(range)) {
|
|
while (r_lt(v, e)) {
|
|
(*func)(v, arg);
|
|
v = rb_funcall(v, id_succ, 0, 0);
|
|
}
|
|
}
|
|
else {
|
|
while (RTEST(c = r_le(v, e))) {
|
|
(*func)(v, arg);
|
|
if (c == INT2FIX(0)) break;
|
|
v = rb_funcall(v, id_succ, 0, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
static VALUE
|
|
step_i(VALUE i, void *arg)
|
|
{
|
|
long *iter = (long *)arg;
|
|
|
|
iter[0]--;
|
|
if (iter[0] == 0) {
|
|
rb_yield(i);
|
|
iter[0] = iter[1];
|
|
}
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.step(n=1) {| obj | block } => rng
|
|
*
|
|
* Iterates over <i>rng</i>, passing each <i>n</i>th element to the block. If
|
|
* the range contains numbers or strings, natural ordering is used. Otherwise
|
|
* <code>step</code> invokes <code>succ</code> to iterate through range
|
|
* elements. The following code uses class <code>Xs</code>, which is defined
|
|
* in the class-level documentation.
|
|
*
|
|
* range = Xs.new(1)..Xs.new(10)
|
|
* range.step(2) {|x| puts x}
|
|
* range.step(3) {|x| puts x}
|
|
*
|
|
* <em>produces:</em>
|
|
*
|
|
* 1 x
|
|
* 3 xxx
|
|
* 5 xxxxx
|
|
* 7 xxxxxxx
|
|
* 9 xxxxxxxxx
|
|
* 1 x
|
|
* 4 xxxx
|
|
* 7 xxxxxxx
|
|
* 10 xxxxxxxxxx
|
|
*/
|
|
|
|
|
|
static VALUE
|
|
range_step(int argc, VALUE *argv, VALUE range)
|
|
{
|
|
VALUE b, e, step;
|
|
long unit;
|
|
|
|
RETURN_ENUMERATOR(range, argc, argv);
|
|
|
|
b = rb_ivar_get(range, id_beg);
|
|
e = rb_ivar_get(range, id_end);
|
|
if (rb_scan_args(argc, argv, "01", &step) == 0) {
|
|
step = INT2FIX(1);
|
|
}
|
|
|
|
unit = NUM2LONG(step);
|
|
if (unit < 0) {
|
|
rb_raise(rb_eArgError, "step can't be negative");
|
|
}
|
|
if (unit == 0) rb_raise(rb_eArgError, "step can't be 0");
|
|
if (FIXNUM_P(b) && FIXNUM_P(e)) { /* fixnums are special */
|
|
long end = FIX2LONG(e);
|
|
long i;
|
|
|
|
if (!EXCL(range)) end += 1;
|
|
for (i=FIX2LONG(b); i<end; i+=unit) {
|
|
rb_yield(LONG2NUM(i));
|
|
}
|
|
}
|
|
else {
|
|
VALUE tmp = rb_check_string_type(b);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
VALUE args[5];
|
|
long iter[2];
|
|
|
|
b = tmp;
|
|
args[0] = b; args[1] = e; args[2] = range;
|
|
iter[0] = 1; iter[1] = unit;
|
|
rb_iterate(str_step, (VALUE)args, step_i, (VALUE)iter);
|
|
}
|
|
else if (rb_obj_is_kind_of(b, rb_cNumeric)) {
|
|
ID c = rb_intern(EXCL(range) ? "<" : "<=");
|
|
|
|
if (rb_equal(step, INT2FIX(0))) rb_raise(rb_eArgError, "step can't be 0");
|
|
while (RTEST(rb_funcall(b, c, 1, e))) {
|
|
rb_yield(b);
|
|
b = rb_funcall(b, '+', 1, step);
|
|
}
|
|
}
|
|
else {
|
|
long args[2];
|
|
|
|
if (!rb_respond_to(b, id_succ)) {
|
|
rb_raise(rb_eTypeError, "can't iterate from %s",
|
|
rb_obj_classname(b));
|
|
}
|
|
args[0] = 1;
|
|
args[1] = unit;
|
|
range_each_func(range, step_i, b, e, args);
|
|
}
|
|
}
|
|
return range;
|
|
}
|
|
|
|
static VALUE
|
|
each_i(VALUE v, void *arg)
|
|
{
|
|
rb_yield(v);
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.each {| i | block } => rng
|
|
*
|
|
* Iterates over the elements <i>rng</i>, passing each in turn to the
|
|
* block. You can only iterate if the start object of the range
|
|
* supports the +succ+ method (which means that you can't iterate over
|
|
* ranges of +Float+ objects).
|
|
*
|
|
* (10..15).each do |n|
|
|
* print n, ' '
|
|
* end
|
|
*
|
|
* <em>produces:</em>
|
|
*
|
|
* 10 11 12 13 14 15
|
|
*/
|
|
|
|
static VALUE
|
|
range_each(VALUE range)
|
|
{
|
|
VALUE beg, end;
|
|
|
|
RETURN_ENUMERATOR(range, 0, 0);
|
|
|
|
beg = rb_ivar_get(range, id_beg);
|
|
end = rb_ivar_get(range, id_end);
|
|
|
|
if (!rb_respond_to(beg, id_succ)) {
|
|
rb_raise(rb_eTypeError, "can't iterate from %s",
|
|
rb_obj_classname(beg));
|
|
}
|
|
if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
|
|
long lim = FIX2LONG(end);
|
|
long i;
|
|
|
|
if (!EXCL(range)) lim += 1;
|
|
for (i=FIX2LONG(beg); i<lim; i++) {
|
|
rb_yield(LONG2NUM(i));
|
|
}
|
|
}
|
|
else if (TYPE(beg) == T_STRING) {
|
|
VALUE args[5];
|
|
long iter[2];
|
|
|
|
args[0] = beg; args[1] = end; args[2] = range;
|
|
iter[0] = 1; iter[1] = 1;
|
|
rb_iterate(str_step, (VALUE)args, step_i, (VALUE)iter);
|
|
}
|
|
else {
|
|
range_each_func(range, each_i, beg, end, NULL);
|
|
}
|
|
return range;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.first => obj
|
|
* rng.begin => obj
|
|
*
|
|
* Returns the first object in <i>rng</i>.
|
|
*/
|
|
|
|
static VALUE
|
|
range_first(VALUE range)
|
|
{
|
|
return rb_ivar_get(range, id_beg);
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.end => obj
|
|
* rng.last => obj
|
|
*
|
|
* Returns the object that defines the end of <i>rng</i>.
|
|
*
|
|
* (1..10).end #=> 10
|
|
* (1...10).end #=> 10
|
|
*/
|
|
|
|
|
|
static VALUE
|
|
range_last(VALUE range)
|
|
{
|
|
return rb_ivar_get(range, id_end);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.min => obj
|
|
* rng.min {| a,b | block } => obj
|
|
*
|
|
* Returns the minimum value in <i>rng</i>. The second uses
|
|
* the block to compare values. Returns nil if the first
|
|
* value in range is larger than the last value.
|
|
*
|
|
*/
|
|
|
|
|
|
static VALUE
|
|
range_min(VALUE range)
|
|
{
|
|
if (rb_block_given_p()) {
|
|
return rb_call_super(0, 0);
|
|
}
|
|
else {
|
|
VALUE b = rb_ivar_get(range, id_beg);
|
|
VALUE e = rb_ivar_get(range, id_end);
|
|
int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
|
|
|
|
if (c > 0) return Qnil;
|
|
return b;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.max => obj
|
|
* rng.max {| a,b | block } => obj
|
|
*
|
|
* Returns the maximum value in <i>rng</i>. The second uses
|
|
* the block to compare values. Returns nil if the first
|
|
* value in range is larger than the last value.
|
|
*
|
|
*/
|
|
|
|
|
|
static VALUE
|
|
range_max(VALUE range)
|
|
{
|
|
VALUE e = rb_ivar_get(range, id_end);
|
|
int ip = FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cInteger);
|
|
|
|
if (rb_block_given_p() || (EXCL(range) && !ip)) {
|
|
return rb_call_super(0, 0);
|
|
}
|
|
else {
|
|
VALUE b = rb_ivar_get(range, id_beg);
|
|
int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
|
|
|
|
if (c > 0) return Qnil;
|
|
if (EXCL(range)) {
|
|
if (FIXNUM_P(e)) {
|
|
return INT2NUM(FIX2INT(e)-1);
|
|
}
|
|
return rb_funcall(e, '-', 1, INT2FIX(1));
|
|
}
|
|
return e;
|
|
}
|
|
}
|
|
|
|
VALUE
|
|
rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err)
|
|
{
|
|
VALUE b, e;
|
|
long beg, end, excl;
|
|
|
|
if (rb_obj_is_kind_of(range, rb_cRange)) {
|
|
b = rb_ivar_get(range, id_beg);
|
|
e = rb_ivar_get(range, id_end);
|
|
excl = EXCL(range);
|
|
}
|
|
else {
|
|
b = rb_check_to_integer(range, "begin");
|
|
if (NIL_P(b)) return Qfalse;
|
|
e = rb_check_to_integer(range, "end");
|
|
if (NIL_P(e)) return Qfalse;
|
|
excl = RTEST(rb_funcall(range, rb_intern("exclude_end?"), 0));
|
|
}
|
|
beg = NUM2LONG(b);
|
|
end = NUM2LONG(e);
|
|
|
|
if (beg < 0) {
|
|
beg += len;
|
|
if (beg < 0) goto out_of_range;
|
|
}
|
|
if (err == 0 || err == 2) {
|
|
if (beg > len) goto out_of_range;
|
|
if (end > len) end = len;
|
|
}
|
|
if (end < 0) end += len;
|
|
if (!excl) end++; /* include end point */
|
|
len = end - beg;
|
|
if (len < 0) len = 0;
|
|
|
|
*begp = beg;
|
|
*lenp = len;
|
|
return Qtrue;
|
|
|
|
out_of_range:
|
|
if (err) {
|
|
rb_raise(rb_eRangeError, "%ld..%s%ld out of range",
|
|
b, excl ? "." : "", e);
|
|
}
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.to_s => string
|
|
*
|
|
* Convert this range object to a printable form.
|
|
*/
|
|
|
|
static VALUE
|
|
range_to_s(VALUE range)
|
|
{
|
|
VALUE str, str2;
|
|
|
|
str = rb_obj_as_string(rb_ivar_get(range, id_beg));
|
|
str2 = rb_obj_as_string(rb_ivar_get(range, id_end));
|
|
str = rb_str_dup(str);
|
|
rb_str_cat(str, "...", EXCL(range)?3:2);
|
|
rb_str_append(str, str2);
|
|
OBJ_INFECT(str, str2);
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.inspect => string
|
|
*
|
|
* Convert this range object to a printable form (using
|
|
* <code>inspect</code> to convert the start and end
|
|
* objects).
|
|
*/
|
|
|
|
|
|
static VALUE
|
|
range_inspect(VALUE range)
|
|
{
|
|
VALUE str, str2;
|
|
|
|
str = rb_inspect(rb_ivar_get(range, id_beg));
|
|
str2 = rb_inspect(rb_ivar_get(range, id_end));
|
|
str = rb_str_dup(str);
|
|
rb_str_cat(str, "...", EXCL(range)?3:2);
|
|
rb_str_append(str, str2);
|
|
OBJ_INFECT(str, str2);
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng === obj => true or false
|
|
* rng.member?(val) => true or false
|
|
* rng.include?(val) => true or false
|
|
*
|
|
* Returns <code>true</code> if <i>obj</i> is an element of
|
|
* <i>rng</i>, <code>false</code> otherwise. Conveniently,
|
|
* <code>===</code> is the comparison operator used by
|
|
* <code>case</code> statements.
|
|
*
|
|
* case 79
|
|
* when 1..50 then print "low\n"
|
|
* when 51..75 then print "medium\n"
|
|
* when 76..100 then print "high\n"
|
|
* end
|
|
*
|
|
* <em>produces:</em>
|
|
*
|
|
* high
|
|
*/
|
|
|
|
static VALUE
|
|
range_include(VALUE range, VALUE val)
|
|
{
|
|
VALUE beg = rb_ivar_get(range, id_beg);
|
|
VALUE end = rb_ivar_get(range, id_end);
|
|
int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
|
|
rb_obj_is_kind_of(beg, rb_cNumeric) ||
|
|
rb_obj_is_kind_of(end, rb_cNumeric);
|
|
|
|
if (nv ||
|
|
!NIL_P(rb_check_to_integer(beg, "to_int")) ||
|
|
!NIL_P(rb_check_to_integer(end, "to_int"))) {
|
|
if (r_le(beg, val)) {
|
|
if (EXCL(range)) {
|
|
if (r_lt(val, end)) return Qtrue;
|
|
}
|
|
else {
|
|
if (r_le(val, end)) return Qtrue;
|
|
}
|
|
}
|
|
return Qfalse;
|
|
}
|
|
return rb_call_super(1, &val);
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* rng.cover?(val) => true or false
|
|
*
|
|
* Returns <code>true</code> if <i>obj</i> is between beg and end,
|
|
* i.e <code>beg <= obj <= end</code> (or <i>end</i> exclusive when
|
|
* <code>exclude_end?</code> is true).
|
|
*
|
|
* ("a".."z").cover?("c") #=> true
|
|
* ("a".."z").cover?("5") #=> false
|
|
*/
|
|
|
|
static VALUE
|
|
range_cover(VALUE range, VALUE val)
|
|
{
|
|
VALUE beg, end;
|
|
|
|
beg = rb_ivar_get(range, id_beg);
|
|
end = rb_ivar_get(range, id_end);
|
|
if (r_le(beg, val)) {
|
|
if (EXCL(range)) {
|
|
if (r_lt(val, end)) return Qtrue;
|
|
}
|
|
else {
|
|
if (r_le(val, end)) return Qtrue;
|
|
}
|
|
}
|
|
return Qfalse;
|
|
}
|
|
|
|
|
|
/* A <code>Range</code> represents an interval---a set of values with a
|
|
* start and an end. Ranges may be constructed using the
|
|
* <em>s</em><code>..</code><em>e</em> and
|
|
* <em>s</em><code>...</code><em>e</em> literals, or with
|
|
* <code>Range::new</code>. Ranges constructed using <code>..</code>
|
|
* run from the start to the end inclusively. Those created using
|
|
* <code>...</code> exclude the end value. When used as an iterator,
|
|
* ranges return each value in the sequence.
|
|
*
|
|
* (-1..-5).to_a #=> []
|
|
* (-5..-1).to_a #=> [-5, -4, -3, -2, -1]
|
|
* ('a'..'e').to_a #=> ["a", "b", "c", "d", "e"]
|
|
* ('a'...'e').to_a #=> ["a", "b", "c", "d"]
|
|
*
|
|
* Ranges can be constructed using objects of any type, as long as the
|
|
* objects can be compared using their <code><=></code> operator and
|
|
* they support the <code>succ</code> method to return the next object
|
|
* in sequence.
|
|
*
|
|
* class Xs # represent a string of 'x's
|
|
* include Comparable
|
|
* attr :length
|
|
* def initialize(n)
|
|
* @length = n
|
|
* end
|
|
* def succ
|
|
* Xs.new(@length + 1)
|
|
* end
|
|
* def <=>(other)
|
|
* @length <=> other.length
|
|
* end
|
|
* def to_s
|
|
* sprintf "%2d #{inspect}", @length
|
|
* end
|
|
* def inspect
|
|
* 'x' * @length
|
|
* end
|
|
* end
|
|
*
|
|
* r = Xs.new(3)..Xs.new(6) #=> xxx..xxxxxx
|
|
* r.to_a #=> [xxx, xxxx, xxxxx, xxxxxx]
|
|
* r.member?(Xs.new(5)) #=> true
|
|
*
|
|
* In the previous code example, class <code>Xs</code> includes the
|
|
* <code>Comparable</code> module. This is because
|
|
* <code>Enumerable#member?</code> checks for equality using
|
|
* <code>==</code>. Including <code>Comparable</code> ensures that the
|
|
* <code>==</code> method is defined in terms of the <code><=></code>
|
|
* method implemented in <code>Xs</code>.
|
|
*
|
|
*/
|
|
|
|
void
|
|
Init_Range(void)
|
|
{
|
|
rb_cRange = rb_define_class("Range", rb_cObject);
|
|
rb_include_module(rb_cRange, rb_mEnumerable);
|
|
rb_define_method(rb_cRange, "initialize", range_initialize, -1);
|
|
rb_define_method(rb_cRange, "==", range_eq, 1);
|
|
rb_define_method(rb_cRange, "===", range_include, 1);
|
|
rb_define_method(rb_cRange, "eql?", range_eql, 1);
|
|
rb_define_method(rb_cRange, "hash", range_hash, 0);
|
|
rb_define_method(rb_cRange, "each", range_each, 0);
|
|
rb_define_method(rb_cRange, "step", range_step, -1);
|
|
rb_define_method(rb_cRange, "first", range_first, 0);
|
|
rb_define_method(rb_cRange, "last", range_last, 0);
|
|
rb_define_method(rb_cRange, "begin", range_first, 0);
|
|
rb_define_method(rb_cRange, "end", range_last, 0);
|
|
rb_define_method(rb_cRange, "min", range_min, 0);
|
|
rb_define_method(rb_cRange, "max", range_max, 0);
|
|
rb_define_method(rb_cRange, "to_s", range_to_s, 0);
|
|
rb_define_method(rb_cRange, "inspect", range_inspect, 0);
|
|
|
|
rb_define_method(rb_cRange, "exclude_end?", range_exclude_end_p, 0);
|
|
|
|
rb_define_method(rb_cRange, "member?", range_include, 1);
|
|
rb_define_method(rb_cRange, "include?", range_include, 1);
|
|
rb_define_method(rb_cRange, "cover?", range_cover, 1);
|
|
|
|
id_cmp = rb_intern("<=>");
|
|
id_succ = rb_intern("succ");
|
|
id_beg = rb_intern("begin");
|
|
id_end = rb_intern("end");
|
|
id_excl = rb_intern("excl");
|
|
}
|