[前][次][番号順一覧][スレッド一覧]

ruby-changes:9882

From: nobu <ko1@a...>
Date: Sun, 11 Jan 2009 09:42:54 +0900 (JST)
Subject: [ruby-changes:9882] Ruby:r21423 (ruby_1_8): * hash.c (rb_hash_s_create): set nil as the value if assoc length

nobu	2009-01-11 09:42:30 +0900 (Sun, 11 Jan 2009)

  New Revision: 21423

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21423

  Log:
    * hash.c (rb_hash_s_create): set nil as the value if assoc length
      is not enough.  [ruby-core:21249]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/hash.c
    branches/ruby_1_8/version.h

Index: ruby_1_8/hash.c
===================================================================
--- ruby_1_8/hash.c	(revision 21422)
+++ ruby_1_8/hash.c	(revision 21423)
@@ -357,10 +357,16 @@
 	    hash = hash_alloc(klass);
 	    for (i = 0; i < RARRAY_LEN(tmp); ++i) {
 		VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
-		
+		VALUE key, val = Qnil;
+
 		if (NIL_P(v)) continue;
-		if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue;
-		rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]);
+		switch (RARRAY_LEN(v)) {
+		  case 2:
+		    val = RARRAY_PTR(v)[1];
+		  case 1:
+		    key = RARRAY_PTR(v)[0];
+		    rb_hash_aset(hash, key, val);
+		}
 	    }
 	    return hash;
 	}
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 21422)
+++ ruby_1_8/ChangeLog	(revision 21423)
@@ -1,3 +1,8 @@
+Sun Jan 11 09:42:28 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* hash.c (rb_hash_s_create): set nil as the value if assoc length
+	  is not enough.  [ruby-core:21249]
+
 Fri Jan  9 15:20:17 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (TAG_THREAD): to start a new thread.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 21422)
+++ ruby_1_8/version.h	(revision 21423)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-09"
+#define RUBY_RELEASE_DATE "2009-01-11"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090109
+#define RUBY_RELEASE_CODE 20090111
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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

[前][次][番号順一覧][スレッド一覧]