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

diff --git a/ext/ext.c b/ext/ext.c
index 465099f..8fe22e3 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 59 2005-06-08 16:13:15Z tilman $
+ * $Id: ext.c 62 2005-06-09 17:42:34Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,8 +47,10 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError,
-             sym_lossy, sym_level, sym_quality, sym_double;
+             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,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
@@ -449,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);
 	}
@@ -590,9 +597,31 @@ 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 (chunk, id_serialize, 0);
+}
+
+static VALUE
+int_to_eet_chunks (int argc, VALUE *argv, VALUE self)
+{
+	VALUE tag, type = Qnil, ary, args[2], chunk;
+	char *cfmt = "V";
+
+	rb_scan_args (argc, argv, "11", &tag, &type);
+
+	ary = rb_ary_new3 (1, self);
 
-	return rb_funcall (stream, id_serialize, 0);
+	if (type == sym_char)
+		cfmt = "c";
+	else if (type == sym_short)
+		cfmt = "v";
+	else if (type == sym_long_long)
+		cfmt = "q";
+
+	args[0] = tag;
+	args[1] = rb_funcall (ary, rb_intern ("pack"), 1, rb_str_new2 (cfmt));
+	chunk = rb_class_new_instance (2, args, cChunk);
+
+	return rb_ary_new3 (1, chunk);
 }
 
 static VALUE
@@ -656,11 +685,15 @@ Init_eet_ext ()
 
 	rb_define_method (rb_cObject, "to_eet", c_to_eet, 0);
 
+	rb_define_method (rb_cInteger, "to_eet_chunks", int_to_eet_chunks, -1);
 	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);
+	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");
@@ -674,5 +707,8 @@ Init_eet_ext ()
 	sym_lossy = ID2SYM (rb_intern ("lossy"));
 	sym_level = ID2SYM (rb_intern ("level"));
 	sym_quality =  ID2SYM (rb_intern ("quality"));
+	sym_char = ID2SYM (rb_intern ("char"));
+	sym_short = ID2SYM (rb_intern ("short"));
+	sym_long_long = ID2SYM (rb_intern ("long_long"));
 	sym_double = ID2SYM (rb_intern ("double"));
 }