mruby-string-utf8: redefine String#size for UTF-8 string; mruby#1646

matz · matz · commit 78ab979ef9f8 · 2014-01-07T16:24:09.000+09:00
diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c
@@ -47,6 +47,14 @@ mrb_utf8_strlen(mrb_value str)
   return total;
 }
 
+static mrb_value
+mrb_str_size(mrb_state *mrb, mrb_value str)
+{
+  size_t size = mrb_utf8_strlen(str);
+
+  return mrb_fixnum_value(size);
+}
+
 #define RSTRING_LEN_UTF8(s) mrb_utf8_strlen(s)
 
 static mrb_value
@@ -244,6 +252,7 @@ mrb_mruby_string_utf8_gem_init(mrb_state* mrb)
 {
   struct RClass * s = mrb->string_class;
 
+  mrb_define_method(mrb, s, "size", mrb_str_size, MRB_ARGS_NONE());
   mrb_define_method(mrb, s, "[]", mrb_str_aref_m, MRB_ARGS_ANY());
   mrb_define_method(mrb, s, "slice", mrb_str_aref_m, MRB_ARGS_ANY());
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,14 @@ mrb_utf8_strlen(mrb_value str)`
`47`	`47`	`return total;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+static mrb_value`
	`51`	`+mrb_str_size(mrb_state *mrb, mrb_value str)`
	`52`	`+{`
	`53`	`+ size_t size = mrb_utf8_strlen(str);`
	`54`	`+`
	`55`	`+ return mrb_fixnum_value(size);`
	`56`	`+}`
	`57`	`+`
`50`	`58`	`#define RSTRING_LEN_UTF8(s) mrb_utf8_strlen(s)`
`51`	`59`
`52`	`60`	`static mrb_value`
`@@ -244,6 +252,7 @@ mrb_mruby_string_utf8_gem_init(mrb_state* mrb)`
`244`	`252`	`{`
`245`	`253`	`struct RClass * s = mrb->string_class;`
`246`	`254`
	`255`	`+ mrb_define_method(mrb, s, "size", mrb_str_size, MRB_ARGS_NONE());`
`247`	`256`	`mrb_define_method(mrb, s, "[]", mrb_str_aref_m, MRB_ARGS_ANY());`
`248`	`257`	`mrb_define_method(mrb, s, "slice", mrb_str_aref_m, MRB_ARGS_ANY());`
`249`	`258`	`}`