ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/ocinumber.c

@@ -2,12 +2,13 @@
 /*
  *  ocinumber.c
  *
- * Copyright (C) 2005-2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2005-2011 KUBO Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
 #include <orl.h>
 #include <errno.h>
+#include <math.h>
 #include "oranumber_util.h"
 
 #ifndef RB_NUM_COERCE_FUNCS_NEED_OPID
@@ -16,6 +17,12 @@
 #define rb_num_coerce_bin(x, y, id) rb_num_coerce_bin((x), (y))
 #endif
 
+int oci8_float_conversion_type_is_ruby = 1;
+
+#ifndef INFINITY
+#define INFINITY (1.0/+0.0)
+#endif
+
 static ID id_power; /* rb_intern("**") */
 static ID id_cmp;   /* rb_intern("<=>") */
 static ID id_finite_p;
@@ -112,7 +119,7 @@ VALUE oci8_make_ocinumber(OCINumber *s, OCIError *errhp)
     OCINumber *d;
 
     obj = Data_Make_Struct(cOCINumber, OCINumber, NULL, xfree, d);
-    oci_lc(OCINumberAssign(errhp, s, d));
+    chkerr(OCINumberAssign(errhp, s, d));
     return obj;
 }
 
@@ -136,10 +143,7 @@ VALUE oci8_make_integer(OCINumber *s, OCIError *errhp)
 
 VALUE oci8_make_float(OCINumber *s, OCIError *errhp)
 {
-    double dbl;
-
-    oci_lc(OCINumberToReal(errhp, s, sizeof(double), &dbl));
-    return rb_float_new(dbl);
+    return rb_float_new(oci8_onum_to_dbl(s, errhp));
 }
 
 /* fill C structure (OCINumber) from a string. */
@@ -180,7 +184,7 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
         nls_params_len = RSTRING_LEN(nls_params);
     }
-    oci_lc(OCINumberFromText(errhp,
+    chkerr(OCINumberFromText(errhp,
                              RSTRING_ORATEXT(str), RSTRING_LEN(str),
                              fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
                              result));
@@ -191,7 +195,6 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
 static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIError *errhp)
 {
     signed long sl;
-    double dbl;
 
     if (!RTEST(rb_obj_is_kind_of(num, rb_cNumeric)))
         rb_raise(rb_eTypeError, "expect Numeric but %s", rb_class2name(CLASS_OF(num)));
@@ -202,12 +205,11 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
     case T_FIXNUM:
         /* set from long. */
         sl = NUM2LONG(num);
-        oci_lc(OCINumberFromInt(errhp, &sl, sizeof(sl), OCI_NUMBER_SIGNED, result));
+        chkerr(OCINumberFromInt(errhp, &sl, sizeof(sl), OCI_NUMBER_SIGNED, result));
         return 1;
     case T_FLOAT:
         /* set from double. */
-        dbl = NUM2DBL(num);
-        oci_lc(OCINumberFromReal(errhp, &dbl, sizeof(dbl), result));
+        oci8_dbl_to_onum(result, NUM2DBL(num), errhp);
         return 1;
     case T_BIGNUM:
         /* change via string. */
@@ -217,7 +219,7 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
     }
     if (RTEST(rb_obj_is_instance_of(num, cOCINumber))) {
         /* OCI::Number */
-        oci_lc(OCINumberAssign(errhp, DATA_PTR(num), result));
+        chkerr(OCINumberAssign(errhp, DATA_PTR(num), result));
         return 1;
     }
     if (rb_respond_to(num, id_split)) {
@@ -255,23 +257,11 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
             }
             exponent = FIX2INT(ary[3]);
 
-            if (have_OCINumberShift) {
-                /* Oracle 8.1 or upper */
-                oci_lc(OCINumberShift(errhp, &digits, exponent - digits_len, &work));
-            } else {
-                /* Oracle 8.0 */
-                int n = 10;
-                OCINumber base;
-                OCINumber exp;
-
-                oci_lc(OCINumberFromInt(errhp, &n, sizeof(n), OCI_NUMBER_SIGNED, &base));
-                oci_lc(OCINumberIntPower(errhp, &base, exponent - digits_len, &exp));
-                oci_lc(OCINumberMul(errhp, &digits, &exp, &work));
-            }
+            chkerr(OCINumberShift(errhp, &digits, exponent - digits_len, &work));
             if (sign >= 0) {
-                oci_lc(OCINumberAssign(errhp, &work, result));
+                chkerr(OCINumberAssign(errhp, &work, result));
             } else {
-                oci_lc(OCINumberNeg(errhp, &work, result));
+                chkerr(OCINumberNeg(errhp, &work, result));
             }
             return 1;
         }
@@ -284,7 +274,7 @@ is_not_big_decimal:
 
         if (set_oci_number_from_num(&numerator, rb_funcall(num, id_numerator, 0), 0, errhp) &&
             set_oci_number_from_num(&denominator, rb_funcall(num, id_denominator, 0), 0, errhp)) {
-            oci_lc(OCINumberDiv(errhp, &numerator, &denominator, result));
+            chkerr(OCINumberDiv(errhp, &numerator, &denominator, result));
             return 1;
         }
     }
@@ -309,7 +299,65 @@ OCINumber *oci8_set_integer(OCINumber *result, VALUE self, OCIError *errhp)
     OCINumber work;
 
     set_oci_number_from_num(&work, self, 1, errhp);
-    oci_lc(OCINumberTrunc(errhp, &work, 0, result));
+    chkerr(OCINumberTrunc(errhp, &work, 0, result));
+    return result;
+}
+
+double oci8_onum_to_dbl(OCINumber *s, OCIError *errhp)
+{
+    if (oci8_float_conversion_type_is_ruby) {
+        char buf[256];
+        sword rv;
+
+        rv = oranumber_to_str(s, buf, sizeof(buf));
+        if (rv <= 0) {
+            char buf[ORANUMBER_DUMP_BUF_SIZ];
+
+            oranumber_dump(s, buf);
+            rb_raise(eOCIException, "Invalid internal number format: %s", buf);
+        }
+        if (strcmp(buf, "~") == 0) {
+            return INFINITY;
+        } else if (strcmp(buf, "-~") == 0) {
+            return -INFINITY;
+        }
+        return rb_cstr_to_dbl(buf, Qtrue);
+    } else {
+        double dbl;
+
+        chkerr(OCINumberToReal(errhp, s, sizeof(double), &dbl));
+        return dbl;
+    }
+}
+
+OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp)
+{
+    switch (fpclassify(dbl)) {
+    case FP_NAN:
+        rb_raise(rb_eFloatDomainError, "NaN");
+        /* never reach here */
+        break;
+    case FP_INFINITE:
+        if (dbl > 0.0) {
+            oranumber_from_str(result, "~", 1);
+        } else {
+            oranumber_from_str(result, "-~", 2);
+        }
+        return result;
+    }
+
+    if (oci8_float_conversion_type_is_ruby) {
+        VALUE str;
+        sword rv;
+
+        str = rb_obj_as_string(rb_float_new(dbl));
+        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        if (rv != 0) {
+            oci8_raise_by_msgno(rv, NULL);
+        }
+    } else {
+        chkerr(OCINumberFromReal(errhp, &dbl, sizeof(dbl), result));
+    }
     return result;
 }
 
@@ -332,9 +380,9 @@ static VALUE omath_atan2(VALUE self, VALUE Ycoordinate, VALUE Xcoordinate)
     set_oci_number_from_num(&nX, Xcoordinate, 1, errhp);
     set_oci_number_from_num(&nY, Ycoordinate, 1, errhp);
     /* check zero */
-    oci_lc(OCINumberIsZero(errhp, &nX, &is_zero));
+    chkerr(OCINumberIsZero(errhp, &nX, &is_zero));
     if (is_zero) {
-        oci_lc(OCINumberSign(errhp, &nY, &sign));
+        chkerr(OCINumberSign(errhp, &nY, &sign));
         switch (sign) {
         case 0:
             return INT2FIX(0); /* atan2(0, 0) => 0 or ERROR? */
@@ -345,7 +393,7 @@ static VALUE omath_atan2(VALUE self, VALUE Ycoordinate, VALUE Xcoordinate)
         }
     }
     /* atan2 */
-    oci_lc(OCINumberArcTan2(errhp, &nY, &nX, &rv));
+    chkerr(OCINumberArcTan2(errhp, &nY, &nX, &rv));
     return oci8_make_ocinumber(&rv, errhp);
 }
 
@@ -362,7 +410,7 @@ static VALUE omath_cos(VALUE obj, VALUE radian)
     OCINumber r;
     OCINumber rv;
 
-    oci_lc(OCINumberCos(errhp, TO_OCINUM(&r, radian, errhp), &rv));
+    chkerr(OCINumberCos(errhp, TO_OCINUM(&r, radian, errhp), &rv));
     return oci8_make_ocinumber(&rv, errhp);
 }
 
@@ -379,7 +427,7 @@ static VALUE omath_sin(VALUE obj, VALUE radian)
     OCINumber r;
     OCINumber rv;
 
-    oci_lc(OCINumberSin(errhp, TO_OCINUM(&r, radian, errhp), &rv));
+    chkerr(OCINumberSin(errhp, TO_OCINUM(&r, radian, errhp), &rv));
     return oci8_make_ocinumber(&rv, errhp);
 }
 
@@ -395,7 +443,7 @@ static VALUE omath_tan(VALUE obj, VALUE radian)
     OCINumber r;
     OCINumber rv;
 
-    oci_lc(OCINumberTan(errhp, TO_OCINUM(&r, radian, errhp), &rv));
+    chkerr(OCINumberTan(errhp, TO_OCINUM(&r, radian, errhp), &rv));
     return oci8_make_ocinumber(&rv, errhp);
 }
 
@@ -414,15 +462,15 @@ static VALUE omath_acos(VALUE obj, VALUE num)
 
     set_oci_number_from_num(&n, num, 1, errhp);
     /* check upper bound */
-    oci_lc(OCINumberCmp(errhp, &n, &const_p1, &sign));
+    chkerr(OCINumberCmp(errhp, &n, &const_p1, &sign));
     if (sign > 0)
         rb_raise(rb_eRangeError, "out of range for acos");
     /* check lower bound */
-    oci_lc(OCINumberCmp(errhp, &n, &const_m1, &sign));
+    chkerr(OCINumberCmp(errhp, &n, &const_m1, &sign));
     if (sign < 0)
         rb_raise(rb_eRangeError, "out of range for acos");
     /* acos */
-    oci_lc(OCINumberArcCos(errhp, &n, &r));
+    chkerr(OCINumberArcCos(errhp, &n, &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -441,15 +489,15 @@ static VALUE omath_asin(VALUE obj, VALUE num)
 
     set_oci_number_from_num(&n, num, 1, errhp);
     /* check upper bound */
-    oci_lc(OCINumberCmp(errhp, &n, &const_p1, &sign));
+    chkerr(OCINumberCmp(errhp, &n, &const_p1, &sign));
     if (sign > 0)
         rb_raise(rb_eRangeError, "out of range for asin");
     /* check lower bound */
-    oci_lc(OCINumberCmp(errhp, &n, &const_m1, &sign));
+    chkerr(OCINumberCmp(errhp, &n, &const_m1, &sign));
     if (sign < 0)
         rb_raise(rb_eRangeError, "out of range for asin");
     /* asin */
-    oci_lc(OCINumberArcSin(errhp, &n, &r));
+    chkerr(OCINumberArcSin(errhp, &n, &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -465,7 +513,7 @@ static VALUE omath_atan(VALUE obj, VALUE num)
     OCINumber n;
     OCINumber r;
 
-    oci_lc(OCINumberArcTan(errhp, TO_OCINUM(&n, num, errhp), &r));
+    chkerr(OCINumberArcTan(errhp, TO_OCINUM(&n, num, errhp), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -481,7 +529,7 @@ static VALUE omath_cosh(VALUE obj, VALUE num)
     OCINumber n;
     OCINumber r;
 
-    oci_lc(OCINumberHypCos(errhp, TO_OCINUM(&n, num, errhp), &r));
+    chkerr(OCINumberHypCos(errhp, TO_OCINUM(&n, num, errhp), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -498,7 +546,7 @@ static VALUE omath_sinh(VALUE obj, VALUE num)
     OCINumber n;
     OCINumber r;
 
-    oci_lc(OCINumberHypSin(errhp, TO_OCINUM(&n, num, errhp), &r));
+    chkerr(OCINumberHypSin(errhp, TO_OCINUM(&n, num, errhp), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -515,7 +563,7 @@ static VALUE omath_tanh(VALUE obj, VALUE num)
     OCINumber n;
     OCINumber r;
 
-    oci_lc(OCINumberHypTan(errhp, TO_OCINUM(&n, num, errhp), &r));
+    chkerr(OCINumberHypTan(errhp, TO_OCINUM(&n, num, errhp), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -531,7 +579,7 @@ static VALUE omath_exp(VALUE obj, VALUE num)
     OCINumber n;
     OCINumber r;
 
-    oci_lc(OCINumberExp(errhp, TO_OCINUM(&n, num, errhp), &r));
+    chkerr(OCINumberExp(errhp, TO_OCINUM(&n, num, errhp), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -554,20 +602,20 @@ static VALUE omath_log(int argc, VALUE *argv, VALUE obj)
 
     rb_scan_args(argc, argv, "11", &num, &base);
     set_oci_number_from_num(&n, num, 1, errhp);
-    oci_lc(OCINumberSign(errhp, &n, &sign));
+    chkerr(OCINumberSign(errhp, &n, &sign));
     if (sign <= 0)
         rb_raise(rb_eRangeError, "nonpositive value for log");
     if (NIL_P(base)) {
-        oci_lc(OCINumberLn(errhp, &n, &r));
+        chkerr(OCINumberLn(errhp, &n, &r));
     } else {
         set_oci_number_from_num(&b, base, 1, errhp);
-        oci_lc(OCINumberSign(errhp, &b, &sign));
+        chkerr(OCINumberSign(errhp, &b, &sign));
         if (sign <= 0)
             rb_raise(rb_eRangeError, "nonpositive value for the base of log");
-        oci_lc(OCINumberCmp(errhp, &b, &const_p1, &sign));
+        chkerr(OCINumberCmp(errhp, &b, &const_p1, &sign));
         if (sign == 0)
             rb_raise(rb_eRangeError, "base 1 for log");
-        oci_lc(OCINumberLog(errhp, &b, &n, &r));
+        chkerr(OCINumberLog(errhp, &b, &n, &r));
     }
     return oci8_make_ocinumber(&r, errhp);
 }
@@ -586,10 +634,10 @@ static VALUE omath_log10(VALUE obj, VALUE num)
     sword sign;
 
     set_oci_number_from_num(&n, num, 1, errhp);
-    oci_lc(OCINumberSign(errhp, &n, &sign));
+    chkerr(OCINumberSign(errhp, &n, &sign));
     if (sign <= 0)
         rb_raise(rb_eRangeError, "nonpositive value for log10");
-    oci_lc(OCINumberLog(errhp, &const_p10, &n, &r));
+    chkerr(OCINumberLog(errhp, &const_p10, &n, &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -608,12 +656,12 @@ static VALUE omath_sqrt(VALUE obj, VALUE num)
 
     set_oci_number_from_num(&n, num, 1, errhp);
     /* check whether num is negative */
-    oci_lc(OCINumberSign(errhp, &n, &sign));
+    chkerr(OCINumberSign(errhp, &n, &sign));
     if (sign < 0) {
         errno = EDOM;
         rb_sys_fail("sqrt");
     }
-    oci_lc(OCINumberSqrt(errhp, &n, &r));
+    chkerr(OCINumberSqrt(errhp, &n, &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -654,7 +702,7 @@ static VALUE onum_initialize_copy(VALUE lhs, VALUE rhs)
         rb_raise(rb_eTypeError, "invalid type: expected %s but %s",
                  rb_class2name(CLASS_OF(lhs)), rb_class2name(CLASS_OF(rhs)));
     }
-    oci_lc(OCINumberAssign(oci8_errhp, _NUMBER(rhs), _NUMBER(lhs)));
+    chkerr(OCINumberAssign(oci8_errhp, _NUMBER(rhs), _NUMBER(lhs)));
     return lhs;
 }
 
@@ -666,7 +714,7 @@ static VALUE onum_coerce(VALUE self, VALUE other)
     switch(rboci8_type(other)) {
     case T_FIXNUM:
         sl = NUM2LONG(other);
-        oci_lc(OCINumberFromInt(oci8_errhp, &sl, sizeof(sl), OCI_NUMBER_SIGNED, &n));
+        chkerr(OCINumberFromInt(oci8_errhp, &sl, sizeof(sl), OCI_NUMBER_SIGNED, &n));
         return rb_assoc_new(oci8_make_ocinumber(&n, oci8_errhp), self);
     case T_BIGNUM:
         /* change via string. */
@@ -695,7 +743,7 @@ static VALUE onum_neg(VALUE self)
     OCIError *errhp = oci8_errhp;
     OCINumber r;
 
-    oci_lc(OCINumberNeg(errhp, _NUMBER(self), &r));
+    chkerr(OCINumberNeg(errhp, _NUMBER(self), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -716,12 +764,12 @@ static VALUE onum_add(VALUE lhs, VALUE rhs)
     case T_FIXNUM:
     case T_BIGNUM:
         if (set_oci_number_from_num(&n, rhs, 0, errhp)) {
-            oci_lc(OCINumberAdd(errhp, _NUMBER(lhs), &n, &r));
+            chkerr(OCINumberAdd(errhp, _NUMBER(lhs), &n, &r));
             return oci8_make_ocinumber(&r, errhp);
         }
         break;
     case RBOCI8_T_ORANUMBER:
-        oci_lc(OCINumberAdd(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
+        chkerr(OCINumberAdd(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_add_op, 1, rhs);
@@ -750,12 +798,12 @@ static VALUE onum_sub(VALUE lhs, VALUE rhs)
     case T_FIXNUM:
     case T_BIGNUM:
         if (set_oci_number_from_num(&n, rhs, 0, errhp)) {
-            oci_lc(OCINumberSub(errhp, _NUMBER(lhs), &n, &r));
+            chkerr(OCINumberSub(errhp, _NUMBER(lhs), &n, &r));
             return oci8_make_ocinumber(&r, errhp);
         }
         break;
     case RBOCI8_T_ORANUMBER:
-        oci_lc(OCINumberSub(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
+        chkerr(OCINumberSub(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_sub_op, 1, rhs);
@@ -783,12 +831,12 @@ static VALUE onum_mul(VALUE lhs, VALUE rhs)
     case T_FIXNUM:
     case T_BIGNUM:
         if (set_oci_number_from_num(&n, rhs, 0, errhp)) {
-            oci_lc(OCINumberMul(errhp, _NUMBER(lhs), &n, &r));
+            chkerr(OCINumberMul(errhp, _NUMBER(lhs), &n, &r));
             return oci8_make_ocinumber(&r, errhp);
         }
         break;
     case RBOCI8_T_ORANUMBER:
-        oci_lc(OCINumberMul(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
+        chkerr(OCINumberMul(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_mul_op, 1, rhs);
@@ -821,16 +869,16 @@ static VALUE onum_div(VALUE lhs, VALUE rhs)
         }
     case T_BIGNUM:
         if (set_oci_number_from_num(&n, rhs, 0, errhp)) {
-            oci_lc(OCINumberDiv(errhp, _NUMBER(lhs), &n, &r));
+            chkerr(OCINumberDiv(errhp, _NUMBER(lhs), &n, &r));
             return oci8_make_ocinumber(&r, errhp);
         }
         break;
     case RBOCI8_T_ORANUMBER:
-        oci_lc(OCINumberIsZero(errhp, _NUMBER(rhs), &is_zero));
+        chkerr(OCINumberIsZero(errhp, _NUMBER(rhs), &is_zero));
         if (is_zero) {
             rb_num_zerodiv();
         }
-        oci_lc(OCINumberDiv(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
+        chkerr(OCINumberDiv(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
         return rb_funcall(onum_to_f(lhs), oci8_id_div_op, 1, rhs);
@@ -859,11 +907,11 @@ static VALUE onum_mod(VALUE lhs, VALUE rhs)
     if (!set_oci_number_from_num(&n, rhs, 0, errhp))
         return rb_num_coerce_bin(lhs, rhs, '%');
     /* check whether argument is not zero. */
-    oci_lc(OCINumberIsZero(errhp, &n, &is_zero));
+    chkerr(OCINumberIsZero(errhp, &n, &is_zero));
     if (is_zero)
         rb_num_zerodiv();
     /* modulo */
-    oci_lc(OCINumberMod(errhp, _NUMBER(lhs), &n, &r));
+    chkerr(OCINumberMod(errhp, _NUMBER(lhs), &n, &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -880,12 +928,12 @@ static VALUE onum_power(VALUE lhs, VALUE rhs)
     OCINumber r;
 
     if (FIXNUM_P(rhs)) {
-        oci_lc(OCINumberIntPower(errhp, _NUMBER(lhs), FIX2INT(rhs), &r));
+        chkerr(OCINumberIntPower(errhp, _NUMBER(lhs), FIX2INT(rhs), &r));
     } else {
         /* change to OCINumber */
         if (!set_oci_number_from_num(&n, rhs, 0, errhp))
             return rb_num_coerce_bin(lhs, rhs, id_power);
-        oci_lc(OCINumberPower(errhp, _NUMBER(lhs), &n, &r));
+        chkerr(OCINumberPower(errhp, _NUMBER(lhs), &n, &r));
     }
     return oci8_make_ocinumber(&r, errhp);
 }
@@ -908,7 +956,7 @@ static VALUE onum_cmp(VALUE lhs, VALUE rhs)
     if (!set_oci_number_from_num(&n, rhs, 0, errhp))
         return rb_num_coerce_cmp(lhs, rhs, id_cmp);
     /* compare */
-    oci_lc(OCINumberCmp(errhp, _NUMBER(lhs), &n, &r));
+    chkerr(OCINumberCmp(errhp, _NUMBER(lhs), &n, &r));
     if (r > 0) {
         return INT2FIX(1);
     } else if (r == 0) {
@@ -929,7 +977,7 @@ static VALUE onum_floor(VALUE self)
     OCIError *errhp = oci8_errhp;
     OCINumber r;
 
-    oci_lc(OCINumberFloor(errhp, _NUMBER(self), &r));
+    chkerr(OCINumberFloor(errhp, _NUMBER(self), &r));
     return oci8_make_integer(&r, errhp);
 }
 
@@ -945,7 +993,7 @@ static VALUE onum_ceil(VALUE self)
     OCIError *errhp = oci8_errhp;
     OCINumber r;
 
-    oci_lc(OCINumberCeil(errhp, _NUMBER(self), &r));
+    chkerr(OCINumberCeil(errhp, _NUMBER(self), &r));
     return oci8_make_integer(&r, errhp);
 }
 
@@ -968,7 +1016,7 @@ static VALUE onum_round(int argc, VALUE *argv, VALUE self)
     OCINumber r;
 
     rb_scan_args(argc, argv, "01", &decplace /* 0 */);
-    oci_lc(OCINumberRound(errhp, _NUMBER(self), NIL_P(decplace) ? 0 : NUM2INT(decplace), &r));
+    chkerr(OCINumberRound(errhp, _NUMBER(self), NIL_P(decplace) ? 0 : NUM2INT(decplace), &r));
     if (argc == 0) {
         return oci8_make_integer(&r, errhp);
     } else {
@@ -991,7 +1039,7 @@ static VALUE onum_trunc(int argc, VALUE *argv, VALUE self)
     OCINumber r;
 
     rb_scan_args(argc, argv, "01", &decplace /* 0 */);
-    oci_lc(OCINumberTrunc(errhp, _NUMBER(self), NIL_P(decplace) ? 0 : NUM2INT(decplace), &r));
+    chkerr(OCINumberTrunc(errhp, _NUMBER(self), NIL_P(decplace) ? 0 : NUM2INT(decplace), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -1011,7 +1059,7 @@ static VALUE onum_round_prec(VALUE self, VALUE ndigs)
     OCIError *errhp = oci8_errhp;
     OCINumber r;
 
-    oci_lc(OCINumberPrec(errhp, _NUMBER(self), NUM2INT(ndigs), &r));
+    chkerr(OCINumberPrec(errhp, _NUMBER(self), NUM2INT(ndigs), &r));
     return oci8_make_ocinumber(&r, errhp);
 }
 
@@ -1067,7 +1115,7 @@ static VALUE onum_to_char(int argc, VALUE *argv, VALUE self)
             if (NIL_P(fmt)) /* implicit conversion */
                 return rb_usascii_str_new_cstr("overflow");
         }
-        oci8_raise(errhp, rv, NULL);
+        chkerr(rv);
     }
     return rb_usascii_str_new(buf, buf_size);
 }
@@ -1094,7 +1142,7 @@ static VALUE onum_to_i(VALUE self)
     OCIError *errhp = oci8_errhp;
     OCINumber num;
 
-    oci_lc(OCINumberTrunc(errhp, _NUMBER(self), 0, &num));
+    chkerr(OCINumberTrunc(errhp, _NUMBER(self), 0, &num));
     return oci8_make_integer(&num, errhp);
 }
 
@@ -1107,11 +1155,7 @@ static VALUE onum_to_i(VALUE self)
  */
 static VALUE onum_to_f(VALUE self)
 {
-    OCIError *errhp = oci8_errhp;
-    double dbl;
-
-    oci_lc(OCINumberToReal(errhp, _NUMBER(self), sizeof(dbl), &dbl));
-    return rb_float_new(dbl);
+    return rb_float_new(oci8_onum_to_dbl(_NUMBER(self), oci8_errhp));
 }
 
 /*
@@ -1129,15 +1173,15 @@ static VALUE onum_to_r(VALUE self)
     int current = 0;
     boolean is_int;
 
-    oci_lc(OCINumberAssign(oci8_errhp, _NUMBER(self), &onum[0]));
+    chkerr(OCINumberAssign(oci8_errhp, _NUMBER(self), &onum[0]));
 
     for (;;) {
-        oci_lc(OCINumberIsInt(oci8_errhp, &onum[current], &is_int));
+        chkerr(OCINumberIsInt(oci8_errhp, &onum[current], &is_int));
         if (is_int) {
             break;
         }
         nshift++;
-        oci_lc(OCINumberShift(oci8_errhp, &onum[current], 1, &onum[1 - current]));
+        chkerr(OCINumberShift(oci8_errhp, &onum[current], 1, &onum[1 - current]));
         current = 1 - current;
     }
     x = oci8_make_integer(&onum[current], oci8_errhp);
@@ -1180,7 +1224,7 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
         rb_require("bigdecimal");
         cBigDecimal = rb_const_get(rb_cObject, id_BigDecimal);
     }
-    oci_lc(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
+    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
                            NULL, 0, &buf_size, TO_ORATEXT(buf)));
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }
@@ -1199,7 +1243,7 @@ static VALUE onum_has_decimal_part_p(VALUE self)
     OCIError *errhp = oci8_errhp;
     boolean result;
 
-    oci_lc(OCINumberIsInt(errhp, _NUMBER(self), &result));
+    chkerr(OCINumberIsInt(errhp, _NUMBER(self), &result));
     return result ? Qfalse : Qtrue;
 }
 
@@ -1227,7 +1271,7 @@ static VALUE onum_zero_p(VALUE self)
     OCIError *errhp = oci8_errhp;
     boolean result;
 
-    oci_lc(OCINumberIsZero(errhp, _NUMBER(self), &result));
+    chkerr(OCINumberIsZero(errhp, _NUMBER(self), &result));
     return result ? Qtrue : Qfalse;
 }
 
@@ -1243,7 +1287,7 @@ static VALUE onum_abs(VALUE self)
     OCIError *errhp = oci8_errhp;
     OCINumber result;
 
-    oci_lc(OCINumberAbs(errhp, _NUMBER(self), &result));
+    chkerr(OCINumberAbs(errhp, _NUMBER(self), &result));
     return oci8_make_ocinumber(&result, errhp);
 }
 
@@ -1259,7 +1303,7 @@ static VALUE onum_shift(VALUE self, VALUE exp)
     OCIError *errhp = oci8_errhp;
     OCINumber result;
 
-    oci_lc(OCINumberShift(errhp, _NUMBER(self), NUM2INT(exp), &result));
+    chkerr(OCINumberShift(errhp, _NUMBER(self), NUM2INT(exp), &result));
     return oci8_make_ocinumber(&result, errhp);
 }
 
@@ -1285,7 +1329,7 @@ static VALUE onum_hash(VALUE self)
 {
     char *c  = DATA_PTR(self);
     int size = c[0] + 1;
-    int i, hash;
+    long i, hash;
 
     /* assert(size <= 22); ?*/
     if (size > 22)
@@ -1336,13 +1380,13 @@ static VALUE
 onum_s_load(VALUE klass, VALUE str)
 {
     unsigned char *c;
-    int size;
+    size_t size;
     OCINumber num;
 
     Check_Type(str, T_STRING);
     c = RSTRING_ORATEXT(str);
     size = RSTRING_LEN(str);
-    if (size == 0 || size != c[0] + 1 || size > sizeof(num)) {
+    if (size == 0 || size != c[0] + 1u || size > sizeof(num)) {
         rb_raise(rb_eTypeError, "marshaled OCI::Number format differ");
     }
     memset(&num, 0, sizeof(num));
@@ -1363,6 +1407,11 @@ static VALUE bind_integer_get(oci8_bind_t *obind, void *data, void *null_struct)
     return oci8_make_integer((OCINumber*)data, oci8_errhp);
 }
 
+static VALUE bind_float_get(oci8_bind_t *obind, void *data, void *null_struct)
+{
+    return oci8_make_float((OCINumber*)data, oci8_errhp);
+}
+
 static void bind_ocinumber_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     set_oci_number_from_num((OCINumber*)data, val, 1, oci8_errhp);
@@ -1374,7 +1423,8 @@ static void bind_integer_set(oci8_bind_t *obind, void *data, void **null_structp
     OCINumber num;
 
     set_oci_number_from_num(&num, val, 1, errhp);
-    oci_lc(OCINumberTrunc(errhp, &num, 0, (OCINumber*)data));
+    chker2(OCINumberTrunc(errhp, &num, 0, (OCINumber*)data),
+           &obind->base);
 }
 
 static void bind_ocinumber_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
@@ -1393,7 +1443,7 @@ static void bind_ocinumber_init_elem(oci8_bind_t *obind, VALUE svc)
     } while (++idx < obind->maxar_sz);
 }
 
-static const oci8_bind_class_t bind_ocinumber_class = {
+static const oci8_bind_vtable_t bind_ocinumber_vtable = {
     {
         NULL,
         oci8_bind_free,
@@ -1404,12 +1454,10 @@ static const oci8_bind_class_t bind_ocinumber_class = {
     bind_ocinumber_init,
     bind_ocinumber_init_elem,
     NULL,
-    NULL,
-    NULL,
     SQLT_VNU,
 };
 
-static const oci8_bind_class_t bind_integer_class = {
+static const oci8_bind_vtable_t bind_integer_vtable = {
     {
         NULL,
         oci8_bind_free,
@@ -1420,7 +1468,19 @@ static const oci8_bind_class_t bind_integer_class = {
     bind_ocinumber_init,
     bind_ocinumber_init_elem,
     NULL,
-    NULL,
+    SQLT_VNU,
+};
+
+static const oci8_bind_vtable_t bind_float_vtable = {
+    {
+        NULL,
+        oci8_bind_free,
+        sizeof(oci8_bind_t)
+    },
+    bind_float_get,
+    bind_ocinumber_set,
+    bind_ocinumber_init,
+    bind_ocinumber_init_elem,
     NULL,
     SQLT_VNU,
 };
@@ -1515,9 +1575,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_method(cOCINumber, "ceil", onum_ceil, 0);
     rb_define_method(cOCINumber, "round", onum_round, -1);
     rb_define_method(cOCINumber, "truncate", onum_trunc, -1);
-    if (have_OCINumberPrec) {
-        rb_define_method(cOCINumber, "round_prec", onum_round_prec, 1);
-    }
+    rb_define_method(cOCINumber, "round_prec", onum_round_prec, 1);
 
     rb_define_method(cOCINumber, "to_s", onum_to_s, 0);
     rb_define_method(cOCINumber, "to_char", onum_to_char, -1);
@@ -1530,9 +1588,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
 
     rb_define_method(cOCINumber, "zero?", onum_zero_p, 0);
     rb_define_method(cOCINumber, "abs", onum_abs, 0);
-    if (have_OCINumberShift) {
-        rb_define_method(cOCINumber, "shift", onum_shift, 1);
-    }
+    rb_define_method(cOCINumber, "shift", onum_shift, 1);
     rb_define_method(cOCINumber, "dump", onum_dump, 0);
 
     rb_define_method_nodoc(cOCINumber, "hash", onum_hash, 0);
@@ -1542,8 +1598,9 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_method(cOCINumber, "_dump", onum__dump, -1);
     rb_define_singleton_method(cOCINumber, "_load", onum_s_load, 1);
 
-    oci8_define_bind_class("OraNumber", &bind_ocinumber_class);
-    oci8_define_bind_class("Integer", &bind_integer_class);
+    oci8_define_bind_class("OraNumber", &bind_ocinumber_vtable);
+    oci8_define_bind_class("Integer", &bind_integer_vtable);
+    oci8_define_bind_class("Float", &bind_float_vtable);
 }
 
 OCINumber *oci8_get_ocinumber(VALUE num)