matz	2007-12-22 21:14:37 +0900 (Sat, 22 Dec 2007)

  New Revision: 14490

  Modified files:
    trunk/ChangeLog
    trunk/ext/syck/rubyext.c
    trunk/version.h

  Log:
    * ext/syck/rubyext.c (syck_genericresolver_node_import): should
      not set instance variable "@kind" before initializing it.
      [ruby-dev:32677]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14490&r2=14489
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14490&r2=14489
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/syck/rubyext.c?r1=14490&r2=14489

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14489)
+++ ChangeLog	(revision 14490)
@@ -1,3 +1,9 @@
+Sat Dec 22 21:10:53 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@a...>
 
 	* bootstraptest/test_objectspace.rb: fix condition.
Index: ext/syck/rubyext.c
===================================================================
--- ext/syck/rubyext.c	(revision 14489)
+++ ext/syck/rubyext.c	(revision 14490)
@@ -1265,7 +1265,6 @@
         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 @@
                 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 @@
                 style = sym_inline;
             } 
             obj = rb_funcall( cMap, s_new, 3, t, v, style );
+            rb_iv_set(obj, "@kind", sym_map);
         break;
     }
 
Index: version.h
===================================================================
--- version.h	(revision 14489)
+++ version.h	(revision 14490)
@@ -16,42 +16,4 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml