1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (num_equal): should not use rb_equal().

Browse Source 
* object.c (rb_equal): back out the last change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-07-21 18:48:58 +00:00
parent fa284f8127
commit c26663f24b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,10 +1,10 @@
Tue Jul 22 02:22:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Jul 22 02:22:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (num_equal): should not use rb_equal().
* string.c (rb_str_equal): should return nil for non string * string.c (rb_str_equal): should return nil for non string
operand to conform comparable convention. [ruby-dev:20759] 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,

6
numeric.c
View File

@ -57,7 +57,7 @@
#define DBL_EPSILON 2.2204460492503131e-16 #define DBL_EPSILON 2.2204460492503131e-16
#endif #endif
static ID id_coerce, id_to_i; static ID id_coerce, id_to_i, id_eq;
VALUE rb_cNumeric; VALUE rb_cNumeric;
VALUE rb_cFloat; VALUE rb_cFloat;
@ -515,7 +515,8 @@ static VALUE
num_equal(x, y) num_equal(x, y)
VALUE x, y; VALUE x, y;
{ {
return rb_equal(y, x); if (x == y) return Qtrue;
return rb_funcall(y, id_eq, 1, x);
} }
static VALUE static VALUE
@ -1804,6 +1805,7 @@ Init_Numeric()
#endif #endif
id_coerce = rb_intern("coerce"); id_coerce = rb_intern("coerce");
id_to_i = rb_intern("to_i"); id_to_i = rb_intern("to_i");
id_eq = rb_intern("==");
rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError); rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError);
rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError); rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError);

2
object.c
View File

@ -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 result; return Qfalse;
} }
int int