/*
- * $Id: ext.c 68 2005-06-29 16:50:47Z tilman $
+ * $Id: ext.c 71 2005-07-16 12:28:17Z tilman $
*
* Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
*
static VALUE c_close (VALUE self);
static VALUE cStream, cChunk,
- eEetError, eNameError, ePropError, eStreamError,
- eBadElementError,
+ eEetError, eNameError, ePropError,
sym_lossy, sym_level, sym_quality, sym_char, sym_short,
sym_long_long, sym_double;
static ID id_include, id_serialize, id_keys, id_pack,
for (i = 0; i < stream->len; i++) {
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_ary_push (ret, str);
for_each_prop (VALUE tag, VALUE arg, VALUE stream)
{
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");
type = rb_ary_entry (arg, 1);
tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
- Check_Type (tmp, T_ARRAY);
- chunks = RARRAY (tmp);
-
- for (i = 0; i < chunks->len; i++)
- rb_ary_push (stream, chunks->ptr[i]);
+ rb_ary_concat (stream, tmp);
return ST_CONTINUE;
}
args[0] = name;
args[1] = rb_funcall (stream, id_serialize, 0);
+
+ rb_ary_clear (stream); /* give the GC a hand... */
+
chunk = rb_class_new_instance (2, args, cChunk);
return rb_funcall (chunk, id_serialize, 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);
- 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");