X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=a9f14db9fbc4fd279443949a7cc52d045cdd0c8c;hb=1904581b325c485e96a25b43ca7bfbabe48b4c03;hp=22ccb19aef5582dbe94c7c5d2c38760ddf3ce0e8;hpb=029d2a9af60b487a332420cf743da61301ccf928;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index 22ccb19..a9f14db 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 61 2005-06-09 17:33:48Z tilman $
+ * $Id: ext.c 64 2005-06-27 19:22:58Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,10 +47,11 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError,
+             eEetError, eNameError, ePropError, eStreamError,
+             eBadElementError,
              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
-static ID id_include, id_serialize, id_push, id_keys,
+static ID id_include, id_serialize, id_keys,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -443,19 +444,24 @@ stream_serialize (VALUE self)
 	struct RArray *stream;
 	long i;
 
-	ret = rb_str_new2 ("");
-
 	stream = RARRAY (self);
 	if (!stream->len)
-		return ret;
+		return rb_str_new2 ("");
+
+	ret = rb_ary_new ();
 
 	for (i = 0; i < stream->len; i++) {
-		VALUE str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
+		VALUE str;
+
+		if (rb_obj_is_kind_of (stream->ptr[i], cChunk) == Qfalse)
+			rb_raise (eBadElementError, "stream member is not a Chunk");
 
-		rb_str_append (ret, str);
+		str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
+
+		rb_ary_push (ret, str);
 	}
 
-	return ret;
+	return rb_ary_join (ret, Qnil);
 }
 
 static VALUE
@@ -525,8 +531,9 @@ chunk_serialize (VALUE self)
 static int
 for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 {
-	VALUE value, type, chunks;
-	long len, i;
+	VALUE value, type, tmp;
+	struct RArray *chunks;
+	long i;
 
 	if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
 		rb_raise (ePropError, "hash value is not an array");
@@ -536,12 +543,13 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 		return ST_CONTINUE;
 
 	type = rb_ary_entry (arg, 1);
-	chunks = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
+	tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
 
-	len = RARRAY (chunks)->len;
+	Check_Type (tmp, T_ARRAY);
+	chunks = RARRAY (tmp);
 
-	for (i = 0; i < len; i++)
-		rb_funcall (stream, id_push, 1, rb_ary_entry (chunks, i));
+	for (i = 0; i < chunks->len; i++)
+		rb_ary_push (stream, chunks->ptr[i]);
 
 	return ST_CONTINUE;
 }
@@ -685,10 +693,12 @@ Init_eet_ext ()
 	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);
+	eStreamError = rb_define_class_under (m, "StreamError", eEetError);
+	eBadElementError = rb_define_class_under (m, "BadElementError",
+	                                          eStreamError);
 
 	id_include = rb_intern ("include?");
 	id_serialize = rb_intern ("serialize");
-	id_push = rb_intern ("push");
 	id_keys = rb_intern ("keys");
 	id_to_eet_chunks = rb_intern ("to_eet_chunks");
 	id_to_eet_name = rb_intern ("to_eet_name");