diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/matrix.rb | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Tue Feb 5 14:43:15 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/matrix.rb: Fix error message, patch by pypypy [Bug #7777] + Tue Feb 5 14:36:04 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * numeric.c (fix_pow): Handle special cases when base is 0, -1 or +1 diff --git a/lib/matrix.rb b/lib/matrix.rb index 7a3857ae99..b1d1a5c2bd 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -156,7 +156,7 @@ class Matrix end size = (rows[0] || []).size rows.each do |row| - Matrix.Raise ErrDimensionMismatch, "row size differs (#{row.size} should be #{size})" unless row.size == size + raise ErrDimensionMismatch, "row size differs (#{row.size} should be #{size})" unless row.size == size end new rows, size end @@ -286,8 +286,8 @@ class Matrix # => Matrix[[0, 0, 0], [0, 0, 0]] # def Matrix.empty(row_count = 0, column_count = 0) - Matrix.Raise ArgumentError, "One size must be 0" if column_count != 0 && row_count != 0 - Matrix.Raise ArgumentError, "Negative size" if column_count < 0 || row_count < 0 + raise ArgumentError, "One size must be 0" if column_count != 0 && row_count != 0 + raise ArgumentError, "Negative size" if column_count < 0 || row_count < 0 new([[]]*row_count, column_count) end @@ -446,7 +446,7 @@ class Matrix end end else - Matrix.Raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper" + raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper" end self end @@ -508,7 +508,7 @@ class Matrix end end else - Matrix.Raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper" + raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper" end self end @@ -579,7 +579,7 @@ class Matrix from_row += row_count if from_row < 0 from_col += column_count if from_col < 0 else - Matrix.Raise ArgumentError, param.inspect + raise ArgumentError, param.inspect end return nil if from_row > row_count || from_col > column_count || from_row < 0 || from_col < 0 |