number 0.9.2 → 0.9.3

data/ext/number.c

@@ -232,6 +232,16 @@ VALUE rb_Number_modulo (VALUE a, VALUE b)
     return result;
 }
 
+VALUE rb_Number_eq_p (VALUE a, VALUE b)
+{
+    return (CLASS_OF(b) == rb_cNumber || rb_obj_is_kind_of(b, rb_cNumeric)) && complex_re_n_eq_n_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
+}
+
+VALUE rb_Number_eqq_p (VALUE a, VALUE b)
+{
+    return (CLASS_OF(b) == rb_cNumber || rb_obj_is_kind_of(b, rb_cNumeric)) && complex_eq_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
+}
+
 VALUE rb_Number_abs (VALUE number)
 {
     VALUE result = rb_obj_alloc(rb_cNumber);
@@ -586,9 +596,9 @@ VALUE rb_Number_real_right_unbounded_p (VALUE number)
     return complex_re_right_unbounded_p(DATA_PTR(number)) ? Qtrue : Qfalse;
 }
 
-VALUE rb_Number_real_contain_p (VALUE a, VALUE b)
+VALUE rb_Number_real_enclose_p (VALUE a, VALUE b)
 {
-    return complex_re_contain_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
+    return complex_re_enclose_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
 }
 
 VALUE rb_Number_real_contain_l_p (VALUE a, VALUE b)
@@ -901,9 +911,9 @@ VALUE rb_Number_imag_right_unbounded_p (VALUE number)
     return complex_im_right_unbounded_p(DATA_PTR(number)) ? Qtrue : Qfalse;
 }
 
-VALUE rb_Number_imag_contain_p (VALUE a, VALUE b)
+VALUE rb_Number_imag_enclose_p (VALUE a, VALUE b)
 {
-    return complex_im_contain_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
+    return complex_im_enclose_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
 }
 
 VALUE rb_Number_imag_contain_l_p (VALUE a, VALUE b)
@@ -1196,9 +1206,9 @@ VALUE rb_Number_complex_unbounded_p (VALUE number)
     return complex_unbounded_p(DATA_PTR(number)) ? Qtrue : Qfalse;
 }
 
-VALUE rb_Number_complex_contain_p (VALUE a, VALUE b)
+VALUE rb_Number_complex_enclose_p (VALUE a, VALUE b)
 {
-    return complex_contain_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
+    return complex_enclose_p(DATA_PTR(a), DATA_PTR(rb_convert_type(b, T_DATA, "Number", "to_number"))) ? Qtrue : Qfalse;
 }
 
 VALUE rb_Number_complex_contain_ll_p (VALUE a, VALUE b)
@@ -1304,12 +1314,13 @@ void Init_number ()
     rb_define_method(rb_cNumber, "/", rb_Number_divide, 1);
     rb_define_method(rb_cNumber, "%", rb_Number_modulo, 1);
     
+    rb_define_method(rb_cNumber, "==", rb_Number_eq_p, 1);
+    rb_define_method(rb_cNumber, "===", rb_Number_eqq_p, 1);
+    
     rb_define_method(rb_cNumber, "<", rb_Number_real_n_lt_n_p, 1);
     rb_define_method(rb_cNumber, "<=", rb_Number_real_n_le_n_p, 1);
     rb_define_method(rb_cNumber, ">", rb_Number_real_n_gt_n_p, 1);
     rb_define_method(rb_cNumber, ">=", rb_Number_real_n_ge_n_p, 1);
-    rb_define_method(rb_cNumber, "==", rb_Number_real_n_eq_n_p, 1);
-    rb_define_method(rb_cNumber, "===", rb_Number_complex_eq_p, 1);
     
     rb_define_method(rb_cNumber, "abs", rb_Number_abs, 0);
     rb_define_method(rb_cNumber, "area", rb_Number_area, 0);
@@ -1318,10 +1329,10 @@ void Init_number ()
     rb_define_method(rb_cNumber, "diagonal", rb_Number_diagonal, 0);
     rb_define_method(rb_cNumber, "imag", rb_Number_imag, 0);
     rb_define_method(rb_cNumber, "negate", rb_Number_negate, 0);
-    rb_define_method(rb_cNumber, "reflect", rb_Number_reflect, 0);
-    rb_define_method(rb_cNumber, "round", rb_Number_round, 0);
     rb_define_method(rb_cNumber, "real", rb_Number_real, 0);
     rb_define_method(rb_cNumber, "real?", rb_Number_real_p, 0);
+    rb_define_method(rb_cNumber, "reflect", rb_Number_reflect, 0);
+    rb_define_method(rb_cNumber, "round", rb_Number_round, 0);
     rb_define_method(rb_cNumber, "sqrt", rb_Number_sqrt, 0);
     
     rb_define_method(rb_cNumber, "ceil", rb_Number_round_c_c, 0);
@@ -1381,10 +1392,10 @@ void Init_number ()
     rb_define_method(rb_cNumber, "imag_disjoint?", rb_Number_imag_disjoint_p, 1);
     rb_define_method(rb_cNumber, "complex_disjoint?", rb_Number_complex_disjoint_p, 1);
     
-    rb_define_method(rb_cNumber, "contain?", rb_Number_real_contain_p, 1);
-    rb_define_method(rb_cNumber, "real_contain?", rb_Number_real_contain_p, 1);
-    rb_define_method(rb_cNumber, "imag_contain?", rb_Number_imag_contain_p, 1);
-    rb_define_method(rb_cNumber, "complex_contain?", rb_Number_complex_contain_p, 1);
+    rb_define_method(rb_cNumber, "enclose?", rb_Number_real_enclose_p, 1);
+    rb_define_method(rb_cNumber, "real_enclose?", rb_Number_real_enclose_p, 1);
+    rb_define_method(rb_cNumber, "imag_enclose?", rb_Number_imag_enclose_p, 1);
+    rb_define_method(rb_cNumber, "complex_enclose?", rb_Number_complex_enclose_p, 1);
     
     rb_define_method(rb_cNumber, "contain_l?", rb_Number_real_contain_l_p, 1);
     rb_define_method(rb_cNumber, "real_contain_l?", rb_Number_real_contain_l_p, 1);
@@ -1392,6 +1403,7 @@ void Init_number ()
     rb_define_method(rb_cNumber, "complex_contain_ll?", rb_Number_complex_contain_ll_p, 1);
     rb_define_method(rb_cNumber, "complex_contain_lu?", rb_Number_complex_contain_lu_p, 1);
     
+    rb_define_method(rb_cNumber, "contain?", rb_Number_real_contain_n_p, 1);
     rb_define_method(rb_cNumber, "contain_n?", rb_Number_real_contain_n_p, 1);
     rb_define_method(rb_cNumber, "real_contain_n?", rb_Number_real_contain_n_p, 1);
     rb_define_method(rb_cNumber, "imag_contain_n?", rb_Number_imag_contain_n_p, 1);

metadata

@@ -2,7 +2,7 @@
 name: number
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Jesse Sielaff