ruby-oci8 2.2.0.2 → 2.2.12

data/ext/oci8/ocinumber.c

@@ -23,10 +23,8 @@ static ID id_finite_p;
 static ID id_split;
 static ID id_numerator;
 static ID id_denominator;
-static ID id_Rational;
 static ID id_BigDecimal;
 
-static VALUE cRational;
 static VALUE cBigDecimal;
 
 static VALUE cOCINumber;
@@ -51,19 +49,6 @@ static int rboci8_type(VALUE obj)
     VALUE klass;
 
     switch (type) {
-    case T_OBJECT:
-        klass = CLASS_OF(obj);
-        if (cRational != 0) {
-            if (klass == cRational) {
-                return T_RATIONAL;
-            }
-        } else {
-            if (strcmp(rb_class2name(klass), "Rational") == 0) {
-                cRational = rb_const_get(rb_cObject, id_Rational);
-                return T_RATIONAL;
-            }
-        }
-        break;
     case T_DATA:
         klass = CLASS_OF(obj);
         if (klass == cOCINumber) {
@@ -169,7 +154,7 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     StringValue(str);
     /* set from string. */
     if (NIL_P(fmt)) {
-        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv == ORANUMBER_SUCCESS) {
             return; /* success */
         } else {
@@ -187,17 +172,17 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     chkerr(OCINumberFromText(errhp,
-                             RSTRING_ORATEXT(str), RSTRING_LEN(str),
+                             RSTRING_ORATEXT(str), RSTRING_LENINT(str),
                              fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
                              result));
 }
@@ -231,6 +216,8 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
         num = rb_big2str(num, 10);
         set_oci_number_from_str(result, num, Qnil, Qnil, errhp);
         return 1;
+    default:
+        break;
     }
     if (RTEST(rb_obj_is_instance_of(num, cOCINumber))) {
         /* OCI::Number */
@@ -262,7 +249,7 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
             if (TYPE(ary[1]) != T_STRING) {
                 goto is_not_big_decimal;
             }
-            digits_len = RSTRING_LEN(ary[1]);
+            digits_len = RSTRING_LENINT(ary[1]);
             set_oci_number_from_str(&digits, ary[1], Qnil, Qnil, errhp);
             /* check base */
             if (TYPE(ary[2]) != T_FIXNUM || FIX2LONG(ary[2]) != 10) {
@@ -378,7 +365,7 @@ OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp)
         sword rv;
 
         str = rb_obj_as_string(rb_float_new(dbl));
-        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv != 0) {
             oci8_raise_by_msgno(rv, NULL);
         }
@@ -1322,14 +1309,14 @@ static VALUE onum_to_char(int argc, VALUE *argv, VALUE self)
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     rv = OCINumberToText(errhp, _NUMBER(self),
                          fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
@@ -1444,29 +1431,29 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
 {
     char buf[64];
     ub4 buf_size = sizeof(buf);
-    const char *fmt = "FM9.99999999999999999999999999999999999999EEEE";
+    const char *fmt = "FM9.09999999999999999999999999999999999999EEEE";
 
     if (!cBigDecimal) {
         rb_require("bigdecimal");
         cBigDecimal = rb_const_get(rb_cObject, id_BigDecimal);
     }
-    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
+    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, (ub4)strlen(fmt),
                            NULL, 0, &buf_size, TO_ORATEXT(buf)));
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }
 
 /*
- * @overload has_decimal_part?
+ * @overload has_fractional_part?
  *
- *  Returns <code>true</code> if <i>self</i> has a decimal part.
+ *  Returns <code>true</code> if <i>self</i> has a fractional part.
  *
  *  @example
- *    OraNumber(10).has_decimal_part?   # => false
- *    OraNumber(10.1).has_decimal_part? # => true
+ *    OraNumber(10).has_fractional_part?   # => false
+ *    OraNumber(10.1).has_fractional_part? # => true
  *
- *  @since 2.0.5
+ *  @since 2.2.5
  */
-static VALUE onum_has_decimal_part_p(VALUE self)
+static VALUE onum_has_fractional_part_p(VALUE self)
 {
     OCIError *errhp = oci8_errhp;
     boolean result;
@@ -1805,10 +1792,10 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     id_split = rb_intern("split");
     id_numerator = rb_intern("numerator");
     id_denominator = rb_intern("denominator");
-    id_Rational = rb_intern("Rational");
     id_BigDecimal = rb_intern("BigDecimal");
 
     cOCINumber = rb_define_class("OraNumber", rb_cNumeric);
+    rb_define_alloc_func(cOCINumber, onum_s_alloc);
     mMath = rb_define_module_under(cOCI8, "Math");
 
     /* constants for internal use. */
@@ -1858,8 +1845,6 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_module_function(mMath, "log10", omath_log10, 1);
     rb_define_module_function(mMath, "sqrt", omath_sqrt, 1);
 
-    rb_define_alloc_func(cOCINumber, onum_s_alloc);
-
     /* methods of OCI::Number */
     rb_define_global_function("OraNumber", onum_f_new, -1);
     rb_define_method(cOCINumber, "initialize", onum_initialize, -1);
@@ -1889,7 +1874,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_method(cOCINumber, "to_f", onum_to_f, 0);
     rb_define_method(cOCINumber, "to_r", onum_to_r, 0);
     rb_define_method(cOCINumber, "to_d", onum_to_d, 0);
-    rb_define_method(cOCINumber, "has_decimal_part?", onum_has_decimal_part_p, 0);
+    rb_define_method(cOCINumber, "has_fractional_part?", onum_has_fractional_part_p, 0);
     rb_define_method(cOCINumber, "to_onum", onum_to_onum, 0);
 
     rb_define_method(cOCINumber, "zero?", onum_zero_p, 0);
@@ -1918,6 +1903,10 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     dummy2 = rb_define_class_under(mOCI8BindType, "Integer", cOCI8BindTypeBase);
     dummy3 = rb_define_class_under(mOCI8BindType, "Float", cOCI8BindTypeBase);
 #endif
+
+    /* The following method definition is for backward-compatibility.
+       I misunderstood the name of numbers after a decimal point. */
+    rb_define_method_nodoc(cOCINumber, "has_decimal_part?", onum_has_fractional_part_p, 0);
 }
 
 /*