X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=8fe22e30e328c40ebb2fc4f3b12e0dc3e54863e9;hb=db79481964d28b069139851500a7482f4f56bb54;hp=c4082dc86b2535fa60b97232778632968e56b17b;hpb=deb555911974965cf23a4bcfdf79fb3b7d327663;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index c4082dc..8fe22e3 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 60 2005-06-08 16:18:32Z tilman $
+ * $Id: ext.c 62 2005-06-09 17:42:34Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,7 +47,8 @@
 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,
@@ -450,7 +451,12 @@ stream_serialize (VALUE self)
 		return ret;
 
 	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");
+
+		str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
 		rb_str_append (ret, str);
 	}
@@ -591,9 +597,7 @@ c_to_eet (VALUE self)
 	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);
+	return rb_funcall (chunk, id_serialize, 0);
 }
 
 static VALUE
@@ -687,6 +691,9 @@ 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");