crystal-lang · Jun 12, 2016 · Jun 12, 2016
Showing with 9 additions and 3 deletions.

+7 −1 spec/std/char_spec.cr

+2 −2 src/char.cr
diff --git a/spec/std/char_spec.cr b/spec/std/char_spec.cr
@@ -207,6 +207,12 @@ describe "Char" do
     it "does for unicode" do
       '青'.bytesize.should eq(3)
     end
+
+    it "raises on codepoint bigger than 0x10ffff" do
+      expect_raises InvalidByteSequenceError do
+        (0x10ffff + 1).chr.bytesize
+      end
+    end
   end
 
   describe "in_set?" do
@@ -254,7 +260,7 @@ describe "Char" do
   end
 
   it "raises on codepoint bigger than 0x10ffff when doing each_byte" do
-    expect_raises do
+    expect_raises InvalidByteSequenceError do
       (0x10ffff + 1).chr.each_byte { |b| }
     end
   end

diff --git a/src/char.cr b/src/char.cr
@@ -513,7 +513,7 @@ struct Char
       yield (0x80 | ((c >> 6) & 0x3f)).to_u8
       yield (0x80 | (c & 0x3f)).to_u8
     else
-      raise "Invalid char value"
+      raise InvalidByteSequenceError.new("Invalid char value #{dump}")
     end
   end
 
@@ -540,7 +540,7 @@ struct Char
       # 11110xxx  10xxxxxx  10xxxxxx  10xxxxxx
       4
     else
-      raise "Invalid char value"
+      raise InvalidByteSequenceError.new("Invalid char value #{dump}")
     end
   end