1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/syck/rubyext.c (syck_genericresolver_node_import): should

not set instance variable "@kind" before initializing it.
  [ruby-dev:32677]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-22 12:14:37 +00:00
parent 020fd204f8
commit 2329ba0d93
3 changed files with 8 additions and 40 deletions

View file

@ -1,3 +1,9 @@
Sat Dec 22 21:10:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/syck/rubyext.c (syck_genericresolver_node_import): should
not set instance variable "@kind" before initializing it.
[ruby-dev:32677]
Sat Dec 22 19:52:23 2007 Koichi Sasada <ko1@atdot.net>
* bootstraptest/test_objectspace.rb: fix condition.

View file

@ -1265,7 +1265,6 @@ syck_genericresolver_node_import(VALUE self, VALUE 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++ )
{
@ -1276,10 +1275,10 @@ syck_genericresolver_node_import(VALUE self, VALUE 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++ )
{
@ -1290,6 +1289,7 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
style = sym_inline;
}
obj = rb_funcall( cMap, s_new, 3, t, v, style );
rb_iv_set(obj, "@kind", sym_map);
break;
}

View file

@ -16,42 +16,4 @@ RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
RUBY_EXTERN const char ruby_description[];
RUBY_EXTERN const char ruby_copyright[];
#endif
#define RUBY_AUTHOR "Yukihiro Matsumoto"
#define RUBY_BIRTH_YEAR 1993
#define RUBY_BIRTH_MONTH 2
#define RUBY_BIRTH_DAY 24
#ifndef RUBY_REVISION
#include "revision.h"
#endif
#ifndef RUBY_REVISION
#define RUBY_REVISION 0
#endif
#if RUBY_VERSION_TEENY > 0 && RUBY_PATCHLEVEL < 5000 && !RUBY_REVISION
#define RUBY_RELEASE_STR "patchlevel"
#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
#else
#ifdef RUBY_BRANCH_NAME
#define RUBY_RELEASE_STR RUBY_BRANCH_NAME
#else
#define RUBY_RELEASE_STR "revision"
#endif
#define RUBY_RELEASE_NUM RUBY_REVISION
#endif
# define RUBY_DESCRIPTION \
"ruby "RUBY_VERSION \
" ("RUBY_RELEASE_DATE" " \
RUBY_RELEASE_STR" " \
STRINGIZE(RUBY_RELEASE_NUM)") " \
"["RUBY_PLATFORM"]"
# define RUBY_COPYRIGHT \
"ruby - Copyright (C) " \
STRINGIZE(RUBY_BIRTH_YEAR)"-" \
STRINGIZE(RUBY_RELEASE_YEAR)" " \
RUBY_AUTHOR