From 6289e751f9a1a7c0a46345503da94f64426a71fe Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 30 May 2005 19:52:36 +0000 Subject: [PATCH] Re-implemented Object#to_eet in C. --- ChangeLog | 3 +- ext/ext.c | 102 +++++++++++++++++++++++++++++++----- lib/eet.rb | 39 +------------- test/test_broken_classes.rb | 4 +- 4 files changed, 93 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53738d0..5b549a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ -- -$Id: ChangeLog 48 2005-05-30 19:20:42Z tilman $ +$Id: ChangeLog 49 2005-05-30 19:52:36Z tilman $ ++ 2005-05-30 Tilman Sauerbeck (tilman at code-monkey de) * lib/eet.rb, ext/ext.c: Re-implemented Chunk#initialize in C * ext/ext.c: Code cleanup + * lib/eet.rb, ext/ext.c: Re-implemented Object#to_eet in C 2005-05-25 Tilman Sauerbeck (tilman at code-monkey de) * test/test_array_sub.rb: Added a test for the :sub format diff --git a/ext/ext.c b/ext/ext.c index 938720a..a734dfa 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 48 2005-05-30 19:20:42Z tilman $ + * $Id: ext.c 49 2005-05-30 19:52:36Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -25,6 +25,7 @@ #include #include +#include #define CHECK_KEY(key) \ if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \ @@ -44,7 +45,11 @@ static VALUE c_close (VALUE self); -static ID id_include, id_tag, id_data; +static VALUE cStream, cChunk, + eEetError, eNameError, ePropError; +static ID id_include, id_serialize, id_push, id_empty, + id_to_eet_chunks, id_to_eet_name, id_to_eet_properties, + id_tag, id_data; static void c_free (Eet_File **ef) @@ -433,7 +438,6 @@ stream_serialize (VALUE self) { VALUE ret; struct RArray *stream; - static ID id_serialize; long i; ret = rb_str_new2 (""); @@ -442,9 +446,6 @@ stream_serialize (VALUE self) if (!stream->len) return ret; - if (!id_serialize) - id_serialize = rb_intern ("serialize"); - for (i = 0; i < stream->len; i++) { VALUE str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL); @@ -518,10 +519,71 @@ chunk_serialize (VALUE self) return ret; } +static int +for_each_prop (VALUE tag, VALUE arg, VALUE stream) +{ + VALUE value, type, chunks; + long len, i; + + if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse) + rb_raise (ePropError, "hash value is not an array"); + + value = rb_ary_entry (arg, 0); + if (NIL_P (value)) + return ST_CONTINUE; + + type = rb_ary_entry (arg, 1); + chunks = rb_funcall (value, id_to_eet_chunks, 2, tag, type); + + len = RARRAY (chunks)->len; + + for (i = 0; i < len; i++) + rb_funcall (stream, id_push, 1, rb_ary_entry (chunks, i)); + + return ST_CONTINUE; +} + +/* + * :call-seq: + * object.to_eet -> string + * + * Serializes the receiver to EET format. + */ +static VALUE +c_to_eet (VALUE self) +{ + VALUE props, name, stream, chunk, args[2]; + + props = rb_funcall (self, id_to_eet_properties, 0); + + if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse || + rb_funcall (props, id_empty, 0) == Qtrue) + rb_raise (ePropError, "invalid EET properties"); + + name = rb_funcall (self, id_to_eet_name, 0); + StringValue (name); + + if (rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue || + rb_funcall (name, id_empty, 0) == Qtrue) + rb_raise (eNameError, "invalid EET name"); + + stream = rb_class_new_instance (0, NULL, cStream); + + rb_hash_foreach (props, for_each_prop, stream); + + args[0] = name; + args[1] = rb_funcall (stream, id_serialize, 0); + chunk = rb_class_new_instance (2, args, cChunk); + + stream = rb_class_new_instance (1, &chunk, cStream); + + return rb_funcall (stream, id_serialize, 0); +} + void Init_eet_ext () { - VALUE m, c, cs, cc; + VALUE m, c; m = rb_define_module ("Eet"); @@ -537,17 +599,29 @@ Init_eet_ext () rb_define_method (c, "read_image", c_read_image, 1); rb_define_method (c, "write_image", c_write_image, -1); - cs = rb_define_class_under (m, "Stream", rb_cArray); - rb_define_method (cs, "serialize", stream_serialize, 0); + cStream = rb_define_class_under (m, "Stream", rb_cArray); + rb_define_method (cStream, "serialize", stream_serialize, 0); + + cChunk = rb_define_class_under (m, "Chunk", rb_cObject); + rb_define_method (cChunk, "initialize", chunk_init, 2); + rb_define_method (cChunk, "serialize", chunk_serialize, 0); + + rb_define_attr (cChunk, "tag", 1, 0); + rb_define_attr (cChunk, "data", 1, 0); - cc = rb_define_class_under (m, "Chunk", rb_cObject); - rb_define_method (cc, "initialize", chunk_init, 2); - rb_define_method (cc, "serialize", chunk_serialize, 0); + rb_define_method (rb_cObject, "to_eet", c_to_eet, 0); - rb_define_attr (cc, "tag", 1, 0); - rb_define_attr (cc, "data", 1, 0); + 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); id_include = rb_intern ("include?"); + id_serialize = rb_intern ("serialize"); + id_push = rb_intern ("push"); + id_empty = rb_intern ("empty?"); + id_to_eet_chunks = rb_intern ("to_eet_chunks"); + id_to_eet_name = rb_intern ("to_eet_name"); + id_to_eet_properties = rb_intern ("to_eet_properties"); id_tag = rb_intern ("@tag"); id_data = rb_intern ("@data"); } diff --git a/lib/eet.rb b/lib/eet.rb index 194409e..3976032 100644 --- a/lib/eet.rb +++ b/lib/eet.rb @@ -1,5 +1,5 @@ #-- -# $Id: eet.rb 47 2005-05-30 19:19:07Z tilman $ +# $Id: eet.rb 49 2005-05-30 19:52:36Z tilman $ # # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) # @@ -25,40 +25,6 @@ require "eet_ext" class Object - # :call-seq: - # object.to_eet -> string - # - # Serializes the receiver to EET format. - def to_eet - props = to_eet_properties - - unless props.is_a?(Hash) && !props.empty? - raise(Eet::PropertyError, "invalid EET properties") - end - - eet_name = to_eet_name - - if eet_name.to_str.length < 1 || eet_name.to_str.include?(0) - raise(Eet::NameError, "invalid EET name") - end - - stream = Eet::Stream.new - - props.each_pair do |tag, arg| - unless arg.is_a?(Array) - raise(Eet::PropertyError, "hash value is not an array") - end - - value, type = arg - next if value.nil? - - stream.push(*value.to_eet_chunks(tag, type)) - end - - chunk = Eet::Chunk.new(eet_name, stream.serialize) - Eet::Stream.new(chunk).serialize - end - def to_eet_chunks(tag, type = nil) # :nodoc: [Eet::Chunk.new(tag, to_eet)] end @@ -156,9 +122,6 @@ end module Eet VERSION = "0.1.2" - class EetError < StandardError; end - class NameError < EetError; end - class PropertyError < EetError; end class ChunkError < EetError; end class Stream # :nodoc: diff --git a/test/test_broken_classes.rb b/test/test_broken_classes.rb index 54db171..63c7fa8 100644 --- a/test/test_broken_classes.rb +++ b/test/test_broken_classes.rb @@ -1,4 +1,4 @@ -# $Id: test_broken_classes.rb 1 2005-03-26 01:45:38Z tilman $ +# $Id: test_broken_classes.rb 49 2005-05-30 19:52:36Z tilman $ class BrokenTestData1 end @@ -75,7 +75,7 @@ class BrokenTest < Test::Unit::TestCase end def test_broken_eet_names - assert_raise(NoMethodError) do + assert_raise(TypeError) do BrokenTestData8.new.to_eet end -- 2.30.2