* string.c (rb_str_equal): should return nil for non string
operand to conform comparable convention. [ruby-dev:20759] * object.c (rb_equal): preserve nil if "==" returns nil. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ced623cd8a
commit
fa284f8127
@ -1,3 +1,10 @@
|
|||||||
|
Tue Jul 22 02:22:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* string.c (rb_str_equal): should return nil for non string
|
||||||
|
operand to conform comparable convention. [ruby-dev:20759]
|
||||||
|
|
||||||
|
* object.c (rb_equal): preserve nil if "==" returns nil.
|
||||||
|
|
||||||
Tue Jul 22 00:19:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Tue Jul 22 00:19:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* lib/tmpdir.rb: new library to get temporary directory path,
|
* lib/tmpdir.rb: new library to get temporary directory path,
|
||||||
|
2
object.c
2
object.c
@ -42,7 +42,7 @@ rb_equal(obj1, obj2)
|
|||||||
if (obj1 == obj2) return Qtrue;
|
if (obj1 == obj2) return Qtrue;
|
||||||
result = rb_funcall(obj1, id_eq, 1, obj2);
|
result = rb_funcall(obj1, id_eq, 1, obj2);
|
||||||
if (RTEST(result)) return Qtrue;
|
if (RTEST(result)) return Qtrue;
|
||||||
return Qfalse;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
2
string.c
2
string.c
@ -792,7 +792,7 @@ rb_str_equal(str1, str2)
|
|||||||
if (str1 == str2) return Qtrue;
|
if (str1 == str2) return Qtrue;
|
||||||
if (TYPE(str2) != T_STRING) {
|
if (TYPE(str2) != T_STRING) {
|
||||||
if (!rb_respond_to(str2, rb_intern("to_str"))) {
|
if (!rb_respond_to(str2, rb_intern("to_str"))) {
|
||||||
return Qfalse;
|
return Qnil;
|
||||||
}
|
}
|
||||||
return rb_equal(str2, str1);
|
return rb_equal(str2, str1);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user