summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 02:54:14 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-30 02:54:14 (GMT)
commit44af023d44decaa58225304176898663734af07b (patch)
treec6e59214bed4d6948ad980a327a6e022546f6ad2 /numeric.c
parent480bcad71dfe4cc6dd2a4b16a93cc01352515964 (diff)
{Fixnum,Bignum}#| is unified into Integer.
* numeric.c (int_or): {Fixnum,Bignum}#| is unified into Integer. * bignum.c (rb_big_or): Don't define Bignum#|. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/numeric.c b/numeric.c
index 8335a2c..95a77d5 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3913,9 +3913,9 @@ fix_and(VALUE x, VALUE y)
}
/*
- * Document-method: Fixnum#|
+ * Document-method: Integer#|
* call-seq:
- * fix | integer -> integer_result
+ * integer | integer -> integer_result
*
* Bitwise OR.
*/
@@ -3936,6 +3936,18 @@ fix_or(VALUE x, VALUE y)
return rb_funcall(x, '|', 1, y);
}
+static VALUE
+int_or(VALUE x, VALUE y)
+{
+ if (FIXNUM_P(x)) {
+ return fix_or(x, y);
+ }
+ else if (RB_TYPE_P(x, T_BIGNUM)) {
+ return rb_big_or(x, y);
+ }
+ return Qnil;
+}
+
/*
* Document-method: Integer#^
* call-seq:
@@ -4769,7 +4781,7 @@ Init_Numeric(void)
rb_define_method(rb_cFixnum, "~", fix_rev, 0);
rb_define_method(rb_cFixnum, "&", fix_and, 1);
- rb_define_method(rb_cFixnum, "|", fix_or, 1);
+ rb_define_method(rb_cInteger, "|", int_or, 1);
rb_define_method(rb_cInteger, "^", int_xor, 1);
rb_define_method(rb_cInteger, "[]", int_aref, 1);