admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Symbol#size for multi-byte characters with MRB_UTF8_STRING

Browse Source 
Before:

  p :あ.size  #=> 3

After:

  p :あ.size  #=> 1
This commit is contained in:
KOBAYASHI Shuji
2019-02-04 18:11:22 +09:00
parent 3f7137feae
commit 69fd1a5925
4 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+22 -13
View File
@@ -238,27 +238,36 @@ utf8len(const char* p, const char* e)
return len;
}
static mrb_int
utf8_strlen(mrb_value str, mrb_int len)
mrb_int
mrb_utf8_len(const char *str, mrb_int byte_len)
{
mrb_int total = 0;
char* p = RSTRING_PTR(str);
char* e = p;
if (RSTRING(str)->flags & MRB_STR_NO_UTF) {
return RSTRING_LEN(str);
}
e += len < 0 ? RSTRING_LEN(str) : len;
while (p<e) {
const char *p = str;
const char *e = p + byte_len;
while (p < e) {
p += utf8len(p, e);
total++;
}
if (RSTRING_LEN(str) == total) {
RSTRING(str)->flags |= MRB_STR_NO_UTF;
}
return total;
}
#define RSTRING_CHAR_LEN(s) utf8_strlen(s, -1)
static mrb_int
utf8_strlen(mrb_value str)
{
mrb_int byte_len = RSTRING_LEN(str);
if (RSTRING(str)->flags & MRB_STR_NO_UTF) {
return byte_len;
}
else {
mrb_int utf8_len = mrb_utf8_len(RSTRING_PTR(str), byte_len);
if (byte_len == utf8_len) RSTRING(str)->flags |= MRB_STR_NO_UTF;
return utf8_len;
}
}
#define RSTRING_CHAR_LEN(s) utf8_strlen(s)
/* map character index to byte offset index */
static mrb_int