diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/syck/rubyext.c | 15 | ||||
| -rw-r--r-- | lib/yaml.rb | 4 |
3 files changed, 23 insertions, 7 deletions
@@ -1,3 +1,14 @@ +Sat Aug 22 13:46:15 2009 Tanaka Akira <[email protected]> + + * ext/syck/rubyext.c (id_hash_new): new function to create a hash + which key is compared by object id. + (syck_parser_load): use id_hash_new for bonus->data. + (syck_parser_load_documents): ditto. + (syck_emitter_reset): ditto. + + * lib/yaml.rb (YAML.quick_emit): give the object itself to eimitter. + don't use object_id and hash. + Sat Aug 22 13:05:22 2009 NARUSE, Yui <[email protected]> * Makefile.in: use CP and MV macros. diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 3538deb5e3..5b056f8e02 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -837,6 +837,15 @@ syck_parser_bufsize_get(VALUE self) return INT2FIX( parser->bufsize ); } +static VALUE +id_hash_new(void) +{ + VALUE hash; + hash = rb_hash_new(); + rb_funcall(hash, rb_intern("compare_by_identity"), 0); + return hash; +} + /* * YAML::Syck::Parser.load( IO or String ) */ @@ -856,7 +865,7 @@ syck_parser_load(int argc, VALUE *argv, VALUE self) bonus = (struct parser_xtra *)parser->bonus; bonus->taint = syck_parser_assign_io(parser, &port); - bonus->data = rb_hash_new(); + bonus->data = id_hash_new(); bonus->resolver = rb_attr_get( self, s_resolver ); if ( NIL_P( proc ) ) bonus->proc = 0; else bonus->proc = proc; @@ -889,7 +898,7 @@ syck_parser_load_documents(int argc, VALUE *argv, VALUE self) while ( 1 ) { /* Reset hash for tracking nodes */ - bonus->data = rb_hash_new(); + bonus->data = id_hash_new(); /* Parse a document */ v = syck_parse( parser ); @@ -1953,7 +1962,7 @@ syck_emitter_reset(int argc, VALUE *argv, VALUE self) bonus->oid = Qnil; bonus->port = rb_str_new2( "" ); - bonus->data = rb_hash_new(); + bonus->data = id_hash_new(); if (rb_scan_args(argc, argv, "01", &options) == 0) { diff --git a/lib/yaml.rb b/lib/yaml.rb index 0c95b7e82c..d84967086a 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -384,10 +384,6 @@ module YAML else emitter.reset( opts ) end - oid = - case oid when Fixnum, NilClass; oid - else oid = "#{oid.object_id}-#{oid.hash}" - end out.emit( oid, &e ) end |