summaryrefslogtreecommitdiff
path: root/range.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-23 06:02:15 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-23 06:02:15 +0000
commit1289a7a11fe55a4e37d923fc6b0af2c228e83175 (patch)
treefe8a90542f77c78ecdaef684d155c6ea66a7dcef /range.c
parente15efe7733f5e6e9377ae1bd2fc5f6029c919f1d (diff)
* eval.c (is_defined): should not dump core for "defined?(())".
* eval.c (umethod_bind): recv can be an instance of descender of oklass if oklass is a Module. * hash.c (rb_hash_equal): check identiry equality first. * file.c (group_member): should check real gid only. * file.c (eaccess): do not cache euid, since effective euid may be changed via Process.euid=(). * file.c (eaccess): return -1 unless every specified access mode is permitted. * eval.c (rb_eval): while/until returns the value which is given to break. * parse.y (value_expr): using while/until/class/def as an expression is now gives a warning, not an error. * range.c (range_eqq): should compare strings based on magical increment (using String#upto), not dictionary order. * enum.c (enum_sort_by): new method for Schewartzian transformed stable sort. * variable.c (mod_av_set): detect constant overriding for built-in classes/modules. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'range.c')
-rw-r--r--range.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/range.c b/range.c
index 4ea1df2..6a1afde 100644
--- a/range.c
+++ b/range.c
@@ -149,6 +149,18 @@ r_gt(a,b)
}
static VALUE
+r_eqq_str_i(i, data)
+ VALUE i;
+ VALUE *data;
+{
+ if (rb_str_cmp(i, data[0]) == 0) {
+ data[1] = Qtrue;
+ rb_iter_break();
+ }
+ return Qnil;
+}
+
+static VALUE
range_eqq(range, obj)
VALUE range, obj;
{
@@ -168,6 +180,15 @@ range_eqq(range, obj)
}
return Qfalse;
}
+ else if (TYPE(beg) == T_STRING &&
+ TYPE(obj) == T_STRING &&
+ TYPE(end) == T_STRING) {
+ VALUE data[2];
+
+ data[0] = obj; data[1] = Qfalse;
+ rb_iterate(rb_each, range, r_eqq_str_i, (VALUE)data);
+ return data[1];
+ }
else if (r_le(beg, obj)) {
if (EXCL(range)) {
if (r_lt(obj, end)) return Qtrue;