shyouhei	2009-08-03 14:59:38 +0900 (Mon, 03 Aug 2009)

  New Revision: 24362

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

  Log:
    merge revision(s) 23943:
    * lib/complex.rb (Numeric#arg): should return NaN for NaN.
      [ruby-core:24116]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/complex.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24361)
+++ ruby_1_8_7/ChangeLog	(revision 24362)
@@ -1,3 +1,8 @@
+Mon Aug  3 14:46:53 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/complex.rb (Numeric#arg): should return NaN for NaN.
+	  [ruby-core:24116]
+
 Thu Jul 30 09:27:44 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (big_lshift, big_rshift): return Bignum always withou
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24361)
+++ ruby_1_8_7/version.h	(revision 24362)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-30"
+#define RUBY_RELEASE_DATE "2009-08-03"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090730
-#define RUBY_PATCHLEVEL 192
+#define RUBY_RELEASE_CODE 20090803
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
@@ -26,7 +26,4 @@
 #define RUBY_BIRTH_DAY 24
 
 #define RUBY_RELEASE_STR "patchlevel"
-#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
-
-
-
+#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
\ No newline at end of file
Index: ruby_1_8_7/lib/complex.rb
===================================================================
--- ruby_1_8_7/lib/complex.rb	(revision 24361)
+++ ruby_1_8_7/lib/complex.rb	(revision 24362)
@@ -58,11 +58,7 @@
   # See Complex#arg.
   #
   def arg
-    if self >= 0
-      return 0
-    else
-      return Math::PI
-    end
+    Math.atan2!(0, self)
   end
   alias angle arg
   

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