From 800f04c6a521c007e9837813b3564ae6b491e31c Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 8 Jan 2012 20:42:45 +0000
Subject: * numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
   is invalid. [Feature #5855] [Bug #5863] [Bug #5864]

* string.c (rb_str_concat): ditto.

* string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
  is US-ASCII and the argument is an integer greater than 127.

* regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.

* enc/euc_jp.c (code_to_mbclen): ditto.

* enc/shift_jis.c (code_to_mbclen): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/enc/test_shift_jis.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/ruby/enc')

diff --git a/test/ruby/enc/test_shift_jis.rb b/test/ruby/enc/test_shift_jis.rb
index f81cb7801c..54ef67dd44 100644
--- a/test/ruby/enc/test_shift_jis.rb
+++ b/test/ruby/enc/test_shift_jis.rb
@@ -22,6 +22,6 @@ class TestShiftJIS < Test::Unit::TestCase
     s = "あいうえお"
     s << 0x82a9
     assert_equal("あいうえおか", s)
-    assert_raise(ArgumentError) { s << 0x82 }
+    assert_raise(RangeError) { s << 0x82 }
   end
 end
-- 
cgit v1.2.3