5 files changed, 34 insertions, 3 deletions
diff --git a/mrbgems/mruby-sprintf/mrblib/string.rb b/mrbgems/mruby-sprintf/mrblib/string.rb
index f8bd3b02e..d7e55536a 100644
--- a/mrbgems/mruby-sprintf/mrblib/string.rb
+++ b/mrbgems/mruby-sprintf/mrblib/string.rb
@@ -1,9 +1,9 @@
 class String
   def %(args)
-    if args.is_a? Hash
-      sprintf(self, args)
-    else
+    if args.is_a? Array
       sprintf(self, *args)
+    else
+      sprintf(self, args)
     end
   end
 end
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c
index 2c0a406ad..b811d9c59 100644
--- a/mrbgems/mruby-string-ext/src/string.c
+++ b/mrbgems/mruby-string-ext/src/string.c
@@ -175,6 +175,21 @@ mrb_str_oct(mrb_state *mrb, mrb_value self)
   return mrb_str_to_inum(mrb, self, 8, FALSE);
 }
 
+/*
+ *  call-seq:
+ *     string.chr    ->  string
+ *
+ *  Returns a one-character string at the beginning of the string.
+ *
+ *     a = "abcde"
+ *     a.chr    #=> "a"
+ */
+static mrb_value
+mrb_str_chr(mrb_state *mrb, mrb_value self)
+{
+  return mrb_str_substr(mrb, self, 0, 1);
+}
+
 void
 mrb_mruby_string_ext_gem_init(mrb_state* mrb)
 {
@@ -190,6 +205,7 @@ mrb_mruby_string_ext_gem_init(mrb_state* mrb)
   mrb_define_method(mrb, s, "end_with?",       mrb_str_end_with,        MRB_ARGS_REST());
   mrb_define_method(mrb, s, "hex",             mrb_str_hex,             MRB_ARGS_NONE());
   mrb_define_method(mrb, s, "oct",             mrb_str_oct,             MRB_ARGS_NONE());
+  mrb_define_method(mrb, s, "chr",             mrb_str_chr,             MRB_ARGS_NONE());
 }
 
 void
diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb
index 01712a607..a2153da39 100644
--- a/mrbgems/mruby-string-ext/test/string.rb
+++ b/mrbgems/mruby-string-ext/test/string.rb
@@ -161,3 +161,7 @@ assert('String#oct') do
   assert_equal 8, "010".oct
   assert_equal (-8), "-10".oct
 end
+
+assert('String#chr') do
+  assert_equal "a", "abcde".chr
+end
diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c
index 797ff1399..591301591 100644
--- a/mrbgems/mruby-string-utf8/src/string.c
+++ b/mrbgems/mruby-string-utf8/src/string.c
@@ -665,6 +665,12 @@ 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);
+}
+
 void
 mrb_mruby_string_utf8_gem_init(mrb_state* mrb)
 {
@@ -680,6 +686,7 @@ 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, mrb->fixnum_class, "chr", mrb_fixnum_chr, MRB_ARGS_NONE());
 }
diff --git a/mrbgems/mruby-string-utf8/test/string.rb b/mrbgems/mruby-string-utf8/test/string.rb
index 1bfa8512c..ad864410a 100644
--- a/mrbgems/mruby-string-utf8/test/string.rb
+++ b/mrbgems/mruby-string-utf8/test/string.rb
@@ -66,3 +66,7 @@ assert('String#rindex') do
   assert_equal 12, str.rindex('ち')
   assert_equal 3, str.rindex('ち', 10)
 end
+
+assert('String#chr') do
+  assert_equal "こ", "こんにちは世界!".chr
+end