diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | ext/syck/rubyext.c | 8 | ||||
| -rw-r--r-- | lib/yaml/basenode.rb | 2 | ||||
| -rw-r--r-- | lib/yaml/types.rb | 2 |
4 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,19 @@ +Fri Apr 18 18:56:57 2008 Akinori MUSHA <knu@iDaemons.org> + + * ext/syck/rubyext.c (syck_genericresolver_node_import): should + not set instance variable "@kind" before initializing it. + [ruby-dev:32677] + + * ext/syck/rubyext.c (syck_resolver_initialize, + syck_resolver_detect_implicit, syck_emitter_emit): remove unused + variables. + +Fri Apr 18 18:54:57 2008 Akinori MUSHA <knu@iDaemons.org> + + * ext/syck/rubyext.c: Node#value defined twice. + + * lib/yaml/: several method redefinitions causing warnings. + Fri Apr 18 16:36:16 2008 Akinori MUSHA <knu@iDaemons.org> * lib/rexml/node.rb (REXML::Node::indent): should initialize rv diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c index 8c4027f26d..76e8279601 100644 --- a/ext/syck/rubyext.c +++ b/ext/syck/rubyext.c @@ -917,7 +917,6 @@ static VALUE syck_resolver_initialize( self ) VALUE self; { - VALUE tags = rb_hash_new(); rb_ivar_set(self, s_tags, rb_hash_new()); return self; } @@ -952,7 +951,6 @@ VALUE syck_resolver_detect_implicit( self, val ) VALUE self, val; { - char *type_id; return rb_str_new2( "" ); } @@ -1308,7 +1306,6 @@ syck_genericresolver_node_import( self, node ) break; case syck_seq_kind: - rb_iv_set(obj, "@kind", sym_seq); v = rb_ary_new2( syck_seq_count( n ) ); for ( i = 0; i < syck_seq_count( n ); i++ ) { @@ -1319,10 +1316,10 @@ syck_genericresolver_node_import( self, node ) style = sym_inline; } obj = rb_funcall( cSeq, s_new, 3, t, v, style ); + rb_iv_set(obj, "@kind", sym_seq); break; case syck_map_kind: - rb_iv_set(obj, "@kind", sym_map); v = rb_hash_new(); for ( i = 0; i < syck_map_count( n ); i++ ) { @@ -1333,6 +1330,7 @@ syck_genericresolver_node_import( self, node ) style = sym_inline; } obj = rb_funcall( cMap, s_new, 3, t, v, style ); + rb_iv_set(obj, "@kind", sym_map); break; } @@ -2028,7 +2026,6 @@ syck_emitter_emit( argc, argv, self ) VALUE self; { VALUE oid, proc; - char *anchor_name; SyckEmitter *emitter; struct emitter_xtra *bonus; SYMID symple; @@ -2284,7 +2281,6 @@ Init_syck() */ cScalar = rb_define_class_under( rb_syck, "Scalar", cNode ); rb_define_alloc_func( cScalar, syck_scalar_alloc ); - rb_define_attr( cNode, "value", 1, 0 ); rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 ); rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 ); rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 ); diff --git a/lib/yaml/basenode.rb b/lib/yaml/basenode.rb index d24f6172e9..5439903f42 100644 --- a/lib/yaml/basenode.rb +++ b/lib/yaml/basenode.rb @@ -184,7 +184,7 @@ module YAML # def []( *key ) if Hash === @value - v = @value.detect { |k,v| k.transform == key.first } + v = @value.detect { |k,| k.transform == key.first } v[1] if v elsif Array === @value @value.[]( *key ) diff --git a/lib/yaml/types.rb b/lib/yaml/types.rb index 05113f216d..7897db48e0 100644 --- a/lib/yaml/types.rb +++ b/lib/yaml/types.rb @@ -10,7 +10,6 @@ module YAML # class PrivateType def self.tag_subclasses?; false; end - attr_accessor :type_id, :value verbose, $VERBOSE = $VERBOSE, nil def initialize( type, val ) @type_id = type; @value = val @@ -28,7 +27,6 @@ module YAML # class DomainType def self.tag_subclasses?; false; end - attr_accessor :domain, :type_id, :value verbose, $VERBOSE = $VERBOSE, nil def initialize( domain, type, val ) @domain = domain; @type_id = type; @value = val |