kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* object.c (Init_Object): should do exact match for Module#==.

Browse source 
* compar.c (cmp_eq): returns 'false' if <=> returns 'nil'.

* compar.c (cmp_gt,cmp_ge,cmp_lt,cmp_le,cmp_between): ditto.

* pack.c (pack_pack): should propagate taintedness.

* pack.c (pack_unpack): ditto.

* eval.c (rb_thread_schedule): need to preserve errno before
  calling rb_trap_exec().

* regex.c (calculate_must_string): a bug in charset/charset_not
  parsing.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-05-21 05:39:19 +00:00
parent 9402cbeec5
commit edbe98d848
9 changed files with 216 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

51
compar.c
View file

@ -16,33 +16,15 @@ VALUE rb_mComparable;
static ID cmp;
static VALUE
cmp_eq(a)
VALUE *a;
{
VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
int t = NUM2INT(c);
if (t == 0) return Qtrue;
return Qfalse;
}
static VALUE
cmp_failed()
{
return Qfalse;
}
static VALUE
cmp_equal(x, y)
VALUE x, y;
{
VALUE a[2];
VALUE c = rb_funcall(x, cmp, 1, y);
if (x == y) return Qtrue;
a[0] = x; a[1] = y;
return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
if (NIL_P(c)) return Qnil;
if (NUM2LONG(c) == 0) return Qtrue;
return Qfalse;
}
static VALUE
@ -50,9 +32,9 @@ cmp_gt(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
int t = NUM2INT(c);
if (t > 0) return Qtrue;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) > 0) return Qtrue;
return Qfalse;
}
@ -61,9 +43,9 @@ cmp_ge(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
int t = NUM2INT(c);
if (t >= 0) return Qtrue;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) >= 0) return Qtrue;
return Qfalse;
}
@ -72,9 +54,9 @@ cmp_lt(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
int t = NUM2INT(c);
if (t < 0) return Qtrue;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) < 0) return Qtrue;
return Qfalse;
}
@ -83,9 +65,9 @@ cmp_le(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
int t = NUM2INT(c);
if (t <= 0) return Qtrue;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) <= 0) return Qtrue;
return Qfalse;
}
@ -94,12 +76,13 @@ cmp_between(x, min, max)
VALUE x, min, max;
{
VALUE c = rb_funcall(x, cmp, 1, min);
long t = NUM2LONG(c);
if (t < 0) return Qfalse;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) < 0) return Qfalse;
c = rb_funcall(x, cmp, 1, max);
t = NUM2LONG(c);
if (t > 0) return Qfalse;
if (NIL_P(c)) return Qfalse;
if (NUM2LONG(c) > 0) return Qfalse;
return Qtrue;
}