diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
commit | df96f994f1a224070ffaa61eb2bcb969d0109246 (patch) | |
tree | 2e4bd7b58a1bc0a2b8d0e136f79a2997323e54d6 /marshal.c | |
parent | d550569264a16e96121d05423f7516ce726d96c9 (diff) |
* parse.y (parse_regx): should raise error on untermitated
expression interpolation.
* pack.c (pack_unpack): should give length to utf8_to_uv().
* pack.c (utf8_to_uv): add length check.
* massages: replace "wrong #" by "wrong number".
* marshal.c (w_float): output Infinity and NaN explicitly.
* marshal.c (r_object): support new explicit float format.
* eval.c (rb_thread_wait_for): select may cause ERESTART on
Solaris.
* eval.c (rb_thread_select): ditto.
* array.c (rb_ary_join): dumped core if sep is not T_STRING nor T_NIL.
* array.c (rb_ary_join): buffer size calculattion was wrong.
* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
between array elements (use rb_default_rs as newline litral)
[experimental].
* gc.c (init_mark_stack): no need to clear mark_stack.
* gc.c (gc_mark_all): need to handle finalizer mark.
* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
* gc.c (rb_gc_mark): earlier const check to avoid pusing special
constants into mark stack.
* numeric.c (fix_to_s): 'to_s' now takes optional argument to
specify radix. [new]
* bignum.c (rb_big_to_s): ditto. [new]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 32 |
1 files changed, 29 insertions, 3 deletions
@@ -10,6 +10,8 @@ **********************************************************************/ +#include <math.h> + #include "ruby.h" #include "rubyio.h" #include "st.h" @@ -52,7 +54,7 @@ shortlen(len, ds) #endif #define MARSHAL_MAJOR 4 -#define MARSHAL_MINOR 6 +#define MARSHAL_MINOR 7 #define TYPE_NIL '0' #define TYPE_TRUE 'T' @@ -185,7 +187,17 @@ w_float(d, arg) { char buf[100]; - sprintf(buf, "%.16g", d); + if (isinf(d)) { + if (d < 0) strcpy(buf, "-inf"); + else strcpy(buf, "inf"); + } + else if (isnan(d)) { + strcpy(buf, "nan"); + } + else { + /* xxx: should not use system's sprintf(3) */ + sprintf(buf, "%.16g", d); + } w_bytes(buf, strlen(buf), arg); } @@ -832,9 +844,23 @@ r_object(arg) case TYPE_FLOAT: { char *buf; + double d, t = 0.0; r_bytes(buf, arg); - v = rb_float_new(strtod(buf, 0)); + if (strcmp(buf, "nan") == 0) { + d = t / t; + } + else if (strcmp(buf, "inf") == 0) { + d = 1.0 / t; + } + else if (strcmp(buf, "-inf") == 0) { + d = -1.0 / t; + } + else { + /* xxx: should not use system's strtod(3) */ + d = strtod(buf, 0); + } + v = rb_float_new(d); return r_regist(v, arg); } |