Changeset 29268

Timestamp:

01/30/09 12:30:29 (4 years ago)

Author:

isaisstillalive

Message:

• String#lengthの上書きはやはり問題があったのでmultibyte_lengthに変更。
  
• String#[]の上書きも問題ありそうな気がするのでmultibyte_substringに変更。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin.rb (modified) (2 diffs)
• lib/ruwin/edit_field.rb (modified) (6 diffs)
• test/test_ruwin.rb (modified) (1 diff)

lang/ruby/ruwin/lib/ruwin.rb

@@ -90 +90 @@
 class String
   if VERSION.match /^1\.8/
-    alias _original_substring []
-    def [] *args
-      return _original_substring(*args) if args[0].kind_of?(String) || args[0].kind_of?(Regexp)
+    def multibyte_substring *args
+      return self[*args] if args[0].kind_of?(String) || args[0].kind_of?(Regexp)
       
       chars = multibyte_chars[*args]
@@ -102 +101 @@
     end
     
-    def length
+    def multibyte_length
       multibyte_chars.size
     end

lang/ruby/ruwin/lib/ruwin/edit_field.rb

@@ -33 +33 @@
       
       def physical_substring physical_first, physical_last
-        physical_string[physical_first...physical_last]
+        physical_string.multibyte_substring(physical_first...physical_last)
       end
       alias substring physical_substring
@@ -39 +39 @@
       
       def logical_substring logical_first, logical_last
-        logical_string[logical_first...logical_last]
+        logical_string.multibyte_substring(logical_first...logical_last)
       end
       private :logical_substring
@@ -45 +45 @@
       
       def physical_length
-        physical_string.length
+        physical_string.multibyte_length
       end
       alias length physical_length
@@ -51 +51 @@
       
       def logical_length
-        logical_string.length
+        logical_string.multibyte_length
       end
       private :logical_length
@@ -91 +91 @@
       def selection_string
         first, last = get_physical_selection
-        physical_string[first...last]
+        physical_string.multibyte_substring(first...last)
       end
       
@@ -192 +192 @@
       private
       def count_br physical_first, physical_length
-        (string[physical_first, physical_length]+" ").split("\r").size-1
+        (string.multibyte_substring(physical_first, physical_length)+" ").split("\r").size-1
       end
       

lang/ruby/ruwin/test/test_ruwin.rb

@@ -50 +50 @@
   
   
-  def test_string_length
-    assert_equal 3, "ABC".length
+  def test_string_multibyte_length
+    assert_equal 3, "ABC".multibyte_length
   end
   
-  def test_multibyte_string_length_utf8
-    assert_equal 3, NKF.nkf("-Ww", "あいう").length
+  def test_multibyte_string_multibyte_length_utf8
+    assert_equal 3, NKF.nkf("-Ww", "あいう").multibyte_length
   end
   
-  def test_multibyte_string_length_sjis
-    assert_equal 3, NKF.nkf("-Ws", "あいう").length
+  def test_multibyte_string_multibyte_length_sjis
+    assert_equal 3, NKF.nkf("-Ws", "あいう").multibyte_length
   end
   
   
   def test_string_substring
-    assert_equal "BCD", "ABCDE"[1...4]
+    assert_equal "BCD", "ABCDE".multibyte_substring(1...4)
   end
   
   def test_string_substring_substr
-    assert_equal "BCD", "ABCDE"["BCD"]
+    assert_equal "BCD", "ABCDE".multibyte_substring("BCD")
   end
   
   def test_string_substring_regexp
-    assert_equal "BCD", "ABCDE"[/BCD/]
+    assert_equal "BCD", "ABCDE".multibyte_substring(/BCD/)
   end
   
   def test_string_substring_index
-    assert_equal "B", "ABCDE"[1]
+    assert_equal "B", "ABCDE".multibyte_substring(1)
   end
   
   def test_multibyte_string_substring_utf8
-    assert_equal NKF.nkf("-Ww", "いうえ"), NKF.nkf("-Ww", "あいうえお")[1...4]
+    assert_equal NKF.nkf("-Ww", "いうえ"), NKF.nkf("-Ww", "あいうえお").multibyte_substring(1...4)
   end
   
   def test_multibyte_string_substring_usjis
-    assert_equal NKF.nkf("-Ws", "いうえ"), NKF.nkf("-Ws", "あいうえお")[1...4]
+    assert_equal NKF.nkf("-Ws", "いうえ"), NKF.nkf("-Ws", "あいうえお").multibyte_substring(1...4)
   end
 end