X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=a9f14db9fbc4fd279443949a7cc52d045cdd0c8c;hb=1904581b325c485e96a25b43ca7bfbabe48b4c03;hp=61ceb4fec551697613666a41cc77f8f328a4188f;hpb=4c39436405f953592eb31ce329eebd6d27d10b30;p=ruby-eet.git diff --git a/ext/ext.c b/ext/ext.c index 61ceb4f..a9f14db 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 51 2005-05-31 21:15:03Z tilman $ + * $Id: ext.c 64 2005-06-27 19:22:58Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -26,6 +26,7 @@ #include #include #include +#include #define CHECK_KEY(key) \ if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \ @@ -46,9 +47,11 @@ static VALUE c_close (VALUE self); static VALUE cStream, cChunk, - eEetError, eNameError, ePropError, - sym_lossy, sym_level, sym_quality; -static ID id_include, id_serialize, id_push, + 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_keys, id_to_eet_chunks, id_to_eet_name, id_to_eet_properties, id_tag, id_data; @@ -441,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"); + + str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL); - rb_str_append (ret, str); + rb_ary_push (ret, str); } - return ret; + return rb_ary_join (ret, Qnil); } static VALUE @@ -523,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"); @@ -534,18 +543,19 @@ 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; } /* - * :call-seq: + * call-seq: * object.to_eet -> string * * Serializes the receiver to EET format. @@ -554,6 +564,10 @@ static VALUE c_to_eet (VALUE self) { VALUE props, name, stream, chunk, args[2]; +#ifndef HAVE_RB_HASH_FOREACH + struct RArray *keys; + long i; +#endif props = rb_funcall (self, id_to_eet_properties, 0); @@ -570,15 +584,76 @@ c_to_eet (VALUE self) stream = rb_class_new_instance (0, NULL, cStream); +#ifdef HAVE_RB_HASH_FOREACH rb_hash_foreach (props, for_each_prop, stream); +#else + keys = RARRAY (rb_funcall (props, id_keys, 0)); + + for (i = 0; i < keys->len; i++) + for_each_prop (keys->ptr[i], + rb_hash_aref (props, keys->ptr[i]), + stream); +#endif 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 (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); + + if (type == sym_char) + cfmt = "c"; + else if (type == sym_short) + cfmt = "v"; + else if (type == sym_long_long) + cfmt = "q"; - return rb_funcall (stream, id_serialize, 0); + 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 +float_to_eet_chunks (int argc, VALUE *argv, VALUE self) +{ + VALUE tag, type = Qnil, args[2], chunk; + char buf[65], *loc; + double d; + int len; + + rb_scan_args (argc, argv, "11", &tag, &type); + + d = NUM2DBL (self); + + /* switch locale to make sure we get proper snprintf output */ + loc = setlocale (LC_NUMERIC, "C"); + + len = snprintf (buf, sizeof (buf) - 1, "%a", + type == sym_double ? d : (float) d); + + if (loc) + setlocale (LC_NUMERIC, loc); + + buf[++len] = '\0'; + + args[0] = tag; + args[1] = rb_str_new (buf, len); + chunk = rb_class_new_instance (2, args, cChunk); + + return rb_ary_new3 (1, chunk); } void @@ -612,13 +687,19 @@ 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"); - 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"); id_to_eet_properties = rb_intern ("to_eet_properties"); @@ -627,4 +708,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")); }