diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-13 16:00:53 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-13 16:00:53 +0000 |
| commit | 25c0cb981af8fda9860ec6e365b9ea7a9e3f498f (patch) | |
| tree | b9b571a43d86bda67a18a05d95f0a437b5500b3b /pack.c | |
| parent | c4af7f51b7c703cfdf4a84f633af6b892b5d14a8 (diff) | |
* include/ruby/ruby.h: introduce 2 macros:
RFLOAT_VALUE(v), DOUBLE2NUM(dbl).
Rename RFloat#value -> RFloat#double_value.
Do not touch RFloat#double_value directly.
* bignum.c, insns.def, marshal.c, math.c, numeric.c, object.c,
pack.c, parse.y, process.c, random.c, sprintf.c, string.c,
time.c: apply above changes.
* ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
| -rw-r--r-- | pack.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -768,7 +768,7 @@ pack_pack(VALUE ary, VALUE fmt) float f; from = NEXTFROM; - f = RFLOAT(rb_Float(from))->value; + f = RFLOAT_VALUE(rb_Float(from)); rb_str_buf_cat(res, (char*)&f, sizeof(float)); } break; @@ -779,7 +779,7 @@ pack_pack(VALUE ary, VALUE fmt) FLOAT_CONVWITH(ftmp); from = NEXTFROM; - f = RFLOAT(rb_Float(from))->value; + f = RFLOAT_VALUE(rb_Float(from)); f = HTOVF(f,ftmp); rb_str_buf_cat(res, (char*)&f, sizeof(float)); } @@ -791,7 +791,7 @@ pack_pack(VALUE ary, VALUE fmt) DOUBLE_CONVWITH(dtmp); from = NEXTFROM; - d = RFLOAT(rb_Float(from))->value; + d = RFLOAT_VALUE(rb_Float(from)); d = HTOVD(d,dtmp); rb_str_buf_cat(res, (char*)&d, sizeof(double)); } @@ -803,7 +803,7 @@ pack_pack(VALUE ary, VALUE fmt) double d; from = NEXTFROM; - d = RFLOAT(rb_Float(from))->value; + d = RFLOAT_VALUE(rb_Float(from)); rb_str_buf_cat(res, (char*)&d, sizeof(double)); } break; @@ -814,7 +814,7 @@ pack_pack(VALUE ary, VALUE fmt) FLOAT_CONVWITH(ftmp); from = NEXTFROM; - f = RFLOAT(rb_Float(from))->value; + f = RFLOAT_VALUE(rb_Float(from)); f = HTONF(f,ftmp); rb_str_buf_cat(res, (char*)&f, sizeof(float)); } @@ -826,7 +826,7 @@ pack_pack(VALUE ary, VALUE fmt) DOUBLE_CONVWITH(dtmp); from = NEXTFROM; - d = RFLOAT(rb_Float(from))->value; + d = RFLOAT_VALUE(rb_Float(from)); d = HTOND(d,dtmp); rb_str_buf_cat(res, (char*)&d, sizeof(double)); } @@ -1634,7 +1634,7 @@ pack_unpack(VALUE str, VALUE fmt) float tmp; memcpy(&tmp, s, sizeof(float)); s += sizeof(float); - UNPACK_PUSH(rb_float_new((double)tmp)); + UNPACK_PUSH(DOUBLE2NUM((double)tmp)); } PACK_ITEM_ADJUST(); break; @@ -1648,7 +1648,7 @@ pack_unpack(VALUE str, VALUE fmt) memcpy(&tmp, s, sizeof(float)); s += sizeof(float); tmp = VTOHF(tmp,ftmp); - UNPACK_PUSH(rb_float_new((double)tmp)); + UNPACK_PUSH(DOUBLE2NUM((double)tmp)); } PACK_ITEM_ADJUST(); break; @@ -1662,7 +1662,7 @@ pack_unpack(VALUE str, VALUE fmt) memcpy(&tmp, s, sizeof(double)); s += sizeof(double); tmp = VTOHD(tmp,dtmp); - UNPACK_PUSH(rb_float_new(tmp)); + UNPACK_PUSH(DOUBLE2NUM(tmp)); } PACK_ITEM_ADJUST(); break; @@ -1674,7 +1674,7 @@ pack_unpack(VALUE str, VALUE fmt) double tmp; memcpy(&tmp, s, sizeof(double)); s += sizeof(double); - UNPACK_PUSH(rb_float_new(tmp)); + UNPACK_PUSH(DOUBLE2NUM(tmp)); } PACK_ITEM_ADJUST(); break; @@ -1688,7 +1688,7 @@ pack_unpack(VALUE str, VALUE fmt) memcpy(&tmp, s, sizeof(float)); s += sizeof(float); tmp = NTOHF(tmp,ftmp); - UNPACK_PUSH(rb_float_new((double)tmp)); + UNPACK_PUSH(DOUBLE2NUM((double)tmp)); } PACK_ITEM_ADJUST(); break; @@ -1702,7 +1702,7 @@ pack_unpack(VALUE str, VALUE fmt) memcpy(&tmp, s, sizeof(double)); s += sizeof(double); tmp = NTOHD(tmp,dtmp); - UNPACK_PUSH(rb_float_new(tmp)); + UNPACK_PUSH(DOUBLE2NUM(tmp)); } PACK_ITEM_ADJUST(); break; |