Re-implemented Float#to_eet_chunks in C.

Also switched format to the one libeet uses.

diff --git a/ChangeLog b/ChangeLog
index d0752386ffde3d2c987d10d2548345da6c9c0491..949b9faf75a445dbb89d5978e88df54364139103 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 --
-$Id: ChangeLog 57 2005-06-02 20:19:01Z tilman $
+$Id: ChangeLog 59 2005-06-08 16:13:15Z tilman $
 ++
 
+2005-06-08 Tilman Sauerbeck (tilman at code-monkey de)
+        * ext/ext.c, lib/eet.rb, test/test_basic.rb:
+          Re-implemented Float#to_eet_chunks in C and switched format to
+          the one libeet uses.
+
 2005-06-02 Tilman Sauerbeck (tilman at code-monkey de)
         * Released version 0.1.3
 

diff --git a/ext/ext.c b/ext/ext.c
index 674220f1d968f3288f2f4fb4bae1650f2ce4ab11..465099f801f49d8efe211365e0bf6eb744faf7af 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 54 2005-06-02 20:05:38Z tilman $
+ * $Id: ext.c 59 2005-06-08 16:13:15Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,6 +26,7 @@
 #include <Eet.h>
 #include <ruby.h>
 #include <st.h>
+#include <locale.h>
 
 #define CHECK_KEY(key) \
        if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \
@@ -47,7 +48,7 @@ static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
              eEetError, eNameError, ePropError,
-             sym_lossy, sym_level, sym_quality;
+             sym_lossy, sym_level, sym_quality, sym_double;
 static ID id_include, id_serialize, id_push, id_keys,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
@@ -594,6 +595,36 @@ c_to_eet (VALUE self)
        return rb_funcall (stream, id_serialize, 0);
 }
 
+static VALUE
+float_to_eet_chunks (int argc, VALUE *argv, VALUE self)
+{
+       VALUE tag, type = Qnil, args[2], chunk;
+       char buf[65], *loc;
+       double d;
+       int len;
+
+       rb_scan_args (argc, argv, "11", &tag, &type);
+
+       d = NUM2DBL (self);
+
+       /* switch locale to make sure we get proper snprintf output */
+       loc = setlocale (LC_NUMERIC, "C");
+
+       len = snprintf (buf, sizeof (buf) - 1, "%a",
+                       type == sym_double ? d : (float) d);
+
+       if (loc)
+               setlocale (LC_NUMERIC, loc);
+
+       buf[++len] = '\0';
+
+       args[0] = tag;
+       args[1] = rb_str_new (buf, len);
+       chunk = rb_class_new_instance (2, args, cChunk);
+
+       return rb_ary_new3 (1, chunk);
+}
+
 void
 Init_eet_ext ()
 {
@@ -625,6 +656,8 @@ Init_eet_ext ()
 
        rb_define_method (rb_cObject, "to_eet", c_to_eet, 0);
 
+       rb_define_method (rb_cFloat, "to_eet_chunks", float_to_eet_chunks, -1);
+
        eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
        eNameError = rb_define_class_under (m, "NameError", eEetError);
        ePropError = rb_define_class_under (m, "PropertyError", eEetError);
@@ -641,4 +674,5 @@ Init_eet_ext ()
        sym_lossy = ID2SYM (rb_intern ("lossy"));
        sym_level = ID2SYM (rb_intern ("level"));
        sym_quality =  ID2SYM (rb_intern ("quality"));
+       sym_double = ID2SYM (rb_intern ("double"));
 }

diff --git a/lib/eet.rb b/lib/eet.rb
index d178e237c35c69b85f5b91eb7ad5ca45aefd322f..a7586b82f1abef4ffefa088d6558ac97f27fe90d 100644 (file)
--- a/lib/eet.rb
+++ b/lib/eet.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: eet.rb 53 2005-06-02 20:01:45Z tilman $
+# $Id: eet.rb 59 2005-06-08 16:13:15Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -70,18 +70,6 @@ class Integer # :nodoc:
        end
 end
 
-class Float # :nodoc:
-       def to_eet_chunks(tag, type = nil)
-               fmt = case type
-               when :double: "%32.32f"
-               else "%16.16f"
-               end
-
-               data = fmt % self
-               [Eet::Chunk.new(tag, data + "\0")]
-       end
-end
-
 class String # :nodoc:
        def to_eet_chunks(tag, type = nil)
                [Eet::Chunk.new(tag, self + "\0")]

diff --git a/test/test_basic.rb b/test/test_basic.rb
index 73a30bcf024d9c38e6b992577cddd98f223ded89..017cdf63c3e4f9e1eef0d575acc254002e98d6c0 100644 (file)
--- a/test/test_basic.rb
+++ b/test/test_basic.rb
@@ -1,4 +1,4 @@
-# $Id: test_basic.rb 1 2005-03-26 01:45:38Z tilman $
+# $Id: test_basic.rb 59 2005-06-08 16:13:15Z tilman $
 
 require "eet"
 require "test/unit"
@@ -11,8 +11,7 @@ class BasicTestData
                @int = 1024
                @long_long = (2 << 63) - 1
                @flag = true
-               @float = 1234.0
-               @double = 12341234.0
+               @float = 1234.12424213138
        end
 
        private
@@ -27,7 +26,7 @@ class BasicTestData
                 "i64" => [@long_long, :long_long],
                 "flag" => [@flag],
                 "f32" => [@float],
-                "f64" => [@double, :double]}
+                "f64" => [@float, :double]}
        end
 end
 
@@ -54,8 +53,8 @@ class BasicTest < Test::Unit::TestCase
                values = {"name" => "moo\0",
                          "i16" => "\0\2", "i32" => "\0\4\0\0",
                          "i64" => "\377" * 8, "flag" => "\1",
-                         "f32" => "1234." + ("0" * 16) + "\0",
-                         "f64" => "12341234." + ("0" * 32) + "\0"}
+                         "f32" => "0x1.3487f4p+10\0",
+                         "f64" => "0x1.3487f39544c4p+10\0"}
                values.each do |k, v|
                        found = stream.find { |c| c.tag == k }
                        assert_not_nil(found, "chunk not found - #{k}")