summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-18 13:12:47 +0000
committerkeiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-18 13:12:47 +0000
commitebfa95daff00966a2bf18d629cf56096b4d55ad6 (patch)
treec7647017a4bdacfa6a527db3e96b6b2424ab8c89
parent8ced00fab5e63610bcc990bee949bb7f7008b5b3 (diff)
downloadruby-ebfa95daff00966a2bf18d629cf56096b4d55ad6.tar.gz
ruby-ebfa95daff00966a2bf18d629cf56096b4d55ad6.tar.xz
ruby-ebfa95daff00966a2bf18d629cf56096b4d55ad6.zip
* lib/matrix.rb: fix a coerce bug of Vector. [ruby-core: 12190]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/matrix.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f45b5b109..8e3e20735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 18 22:08:42 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/matrix.rb: fix a coerce bug of Vector. [ruby-core: 12190]
+
Mon Sep 17 21:06:03 2007 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb (HTTP::GenericRequest#initialize): check path is
diff --git a/lib/matrix.rb b/lib/matrix.rb
index 6c4f4f548..8f2d472b8 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1374,7 +1374,7 @@ class Vector
def coerce(other)
case other
when Numeric
- return Scalar.new(other), self
+ return Matrix::Scalar.new(other), self
else
raise TypeError, "#{self.class} can't be coerced into #{other.class}"
end