yugui	2009-10-29 01:12:03 +0900 (Thu, 29 Oct 2009)

  New Revision: 25551

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

  Log:
    merges r24726 from trunk into ruby_1_9_1.
    --
    * vm_eval.c (eval_string_with_cref): fix to check local_table_size.
      [ruby-dev:39205] [Bug #2024]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/version.h
    branches/ruby_1_9_1/vm_eval.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25550)
+++ ruby_1_9_1/ChangeLog	(revision 25551)
@@ -1,3 +1,8 @@
+Tue Sep  1 19:56:28 2009  Koichi Sasada  <ko1@a...>
+
+	* vm_eval.c (eval_string_with_cref): fix to check local_table_size.
+	  [ruby-dev:39205] [Bug #2024]
+
 Sun Aug 30 16:38:56 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (rb_enc_symname2_p): not depend on nul terminator.
Index: ruby_1_9_1/vm_eval.c
===================================================================
--- ruby_1_9_1/vm_eval.c	(revision 25550)
+++ ruby_1_9_1/vm_eval.c	(revision 25551)
@@ -754,7 +754,7 @@
 
 	/* save new env */
 	GetISeqPtr(iseqval, iseq);
-	if (bind && iseq->local_size > 0) {
+	if (bind && iseq->local_table_size > 0) {
 	    bind->env = rb_vm_make_env_object(th, th->cfp);
 	}
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25550)
+++ ruby_1_9_1/version.h	(revision 25551)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_PATCHLEVEL 310
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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