naruse	2012-05-07 11:09:33 +0900 (Mon, 07 May 2012)

  New Revision: 35557

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

  Log:
    merge revision(s) 35555:
    
    * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
      they are used. [ruby-core:44900] [Bug #6406]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/bigdecimal/bigdecimal.c
    branches/ruby_1_9_3/test/bigdecimal/test_bigdecimal.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35556)
+++ ruby_1_9_3/ChangeLog	(revision 35557)
@@ -1,3 +1,8 @@
+Mon May  7 11:09:20 2012  NARUSE, Yui  <naruse@r...>
+
+	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
+	  they are used. [ruby-core:44900] [Bug #6406]
+
 Fri Apr 27 11:02:33 2012  Masatoshi SEKI  <m_seki@m...>
 
 	* test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
Index: ruby_1_9_3/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_1_9_3/ext/bigdecimal/bigdecimal.c	(revision 35556)
+++ ruby_1_9_3/ext/bigdecimal/bigdecimal.c	(revision 35557)
@@ -2802,6 +2802,10 @@
 {
     VALUE arg;
 
+    id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
+    id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
+    id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
+
     /* Initialize VP routines */
     VpInit(0UL);
 
@@ -2993,10 +2997,6 @@
     rb_define_singleton_method(rb_mBigMath, "exp", BigMath_s_exp, 2);
     rb_define_singleton_method(rb_mBigMath, "log", BigMath_s_log, 2);
 
-    id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
-    id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
-    id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
-
     id_up = rb_intern_const("up");
     id_down = rb_intern_const("down");
     id_truncate = rb_intern_const("truncate");
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35556)
+++ ruby_1_9_3/version.h	(revision 35557)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 204
+#define RUBY_PATCHLEVEL 205
 
 #define RUBY_RELEASE_DATE "2012-05-07"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/bigdecimal/test_bigdecimal.rb
===================================================================
--- ruby_1_9_3/test/bigdecimal/test_bigdecimal.rb	(revision 35556)
+++ ruby_1_9_3/test/bigdecimal/test_bigdecimal.rb	(revision 35557)
@@ -1297,4 +1297,10 @@
     code = "exit(BigDecimal.new('10.0') == 10.0.to_d)"
     assert_ruby_status(%w[-rbigdecimal -rbigdecimal/util -rmathn -], code, bug6093)
   end
+
+  def test_bug6406
+    assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
+    Thread.current.keys.to_s
+    EOS
+  end
 end

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