summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 05:59:38 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 05:59:38 +0000
commitcb5e639da892d78595b00998c24426ecf2670fcf (patch)
tree5f9133a7277a71ea497ca110de4185d9a9b825d5
parent3799f1bbd8986c4e98ec397d2dc7ecfc33f84b98 (diff)
merge revision(s) 23943:
* lib/complex.rb (Numeric#arg): should return NaN for NaN. [ruby-core:24116] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/complex.rb6
-rw-r--r--version.h15
3 files changed, 12 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f6ad6f45fa..db39680ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 3 14:46:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/complex.rb (Numeric#arg): should return NaN for NaN.
+ [ruby-core:24116]
+
Thu Jul 30 09:27:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (big_lshift, big_rshift): return Bignum always withou
diff --git a/lib/complex.rb b/lib/complex.rb
index fbf50ffece..808cecc95d 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -58,11 +58,7 @@ class Numeric
# See Complex#arg.
#
def arg
- if self >= 0
- return 0
- else
- return Math::PI
- end
+ Math.atan2!(0, self)
end
alias angle arg
diff --git a/version.h b/version.h
index 7c0ac210b6..11b22b0e55 100644
--- a/version.h
+++ b/version.h
@@ -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 @@ RUBY_EXTERN const char *ruby_copyright;
#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