From f9581dded372039d7cf04e7d001fcac62feaac44 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 15 Jun 2008 09:42:32 +0000 Subject: * ext/syck/rubyext.c (yaml_org_handler): associate encoding. * ext/syck/rubyext.c (syck_genericresolver_node_import): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/syck/rubyext.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3e27c12da..9a6fe6f78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 18:40:35 2008 NARUSE, Yui + + * ext/syck/rubyext.c (yaml_org_handler): associate encoding. + + * ext/syck/rubyext.c (syck_genericresolver_node_import): ditto. + Sun Jun 15 18:17:03 2008 Nobuyoshi Nakada * vm_core.h (rb_vm_t), vm.c (rb_vm_mark): moved preallocated special diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index b1b8a5c12..fff3cf281 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -511,6 +511,7 @@ yaml_org_handler( SyckNode *n, VALUE *ref ) else if ( strcmp( type_id, "str" ) == 0 ) { obj = rb_str_new( n->data.str->ptr, n->data.str->len ); + rb_enc_associate(obj, rb_utf8_encoding()); } else { @@ -1237,6 +1238,7 @@ syck_genericresolver_node_import(VALUE self, VALUE node) case syck_str_kind: { v = rb_str_new( n->data.str->ptr, n->data.str->len ); + rb_enc_associate(v, rb_utf8_encoding()); if ( n->data.str->style == scalar_1quote ) { style = sym_1quote; -- cgit