diff options
| -rw-r--r-- | mrbgems/mruby-array-ext/mrblib/array.rb | 39 | ||||
| -rw-r--r-- | mrbgems/mruby-array-ext/test/array.rb | 9 | ||||
| -rw-r--r-- | mrbgems/mruby-string-utf8/src/string.c | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-string-utf8/test/string.rb | 14 |
4 files changed, 57 insertions, 10 deletions
diff --git a/mrbgems/mruby-array-ext/mrblib/array.rb b/mrbgems/mruby-array-ext/mrblib/array.rb index 7f48811f1..6c47235fe 100644 --- a/mrbgems/mruby-array-ext/mrblib/array.rb +++ b/mrbgems/mruby-array-ext/mrblib/array.rb @@ -1,7 +1,8 @@ class Array ## # call-seq: - # ary.uniq! -> ary or nil + # ary.uniq! -> ary or nil + # ary.uniq! { |item| ... } -> ary or nil # # Removes duplicate elements from +self+. # Returns <code>nil</code> if no changes are made (that is, no @@ -11,13 +12,27 @@ class Array # a.uniq! #=> ["a", "b", "c"] # b = [ "a", "b", "c" ] # b.uniq! #=> nil + # c = [["student","sam"], ["student","george"], ["teacher","matz"]] + # c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]] # - def uniq! + def uniq!(&block) ary = self.dup result = [] - while ary.size > 0 - result << ary.shift - ary.delete(result.last) + if block + hash = {} + while ary.size > 0 + val = ary.shift + key = block.call(val) + hash[key] = val unless hash.has_key?(key) + end + hash.each_value do |value| + result << value + end + else + while ary.size > 0 + result << ary.shift + ary.delete(result.last) + end end if result.size == self.size nil @@ -28,16 +43,24 @@ class Array ## # call-seq: - # ary.uniq -> new_ary + # ary.uniq -> new_ary + # ary.uniq { |item| ... } -> new_ary # # Returns a new array by removing duplicate values in +self+. # # a = [ "a", "a", "b", "b", "c" ] # a.uniq #=> ["a", "b", "c"] # - def uniq + # b = [["student","sam"], ["student","george"], ["teacher","matz"]] + # b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]] + # + def uniq(&block) ary = self.dup - ary.uniq! + if block + ary.uniq!(&block) + else + ary.uniq! + end ary end diff --git a/mrbgems/mruby-array-ext/test/array.rb b/mrbgems/mruby-array-ext/test/array.rb index 9a0f25f9a..d157a5b4d 100644 --- a/mrbgems/mruby-array-ext/test/array.rb +++ b/mrbgems/mruby-array-ext/test/array.rb @@ -36,12 +36,21 @@ assert("Array#uniq!") do b = [ "a", "b", "c" ] assert_nil b.uniq! + + c = [["student","sam"], ["student","george"], ["teacher","matz"]] + assert_equal [["student", "sam"], ["teacher", "matz"]], c.uniq! { |s| s.first } + + d = [["student","sam"], ["teacher","matz"]] + assert_nil d.uniq! { |s| s.first } end assert("Array#uniq") do a = [1, 2, 3, 1] assert_equal [1, 2, 3], a.uniq assert_equal [1, 2, 3, 1], a + + b = [["student","sam"], ["student","george"], ["teacher","matz"]] + assert_equal [["student", "sam"], ["teacher", "matz"]], b.uniq { |s| s.first } end assert("Array#-") do diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c index 3d5d44c77..45dd66eec 100644 --- a/mrbgems/mruby-string-utf8/src/string.c +++ b/mrbgems/mruby-string-utf8/src/string.c @@ -636,7 +636,8 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) while (ptr < eptr && (end = mrb_memsearch(sptr, slen, ptr, eptr - ptr)) >= 0) { - mrb_ary_push(mrb, result, str_subseq(mrb, str, ptr - temp, end)); + // mrb_ary_push(mrb, result, str_subseq(mrb, str, ptr - temp, end)); + mrb_ary_push(mrb, result, mrb_str_new(mrb, ptr, end)); mrb_gc_arena_restore(mrb, ai); ptr += end + slen; if (lim_p && lim <= ++i) break; @@ -652,7 +653,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) tmp = mrb_str_new_lit(mrb, ""); } else { - tmp = str_subseq(mrb, str, beg, RSTRING_LEN(str)-beg); + tmp = mrb_str_new(mrb, RSTRING_PTR(str)+beg, RSTRING_LEN(str)-beg); } mrb_ary_push(mrb, result, tmp); } diff --git a/mrbgems/mruby-string-utf8/test/string.rb b/mrbgems/mruby-string-utf8/test/string.rb index 939ac24bb..2d5702ffc 100644 --- a/mrbgems/mruby-string-utf8/test/string.rb +++ b/mrbgems/mruby-string-utf8/test/string.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- ## # String(utf8) Test @@ -45,3 +46,16 @@ assert('String#index') do assert_equal 12, str.index('ち', 10) assert_equal nil, str.index("さ") end + +assert('String#ord') do + got = "こんにちわ世界!".split('').map {|x| x.ord} + expect = [0x3053,0x3093,0x306b,0x3061,0x308f,0x4e16,0x754c,0x21] + assert_equal expect, got +end + +assert('String#split') do + got = "こんにちわ世界!".split('') + assert_equal ['こ', 'ん', 'に', 'ち', 'わ', '世', '界', '!'], got + got = "こんにちわ世界!".split('に') + assert_equal ['こん', 'ちわ世界!'], got +end |