projects
/
ruby-eet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed RDoc comment for Object#to_eet.
[ruby-eet.git]
/
ext
/
ext.c
diff --git
a/ext/ext.c
b/ext/ext.c
index aa69823ece8360281edbad9683b03882946ae4d8..674220f1d968f3288f2f4fb4bae1650f2ce4ab11 100644
(file)
--- a/
ext/ext.c
+++ b/
ext/ext.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: ext.c 5
0 2005-05-30 20:38:34
Z tilman $
+ * $Id: ext.c 5
4 2005-06-02 20:05:38
Z tilman $
*
* Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-48,7
+48,7
@@
static VALUE c_close (VALUE self);
static VALUE cStream, cChunk,
eEetError, eNameError, ePropError,
sym_lossy, sym_level, sym_quality;
static VALUE cStream, cChunk,
eEetError, eNameError, ePropError,
sym_lossy, sym_level, sym_quality;
-static ID id_include, id_serialize, id_push, id_
empty
,
+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;
id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
id_tag, id_data;
@@
-545,7
+545,7
@@
for_each_prop (VALUE tag, VALUE arg, VALUE stream)
}
/*
}
/*
- *
:
call-seq:
+ * call-seq:
* object.to_eet -> string
*
* Serializes the receiver to EET format.
* object.to_eet -> string
*
* Serializes the receiver to EET format.
@@
-554,23
+554,36
@@
static VALUE
c_to_eet (VALUE self)
{
VALUE props, name, stream, chunk, args[2];
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);
if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
props = rb_funcall (self, id_to_eet_properties, 0);
if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
-
rb_funcall (props, id_empty, 0) == Qtrue
)
+
!RHASH (props)->tbl->num_entries
)
rb_raise (ePropError, "invalid EET properties");
name = rb_funcall (self, id_to_eet_name, 0);
StringValue (name);
rb_raise (ePropError, "invalid EET properties");
name = rb_funcall (self, id_to_eet_name, 0);
StringValue (name);
- if (
rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue
||
- rb_funcall (name, id_
empty, 0) == Qtrue
)
+ if (
!RSTRING (name)->len
||
+ rb_funcall (name, id_
include, 1, INT2FIX (0))
)
rb_raise (eNameError, "invalid EET name");
stream = rb_class_new_instance (0, NULL, cStream);
rb_raise (eNameError, "invalid EET name");
stream = rb_class_new_instance (0, NULL, cStream);
+#ifdef HAVE_RB_HASH_FOREACH
rb_hash_foreach (props, for_each_prop, stream);
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);
args[0] = name;
args[1] = rb_funcall (stream, id_serialize, 0);
@@
-619,7
+632,7
@@
Init_eet_ext ()
id_include = rb_intern ("include?");
id_serialize = rb_intern ("serialize");
id_push = rb_intern ("push");
id_include = rb_intern ("include?");
id_serialize = rb_intern ("serialize");
id_push = rb_intern ("push");
- id_
empty = rb_intern ("empty?
");
+ 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");
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");