1 files changed, 84 insertions, 6 deletions

diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c
index edda491fc..e31eca5d3 100644
--- a/mrbgems/mruby-string-utf8/src/string.c
+++ b/mrbgems/mruby-string-utf8/src/string.c
@@ -1,5 +1,6 @@
 #include "mruby.h"
 #include "mruby/array.h"
+#include "mruby/class.h"
 #include "mruby/string.h"
 #include "mruby/range.h"
 #include "mruby/re.h"
@@ -127,9 +128,7 @@ mrb_utf8_strlen(mrb_value str, mrb_int len)
 static mrb_value
 mrb_str_size(mrb_state *mrb, mrb_value str)
 {
-  mrb_int size = mrb_utf8_strlen(str, -1);
-
-  return mrb_fixnum_value(size);
+  return mrb_fixnum_value(mrb_utf8_strlen(str, -1));
 }
 
 #define RSTRING_LEN_UTF8(s) mrb_utf8_strlen(s, -1)
@@ -161,10 +160,10 @@ mrb_memsearch_qs(const unsigned char *xs, mrb_int m, const unsigned char *ys, mr
     qstable[i] = m + 1;
   for (; x < xe; ++x)
     qstable[*x] = xe - x;
- /* Searching */
+  /* Searching */
   for (; y + m <= ys + n; y += *(qstable + y[m])) {
     if (*xs == *y && memcmp(xs, y, m) == 0)
-        return y - ys;
+      return y - ys;
   }
   return -1;
 }
@@ -572,7 +571,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
     if (mrb_string_p(spat)) {
       split_type = string;
       if (RSTRING_LEN(spat) == 1 && RSTRING_PTR(spat)[0] == ' '){
-          split_type = awk;
+        split_type = awk;
       }
     }
     else {
@@ -667,6 +666,80 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
   return result;
 }
 
+static mrb_value
+mrb_str_chr(mrb_state *mrb, mrb_value self)
+{
+  return str_substr(mrb, self, 0, 1);
+}
+
+static mrb_value
+mrb_str_chars(mrb_state *mrb, mrb_value self)
+{
+  mrb_value result;
+  mrb_value blk;
+  int ai;
+  mrb_int len;
+  mrb_value arg;
+  char *p = RSTRING_PTR(self);
+  char *e = p + RSTRING_LEN(self);
+
+  mrb_get_args(mrb, "&", &blk);
+
+  result = mrb_ary_new(mrb);
+
+  if (!mrb_nil_p(blk)) {
+    while (p < e) {
+      len = utf8len((unsigned char*) p);
+      arg = mrb_str_new(mrb, p, len);
+      mrb_yield_argv(mrb, blk, 1, &arg);
+      p += len;
+    }
+    return self;
+  }
+  while (p < e) {
+    ai = mrb_gc_arena_save(mrb);
+    len = utf8len((unsigned char*) p);
+    mrb_ary_push(mrb, result, mrb_str_new(mrb, p, len));
+    mrb_gc_arena_restore(mrb, ai);
+    p += len;
+  }
+  return result;
+}
+
+static mrb_value
+mrb_str_codepoints(mrb_state *mrb, mrb_value self)
+{
+  mrb_value result;
+  mrb_value blk;
+  int ai;
+  mrb_int len;
+  mrb_value arg;
+  char *p = RSTRING_PTR(self);
+  char *e = p + RSTRING_LEN(self);
+
+  mrb_get_args(mrb, "&", &blk);
+
+  result = mrb_ary_new(mrb);
+
+  if (!mrb_nil_p(blk)) {
+    while (p < e) {
+      len = utf8len((unsigned char*) p);
+      arg = mrb_fixnum_value(utf8code((unsigned char*) p));
+      mrb_yield_argv(mrb, blk, 1, &arg);
+      p += len;
+    }
+    return self;
+  }
+  while (p < e) {
+    ai = mrb_gc_arena_save(mrb);
+    len = utf8len((unsigned char*) p);
+    mrb_ary_push(mrb, result, mrb_fixnum_value(utf8code((unsigned char*) p)));
+    mrb_gc_arena_restore(mrb, ai);
+    p += len;
+  }
+  return result;
+}
+
 void
 mrb_mruby_string_utf8_gem_init(mrb_state* mrb)
 {
@@ -682,6 +755,11 @@ mrb_mruby_string_utf8_gem_init(mrb_state* mrb)
   mrb_define_method(mrb, s, "reverse",  mrb_str_reverse, MRB_ARGS_NONE());
   mrb_define_method(mrb, s, "reverse!", mrb_str_reverse_bang, MRB_ARGS_NONE());
   mrb_define_method(mrb, s, "rindex", mrb_str_rindex_m, MRB_ARGS_ANY());
+  mrb_define_method(mrb, s, "chr", mrb_str_chr, MRB_ARGS_NONE());
+  mrb_define_method(mrb, s, "chars", mrb_str_chars, MRB_ARGS_NONE());
+  mrb_alias_method(mrb, s, mrb_intern_lit(mrb, "each_char"), mrb_intern_lit(mrb, "chars"));
+  mrb_define_method(mrb, s, "codepoints", mrb_str_codepoints, MRB_ARGS_NONE());
+  mrb_alias_method(mrb, s, mrb_intern_lit(mrb, "each_codepoint"), mrb_intern_lit(mrb, "codepoints"));
 
   mrb_define_method(mrb, mrb->fixnum_class, "chr", mrb_fixnum_chr, MRB_ARGS_NONE());
 }