nobu	2009-10-27 16:36:54 +0900 (Tue, 27 Oct 2009)

  New Revision: 25512

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25512

  Log:
    * string.c (chopped_length): get rid of unexpected exception.
      see [ruby-core:26336].

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_m17n_comb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25511)
+++ ChangeLog	(revision 25512)
@@ -1,3 +1,8 @@
+Tue Oct 27 16:36:52 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (chopped_length): get rid of unexpected exception.
+	  see [ruby-core:26336].
+
 Tue Oct 27 15:53:10 2009  Tanaka Akira  <akr@f...>
 
 	* gc.h (SET_MACHINE_STACK_END): use __i386.
Index: string.c
===================================================================
--- string.c	(revision 25511)
+++ string.c	(revision 25512)
@@ -5925,9 +5925,9 @@
     if (beg > end) return 0;
     p = rb_enc_prev_char(beg, end, end, enc);
     if (!p) return 0;
-    if (p > beg && rb_enc_codepoint(p, end, enc) == '\n') {
+    if (p > beg && rb_enc_ascget(p, end, 0, enc) == '\n') {
 	p2 = rb_enc_prev_char(beg, p, end, enc);
-	if (p2 && rb_enc_codepoint(p2, end, enc) == '\r') p = p2;
+	if (p2 && rb_enc_ascget(p2, end, 0, enc) == '\r') p = p2;
     }
     return p - beg;
 }
Index: test/ruby/test_m17n_comb.rb
===================================================================
--- test/ruby/test_m17n_comb.rb	(revision 25511)
+++ test/ruby/test_m17n_comb.rb	(revision 25512)
@@ -727,15 +727,6 @@
     STRINGS.each {|s|
       s = s.dup
       desc = "#{encdump s}.chop"
-      if !s.valid_encoding?
-        #assert_raise(ArgumentError, desc) { s.chop }
-        begin
-          s.chop
-        rescue ArgumentError
-          e = $!
-        end
-        next if e
-      end
       t = nil
       assert_nothing_raised(desc) { t = s.chop }
       assert(t.valid_encoding?) if s.valid_encoding?

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/