2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
range.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Thu Aug 19 17:46:47 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cRange;
|
2001-05-30 13:12:34 +04:00
|
|
|
static ID id_cmp, id_succ, id_beg, id_end, id_excl;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
|
|
|
|
#define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
|
|
|
|
#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
|
|
|
|
|
|
|
|
#define EXCL(r) RTEST(RANGE_EXCL(r))
|
|
|
|
#define SET_EXCL(r,v) (RSTRUCT(r)->as.ary[2] = (v) ? Qtrue : Qfalse)
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_failed(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2003-04-18 22:05:11 +04:00
|
|
|
rb_raise(rb_eArgError, "bad value for range");
|
|
|
|
return Qnil; /* dummy */
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_check(VALUE *args)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2005-08-14 19:39:39 +04:00
|
|
|
return rb_funcall(args[0], id_cmp, 1, args[1]);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_init(VALUE range, VALUE beg, VALUE end, int exclude_end)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE args[2];
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-07-30 14:22:32 +04:00
|
|
|
args[0] = beg;
|
|
|
|
args[1] = end;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (!FIXNUM_P(beg) || !FIXNUM_P(end)) {
|
2005-08-14 19:39:39 +04:00
|
|
|
VALUE v;
|
|
|
|
|
|
|
|
v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (NIL_P(v))
|
|
|
|
range_failed();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2002-06-11 11:02:23 +04:00
|
|
|
SET_EXCL(range, exclude_end);
|
2007-09-08 19:07:18 +04:00
|
|
|
RSTRUCT(range)->as.ary[0] = beg;
|
|
|
|
RSTRUCT(range)->as.ary[1] = end;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_range_new(VALUE beg, VALUE end, int exclude_end)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2002-06-11 11:02:23 +04:00
|
|
|
VALUE range = rb_obj_alloc(rb_cRange);
|
2000-02-29 11:05:32 +03:00
|
|
|
|
2002-06-11 11:02:23 +04:00
|
|
|
range_init(range, beg, end, exclude_end);
|
|
|
|
return range;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_initialize(int argc, VALUE *argv, VALUE range)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2001-02-02 14:38:20 +03:00
|
|
|
VALUE beg, end, flags;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2001-02-02 14:38:20 +03:00
|
|
|
rb_scan_args(argc, argv, "21", &beg, &end, &flags);
|
2000-02-29 11:05:32 +03:00
|
|
|
/* Ranges are immutable, so that they should be initialized only once. */
|
2007-09-10 10:25:40 +04:00
|
|
|
if (RANGE_EXCL(range) != Qnil) {
|
2002-05-01 13:41:50 +04:00
|
|
|
rb_name_error(rb_intern("initialize"), "`initialize' called twice");
|
2000-02-29 11:05:32 +03:00
|
|
|
}
|
2002-06-11 11:02:23 +04:00
|
|
|
range_init(range, beg, end, RTEST(flags));
|
2000-02-29 11:05:32 +03:00
|
|
|
return Qnil;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.exclude_end? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>rng</i> excludes its end value.
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_exclude_end_p(VALUE range)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-07-30 14:22:32 +04:00
|
|
|
return EXCL(range) ? Qtrue : Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2000-11-27 12:23:38 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_eq(VALUE range, VALUE obj)
|
2000-11-27 12:23:38 +03:00
|
|
|
{
|
2006-12-31 18:02:22 +03:00
|
|
|
if (range == obj)
|
|
|
|
return Qtrue;
|
2002-09-03 09:20:14 +04:00
|
|
|
if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
|
|
|
|
return Qfalse;
|
2000-11-27 12:23:38 +03:00
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
if (!rb_equal(RANGE_BEG(range), RANGE_BEG(obj)))
|
2000-11-27 12:23:38 +03:00
|
|
|
return Qfalse;
|
2007-09-08 19:07:18 +04:00
|
|
|
if (!rb_equal(RANGE_END(range), RANGE_END(obj)))
|
2000-11-27 12:23:38 +03:00
|
|
|
return Qfalse;
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (EXCL(range) != EXCL(obj))
|
|
|
|
return Qfalse;
|
2000-11-27 12:23:38 +03:00
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2001-05-30 13:12:34 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
r_lt(VALUE a, VALUE b)
|
2001-05-30 13:12:34 +04:00
|
|
|
{
|
|
|
|
VALUE r = rb_funcall(a, id_cmp, 1, b);
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (NIL_P(r))
|
|
|
|
return Qfalse;
|
|
|
|
if (rb_cmpint(r, a, b) < 0)
|
|
|
|
return Qtrue;
|
2001-05-30 13:12:34 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
r_le(VALUE a, VALUE b)
|
2001-05-30 13:12:34 +04:00
|
|
|
{
|
2004-05-14 20:39:15 +04:00
|
|
|
int c;
|
2001-05-30 13:12:34 +04:00
|
|
|
VALUE r = rb_funcall(a, id_cmp, 1, b);
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (NIL_P(r))
|
|
|
|
return Qfalse;
|
2004-05-14 20:39:15 +04:00
|
|
|
c = rb_cmpint(r, a, b);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (c == 0)
|
|
|
|
return INT2FIX(0);
|
|
|
|
if (c < 0)
|
|
|
|
return Qtrue;
|
2001-05-30 13:12:34 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2002-12-19 12:20:20 +03:00
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2001-11-08 12:21:59 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_eql(VALUE range, VALUE obj)
|
2001-11-08 12:21:59 +03:00
|
|
|
{
|
2006-12-31 18:02:22 +03:00
|
|
|
if (range == obj)
|
|
|
|
return Qtrue;
|
2002-09-03 09:20:14 +04:00
|
|
|
if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
|
|
|
|
return Qfalse;
|
2001-11-08 12:21:59 +03:00
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
if (!rb_eql(RANGE_BEG(range), RANGE_BEG(obj)))
|
2001-11-08 12:21:59 +03:00
|
|
|
return Qfalse;
|
2007-09-08 19:07:18 +04:00
|
|
|
if (!rb_eql(RANGE_END(range), RANGE_END(obj)))
|
2001-11-08 12:21:59 +03:00
|
|
|
return Qfalse;
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (EXCL(range) != EXCL(obj))
|
|
|
|
return Qfalse;
|
2001-11-08 12:21:59 +03:00
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2001-11-08 12:21:59 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_hash(VALUE range)
|
2001-11-08 12:21:59 +03:00
|
|
|
{
|
|
|
|
long hash = EXCL(range);
|
|
|
|
VALUE v;
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
v = rb_hash(RANGE_BEG(range));
|
2001-11-08 12:21:59 +03:00
|
|
|
hash ^= v << 1;
|
2007-09-08 19:07:18 +04:00
|
|
|
v = rb_hash(RANGE_END(range));
|
2001-11-08 12:21:59 +03:00
|
|
|
hash ^= v << 9;
|
2002-05-30 10:12:29 +04:00
|
|
|
hash ^= EXCL(range) << 24;
|
2001-11-08 12:21:59 +03:00
|
|
|
|
2002-07-30 14:22:32 +04:00
|
|
|
return LONG2FIX(hash);
|
2001-11-08 12:21:59 +03:00
|
|
|
}
|
|
|
|
|
2002-05-30 10:12:29 +04:00
|
|
|
static void
|
2006-12-31 18:02:22 +03:00
|
|
|
range_each_func(VALUE range, VALUE (*func) (VALUE, void *), VALUE v, VALUE e,
|
|
|
|
void *arg)
|
2002-05-30 10:12:29 +04:00
|
|
|
{
|
2004-05-14 20:39:15 +04:00
|
|
|
int c;
|
|
|
|
|
2002-05-30 10:12:29 +04:00
|
|
|
if (EXCL(range)) {
|
|
|
|
while (r_lt(v, e)) {
|
2006-12-31 18:02:22 +03:00
|
|
|
(*func) (v, arg);
|
2002-05-30 10:12:29 +04:00
|
|
|
v = rb_funcall(v, id_succ, 0, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2004-05-14 20:39:15 +04:00
|
|
|
while (RTEST(c = r_le(v, e))) {
|
2006-12-31 18:02:22 +03:00
|
|
|
(*func) (v, arg);
|
|
|
|
if (c == INT2FIX(0))
|
|
|
|
break;
|
2002-05-30 10:12:29 +04:00
|
|
|
v = rb_funcall(v, id_succ, 0, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-06 11:40:06 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
step_i(VALUE i, void *arg)
|
2004-10-06 11:40:06 +04:00
|
|
|
{
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
long *iter = (long *)arg;
|
|
|
|
|
2004-10-06 11:40:06 +04:00
|
|
|
iter[0]--;
|
|
|
|
if (iter[0] == 0) {
|
|
|
|
rb_yield(i);
|
|
|
|
iter[0] = iter[1];
|
|
|
|
}
|
2004-10-19 14:25:23 +04:00
|
|
|
return Qnil;
|
2004-10-06 11:40:06 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2001-08-14 12:13:31 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_step(int argc, VALUE *argv, VALUE range)
|
2001-08-14 12:13:31 +04:00
|
|
|
{
|
|
|
|
VALUE b, e, step;
|
2002-05-30 10:12:29 +04:00
|
|
|
long unit;
|
2001-08-14 12:13:31 +04:00
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(range, argc, argv);
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
b = RANGE_BEG(range);
|
|
|
|
e = RANGE_END(range);
|
2002-05-01 13:41:50 +04:00
|
|
|
if (rb_scan_args(argc, argv, "01", &step) == 0) {
|
|
|
|
step = INT2FIX(1);
|
|
|
|
}
|
2001-08-14 12:13:31 +04:00
|
|
|
|
2002-05-30 10:12:29 +04:00
|
|
|
unit = NUM2LONG(step);
|
2003-02-13 12:11:11 +03:00
|
|
|
if (unit < 0) {
|
|
|
|
rb_raise(rb_eArgError, "step can't be negative");
|
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
if (unit == 0)
|
|
|
|
rb_raise(rb_eArgError, "step can't be 0");
|
2001-08-14 12:13:31 +04:00
|
|
|
if (FIXNUM_P(b) && FIXNUM_P(e)) { /* fixnums are special */
|
2002-05-30 10:12:29 +04:00
|
|
|
long end = FIX2LONG(e);
|
2002-05-01 13:41:50 +04:00
|
|
|
long i;
|
2002-05-30 10:12:29 +04:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!EXCL(range))
|
|
|
|
end += 1;
|
2007-09-09 20:11:28 +04:00
|
|
|
i = FIX2LONG(b);
|
|
|
|
while (i < end) {
|
2002-08-21 19:47:54 +04:00
|
|
|
rb_yield(LONG2NUM(i));
|
2007-09-09 20:11:28 +04:00
|
|
|
if (i + unit < i) break;
|
|
|
|
i += unit;
|
2001-08-14 12:13:31 +04:00
|
|
|
}
|
|
|
|
}
|
2002-05-30 10:12:29 +04:00
|
|
|
else {
|
2003-06-07 19:34:31 +04:00
|
|
|
VALUE tmp = rb_check_string_type(b);
|
2001-08-14 12:13:31 +04:00
|
|
|
|
2003-06-07 19:34:31 +04:00
|
|
|
if (!NIL_P(tmp)) {
|
2007-06-22 20:23:16 +04:00
|
|
|
VALUE args[2];
|
2003-06-07 19:34:31 +04:00
|
|
|
long iter[2];
|
|
|
|
|
|
|
|
b = tmp;
|
2007-06-22 20:23:16 +04:00
|
|
|
args[0] = e;
|
|
|
|
args[1] = EXCL(range) ? Qtrue : Qfalse;
|
2006-12-31 18:02:22 +03:00
|
|
|
iter[0] = 1;
|
|
|
|
iter[1] = unit;
|
2007-06-22 20:23:16 +04:00
|
|
|
rb_block_call(b, rb_intern("upto"), 2, args, step_i, (VALUE)iter);
|
2003-06-07 19:34:31 +04:00
|
|
|
}
|
|
|
|
else if (rb_obj_is_kind_of(b, rb_cNumeric)) {
|
|
|
|
ID c = rb_intern(EXCL(range) ? "<" : "<=");
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (rb_equal(step, INT2FIX(0)))
|
|
|
|
rb_raise(rb_eArgError, "step can't be 0");
|
2003-06-07 19:34:31 +04:00
|
|
|
while (RTEST(rb_funcall(b, c, 1, e))) {
|
|
|
|
rb_yield(b);
|
|
|
|
b = rb_funcall(b, '+', 1, step);
|
|
|
|
}
|
2001-08-14 12:13:31 +04:00
|
|
|
}
|
2003-06-07 19:34:31 +04:00
|
|
|
else {
|
|
|
|
long args[2];
|
|
|
|
|
|
|
|
if (!rb_respond_to(b, id_succ)) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
rb_raise(rb_eTypeError, "can't iterate from %s",
|
2003-06-07 19:34:31 +04:00
|
|
|
rb_obj_classname(b));
|
|
|
|
}
|
|
|
|
args[0] = 1;
|
|
|
|
args[1] = unit;
|
|
|
|
range_each_func(range, step_i, b, e, args);
|
|
|
|
}
|
2001-08-14 12:13:31 +04:00
|
|
|
}
|
|
|
|
return range;
|
|
|
|
}
|
|
|
|
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
static VALUE
|
|
|
|
each_i(VALUE v, void *arg)
|
2002-05-30 10:12:29 +04:00
|
|
|
{
|
2004-10-06 11:40:06 +04:00
|
|
|
rb_yield(v);
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
return Qnil;
|
2002-05-30 10:12:29 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.each {| i | block } => rng
|
|
|
|
*
|
|
|
|
* Iterates over the elements <i>rng</i>, passing each in turn to the
|
2003-12-30 19:38:32 +03:00
|
|
|
* 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).
|
2003-12-24 07:29:32 +03:00
|
|
|
*
|
|
|
|
* (10..15).each do |n|
|
|
|
|
* print n, ' '
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* 10 11 12 13 14 15
|
|
|
|
*/
|
|
|
|
|
2002-05-01 13:41:50 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_each(VALUE range)
|
2002-05-01 13:41:50 +04:00
|
|
|
{
|
2002-05-30 10:12:29 +04:00
|
|
|
VALUE beg, end;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(range, 0, 0);
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
beg = RANGE_BEG(range);
|
|
|
|
end = RANGE_END(range);
|
2002-05-30 10:12:29 +04:00
|
|
|
|
|
|
|
if (!rb_respond_to(beg, id_succ)) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
rb_raise(rb_eTypeError, "can't iterate from %s",
|
2003-01-31 07:00:17 +03:00
|
|
|
rb_obj_classname(beg));
|
2002-05-30 10:12:29 +04:00
|
|
|
}
|
2003-01-08 09:05:08 +03:00
|
|
|
if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
|
|
|
|
long lim = FIX2LONG(end);
|
|
|
|
long i;
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!EXCL(range))
|
|
|
|
lim += 1;
|
|
|
|
for (i = FIX2LONG(beg); i < lim; i++) {
|
2003-01-08 09:05:08 +03:00
|
|
|
rb_yield(LONG2NUM(i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (TYPE(beg) == T_STRING) {
|
2007-06-22 20:23:16 +04:00
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = end;
|
|
|
|
args[1] = EXCL(range) ? Qtrue : Qfalse;
|
|
|
|
rb_block_call(beg, rb_intern("upto"), 2, args, rb_yield, 0);
|
2002-05-30 10:12:29 +04:00
|
|
|
}
|
|
|
|
else {
|
2003-01-16 10:38:40 +03:00
|
|
|
range_each_func(range, each_i, beg, end, NULL);
|
2002-05-30 10:12:29 +04:00
|
|
|
}
|
|
|
|
return range;
|
2002-05-01 13:41:50 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.begin => obj
|
|
|
|
*
|
|
|
|
* Returns the first object in <i>rng</i>.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2007-10-18 10:58:35 +04:00
|
|
|
range_begin(VALUE range)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-09-08 19:07:18 +04:00
|
|
|
return RANGE_BEG(range);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.end => obj
|
|
|
|
*
|
|
|
|
* Returns the object that defines the end of <i>rng</i>.
|
|
|
|
*
|
|
|
|
* (1..10).end #=> 10
|
|
|
|
* (1...10).end #=> 10
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2007-10-18 10:58:35 +04:00
|
|
|
range_end(VALUE range)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-09-08 19:07:18 +04:00
|
|
|
return RANGE_END(range);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2007-10-18 10:58:35 +04:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
first_i(VALUE i, VALUE *ary)
|
|
|
|
{
|
|
|
|
long n = NUM2LONG(ary[0]);
|
|
|
|
|
|
|
|
if (n <= 0) {
|
|
|
|
rb_iter_break();
|
|
|
|
}
|
|
|
|
rb_ary_push(ary[1], i);
|
|
|
|
n--;
|
|
|
|
ary[0] = INT2NUM(n);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.first => obj
|
|
|
|
* rng.first(n) => an_array
|
|
|
|
*
|
|
|
|
* Returns the first object in <i>rng</i>, or the first +n+ elements.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
range_first(int argc, VALUE *argv, VALUE range)
|
|
|
|
{
|
|
|
|
VALUE n, ary[2];
|
|
|
|
|
|
|
|
if (argc == 0) return RANGE_BEG(range);
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "1", &n);
|
|
|
|
ary[0] = n;
|
|
|
|
ary[1] = rb_ary_new2(NUM2LONG(n));
|
|
|
|
rb_block_call(range, rb_intern("each"), 0, 0, first_i, (VALUE)ary);
|
|
|
|
|
|
|
|
return ary[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.last => obj
|
|
|
|
* rng.last(n) => an_array
|
|
|
|
*
|
|
|
|
* Returns the last object in <i>rng</i>, or the last +n+ elements.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
range_last(int argc, VALUE *argv, VALUE range)
|
|
|
|
{
|
2007-10-19 05:57:49 +04:00
|
|
|
VALUE rb_ary_last(int, VALUE *, VALUE);
|
2007-10-18 10:58:35 +04:00
|
|
|
|
|
|
|
if (argc == 0) return RANGE_END(range);
|
|
|
|
return rb_ary_last(argc, argv, rb_Array(range));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-25 04:30:57 +03:00
|
|
|
/*
|
|
|
|
* 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 {
|
2007-09-08 19:07:18 +04:00
|
|
|
VALUE b = RANGE_BEG(range);
|
|
|
|
VALUE e = RANGE_END(range);
|
2005-11-25 08:42:28 +03:00
|
|
|
int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
|
2005-11-25 04:30:57 +03:00
|
|
|
|
2007-07-13 06:33:11 +04:00
|
|
|
if (c > 0 || (c == 0 && EXCL(range)))
|
2006-12-31 18:02:22 +03:00
|
|
|
return Qnil;
|
2005-11-25 04:30:57 +03:00
|
|
|
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)
|
|
|
|
{
|
2007-09-08 19:07:18 +04:00
|
|
|
VALUE e = RANGE_END(range);
|
2005-11-25 08:42:28 +03:00
|
|
|
int ip = FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cInteger);
|
|
|
|
|
|
|
|
if (rb_block_given_p() || (EXCL(range) && !ip)) {
|
2005-11-25 04:30:57 +03:00
|
|
|
return rb_call_super(0, 0);
|
|
|
|
}
|
|
|
|
else {
|
2007-09-08 19:07:18 +04:00
|
|
|
VALUE b = RANGE_BEG(range);
|
2005-11-25 08:42:28 +03:00
|
|
|
int c = rb_cmpint(rb_funcall(b, id_cmp, 1, e), b, e);
|
2005-11-25 04:30:57 +03:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (c > 0)
|
|
|
|
return Qnil;
|
2005-11-25 08:42:28 +03:00
|
|
|
if (EXCL(range)) {
|
2007-07-13 06:33:11 +04:00
|
|
|
if (c == 0) return Qnil;
|
2005-11-25 08:42:28 +03:00
|
|
|
if (FIXNUM_P(e)) {
|
2007-07-12 13:52:48 +04:00
|
|
|
return LONG2NUM(FIX2LONG(e) - 1);
|
2005-11-25 08:42:28 +03:00
|
|
|
}
|
|
|
|
return rb_funcall(e, '-', 1, INT2FIX(1));
|
|
|
|
}
|
2005-11-25 04:30:57 +03:00
|
|
|
return e;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-08-04 08:31:33 +04:00
|
|
|
VALUE b, e;
|
2005-08-04 15:29:51 +04:00
|
|
|
long beg, end, excl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-08-04 08:31:33 +04:00
|
|
|
if (rb_obj_is_kind_of(range, rb_cRange)) {
|
2007-09-08 19:07:18 +04:00
|
|
|
b = RANGE_BEG(range);
|
|
|
|
e = RANGE_END(range);
|
2005-08-04 15:29:51 +04:00
|
|
|
excl = EXCL(range);
|
2005-08-04 08:31:33 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
b = rb_check_to_integer(range, "begin");
|
2006-12-31 18:02:22 +03:00
|
|
|
if (NIL_P(b))
|
|
|
|
return Qfalse;
|
2005-08-04 08:31:33 +04:00
|
|
|
e = rb_check_to_integer(range, "end");
|
2006-12-31 18:02:22 +03:00
|
|
|
if (NIL_P(e))
|
|
|
|
return Qfalse;
|
2005-08-04 15:29:51 +04:00
|
|
|
excl = RTEST(rb_funcall(range, rb_intern("exclude_end?"), 0));
|
2005-08-04 08:31:33 +04:00
|
|
|
}
|
|
|
|
beg = NUM2LONG(b);
|
|
|
|
end = NUM2LONG(e);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
if (beg < 0) {
|
|
|
|
beg += len;
|
2006-12-31 18:02:22 +03:00
|
|
|
if (beg < 0)
|
|
|
|
goto out_of_range;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
if (err == 0 || err == 2) {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (beg > len)
|
|
|
|
goto out_of_range;
|
|
|
|
if (end > len)
|
|
|
|
end = len;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
if (end < 0)
|
|
|
|
end += len;
|
|
|
|
if (!excl)
|
|
|
|
end++; /* include end point */
|
1999-08-13 09:45:20 +04:00
|
|
|
len = end - beg;
|
2006-12-31 18:02:22 +03:00
|
|
|
if (len < 0)
|
|
|
|
len = 0;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
*begp = beg;
|
|
|
|
*lenp = len;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
out_of_range:
|
|
|
|
if (err) {
|
2002-05-28 22:11:07 +04:00
|
|
|
rb_raise(rb_eRangeError, "%ld..%s%ld out of range",
|
2005-08-04 15:29:51 +04:00
|
|
|
b, excl ? "." : "", e);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.to_s => string
|
|
|
|
*
|
|
|
|
* Convert this range object to a printable form.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_to_s(VALUE range)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE str, str2;
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
str = rb_obj_as_string(RANGE_BEG(range));
|
|
|
|
str2 = rb_obj_as_string(RANGE_END(range));
|
2000-04-10 09:48:43 +04:00
|
|
|
str = rb_str_dup(str);
|
2006-12-31 18:02:22 +03:00
|
|
|
rb_str_cat(str, "...", EXCL(range) ? 3 : 2);
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_append(str, str2);
|
|
|
|
OBJ_INFECT(str, str2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2006-10-02 21:39:57 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.to_splat => array
|
|
|
|
*
|
|
|
|
* Convert this range object to an array to splat.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
range_to_splat(VALUE range)
|
|
|
|
{
|
|
|
|
return rb_convert_type(range, T_ARRAY, "Array", "to_a");
|
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* rng.inspect => string
|
|
|
|
*
|
|
|
|
* Convert this range object to a printable form (using
|
|
|
|
* <code>inspect</code> to convert the start and end
|
|
|
|
* objects).
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_inspect(VALUE range)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE str, str2;
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
str = rb_inspect(RANGE_BEG(range));
|
|
|
|
str2 = rb_inspect(RANGE_END(range));
|
2000-04-10 09:48:43 +04:00
|
|
|
str = rb_str_dup(str);
|
2006-12-31 18:02:22 +03:00
|
|
|
rb_str_cat(str, "...", EXCL(range) ? 3 : 2);
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_append(str, str2);
|
|
|
|
OBJ_INFECT(str, str2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-10-19 14:25:23 +04:00
|
|
|
* rng === obj => true or false
|
2003-12-24 07:29:32 +03:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2007-07-26 17:37:13 +04:00
|
|
|
static VALUE
|
|
|
|
range_eqq(VALUE range, VALUE val)
|
|
|
|
{
|
|
|
|
return rb_funcall(range, rb_intern("include?"), 1, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* ("a".."z").include?("g") # => true
|
|
|
|
* ("a".."z").include?("A") # => false
|
|
|
|
*/
|
|
|
|
|
2002-06-11 11:02:23 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
range_include(VALUE range, VALUE val)
|
2002-06-11 11:02:23 +04:00
|
|
|
{
|
2007-09-08 19:07:18 +04:00
|
|
|
VALUE beg = RANGE_BEG(range);
|
|
|
|
VALUE end = RANGE_END(range);
|
2005-12-07 11:41:59 +03:00
|
|
|
int nv = FIXNUM_P(beg) || FIXNUM_P(end) ||
|
|
|
|
rb_obj_is_kind_of(beg, rb_cNumeric) ||
|
|
|
|
rb_obj_is_kind_of(end, rb_cNumeric);
|
|
|
|
|
2005-12-09 17:17:09 +03:00
|
|
|
if (nv ||
|
|
|
|
!NIL_P(rb_check_to_integer(beg, "to_int")) ||
|
|
|
|
!NIL_P(rb_check_to_integer(end, "to_int"))) {
|
2005-12-07 11:41:59 +03:00
|
|
|
if (r_le(beg, val)) {
|
|
|
|
if (EXCL(range)) {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (r_lt(val, end))
|
|
|
|
return Qtrue;
|
2005-12-07 11:41:59 +03:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (r_le(val, end))
|
|
|
|
return Qtrue;
|
2005-12-07 11:41:59 +03:00
|
|
|
}
|
2002-12-19 12:20:20 +03:00
|
|
|
}
|
2005-12-09 17:17:09 +03:00
|
|
|
return Qfalse;
|
2002-06-11 11:02:23 +04:00
|
|
|
}
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 19:26:04 +03:00
|
|
|
/* TODO: ruby_frame->this_func = rb_intern("include?"); */
|
2005-12-07 11:41:59 +03:00
|
|
|
return rb_call_super(1, &val);
|
2002-06-11 11:02:23 +04:00
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
|
2005-12-12 04:01:29 +03:00
|
|
|
/*
|
|
|
|
* 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
|
* sprintf.c (rb_str_format): allow %c to print one character
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
2006-06-10 01:20:17 +04:00
|
|
|
range_cover(VALUE range, VALUE val)
|
2005-12-12 04:01:29 +03:00
|
|
|
{
|
|
|
|
VALUE beg, end;
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
beg = RANGE_BEG(range);
|
|
|
|
end = RANGE_END(range);
|
2005-12-12 04:01:29 +03:00
|
|
|
if (r_le(beg, val)) {
|
|
|
|
if (EXCL(range)) {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (r_lt(val, end))
|
|
|
|
return Qtrue;
|
2005-12-12 04:01:29 +03:00
|
|
|
}
|
|
|
|
else {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (r_le(val, end))
|
|
|
|
return Qtrue;
|
2005-12-12 04:01:29 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2007-09-08 19:07:18 +04:00
|
|
|
static VALUE
|
|
|
|
range_dumper(VALUE range)
|
|
|
|
{
|
|
|
|
VALUE v;
|
|
|
|
NEWOBJ(m, struct RObject);
|
|
|
|
OBJSETUP(m, rb_cObject, T_OBJECT);
|
|
|
|
|
|
|
|
v = (VALUE)m;
|
|
|
|
|
2007-09-10 10:50:22 +04:00
|
|
|
rb_ivar_set(v, id_excl, RANGE_EXCL(range));
|
2007-09-08 19:07:18 +04:00
|
|
|
rb_ivar_set(v, id_beg, RANGE_BEG(range));
|
|
|
|
rb_ivar_set(v, id_end, RANGE_END(range));
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
range_loader(VALUE range, VALUE obj)
|
|
|
|
{
|
|
|
|
if (TYPE(obj) != T_OBJECT || RBASIC(obj)->klass != rb_cObject) {
|
|
|
|
rb_raise(rb_eTypeError, "not a dumped range object");
|
|
|
|
}
|
|
|
|
|
|
|
|
RSTRUCT(range)->as.ary[0] = rb_ivar_get(obj, id_beg);
|
|
|
|
RSTRUCT(range)->as.ary[1] = rb_ivar_get(obj, id_end);
|
2007-09-10 10:50:22 +04:00
|
|
|
RSTRUCT(range)->as.ary[2] = rb_ivar_get(obj, id_excl);
|
2007-09-08 19:07:18 +04:00
|
|
|
return range;
|
|
|
|
}
|
2005-12-12 04:01:29 +03:00
|
|
|
|
2007-11-23 10:00:50 +03:00
|
|
|
static VALUE
|
|
|
|
range_alloc(VALUE klass)
|
|
|
|
{
|
|
|
|
/* rb_struct_alloc_noinit itself should not be used because
|
|
|
|
* rb_marshal_define_compat uses equality of allocaiton function */
|
|
|
|
return rb_struct_alloc_noinit(klass);
|
|
|
|
}
|
|
|
|
|
2003-12-24 07:29:32 +03:00
|
|
|
/* 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>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Range(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-09-08 19:07:18 +04:00
|
|
|
VALUE members;
|
|
|
|
|
|
|
|
id_cmp = rb_intern("<=>");
|
|
|
|
id_succ = rb_intern("succ");
|
|
|
|
id_beg = rb_intern("begin");
|
|
|
|
id_end = rb_intern("end");
|
|
|
|
id_excl = rb_intern("excl");
|
|
|
|
|
2007-11-23 10:00:50 +03:00
|
|
|
rb_cRange = rb_struct_define_without_accessor(
|
|
|
|
"Range", rb_cObject, range_alloc,
|
2007-11-23 07:35:53 +03:00
|
|
|
"begin", "end", "excl", NULL);
|
2007-09-08 19:07:18 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_include_module(rb_cRange, rb_mEnumerable);
|
2007-09-08 19:07:18 +04:00
|
|
|
rb_marshal_define_compat(rb_cRange, rb_cObject, range_dumper, range_loader);
|
2000-02-29 11:05:32 +03:00
|
|
|
rb_define_method(rb_cRange, "initialize", range_initialize, -1);
|
2000-11-27 12:23:38 +03:00
|
|
|
rb_define_method(rb_cRange, "==", range_eq, 1);
|
2007-07-26 17:37:13 +04:00
|
|
|
rb_define_method(rb_cRange, "===", range_eqq, 1);
|
2001-11-08 12:21:59 +03:00
|
|
|
rb_define_method(rb_cRange, "eql?", range_eql, 1);
|
|
|
|
rb_define_method(rb_cRange, "hash", range_hash, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cRange, "each", range_each, 0);
|
2001-08-14 12:13:31 +04:00
|
|
|
rb_define_method(rb_cRange, "step", range_step, -1);
|
2007-10-18 10:58:35 +04:00
|
|
|
rb_define_method(rb_cRange, "begin", range_begin, 0);
|
2007-10-18 12:14:21 +04:00
|
|
|
rb_define_method(rb_cRange, "end", range_end, 0);
|
2007-10-18 10:58:35 +04:00
|
|
|
rb_define_method(rb_cRange, "first", range_first, -1);
|
|
|
|
rb_define_method(rb_cRange, "last", range_last, -1);
|
2005-11-25 04:30:57 +03:00
|
|
|
rb_define_method(rb_cRange, "min", range_min, 0);
|
|
|
|
rb_define_method(rb_cRange, "max", range_max, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cRange, "to_s", range_to_s, 0);
|
|
|
|
rb_define_method(rb_cRange, "inspect", range_inspect, 0);
|
2006-10-02 21:39:57 +04:00
|
|
|
rb_define_method(rb_cRange, "to_splat", range_to_splat, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cRange, "exclude_end?", range_exclude_end_p, 0);
|
|
|
|
|
2004-10-19 14:25:23 +04:00
|
|
|
rb_define_method(rb_cRange, "member?", range_include, 1);
|
2002-06-11 11:02:23 +04:00
|
|
|
rb_define_method(rb_cRange, "include?", range_include, 1);
|
2005-12-12 04:01:29 +03:00
|
|
|
rb_define_method(rb_cRange, "cover?", range_cover, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|