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

string.c (mrb_utf8len): retry 7cdef2b0.

Browse Source 
C++ requires `extern` declaration before variable definition.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-05-27 11:13:24 +09:00
parent 0a8bfd1f8b
commit 82b87be4df
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
+2 -6
View File
@@ -989,11 +989,7 @@ mrb_str_succ(mrb_state *mrb, mrb_value self)
}
#ifdef MRB_UTF8_STRING
static const char utf8len_table[] =
{
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0
};
extern const char mrb_utf8len_table[];
static mrb_int
utf8code(unsigned char* p, mrb_int limit)
@@ -1003,7 +999,7 @@ utf8code(unsigned char* p, mrb_int limit)
if (p[0] < 0x80)
return p[0];
len = utf8len_table[p[0]>>3];
len = mrb_utf8len_table[p[0]>>3];
if (len <= limit && len > 1 && (p[1] & 0xc0) == 0x80) {
if (len == 2)
return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f);
src/string.c
+7 -6
View File
@@ -238,17 +238,18 @@ mrb_gc_free_str(mrb_state *mrb, struct RString *str)
}
#ifdef MRB_UTF8_STRING
#define utf8_islead(c) ((unsigned char)((c)&0xc0) != 0x80)
extern const char mrb_utf8len_table[];
const char mrb_utf8len_table[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0
};
mrb_int
mrb_utf8len(const char* p, const char* e)
{
static const char lengths[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0
};
mrb_int len = lengths[(unsigned char)p[0] >> 3];
mrb_int len = mrb_utf8len_table[(unsigned char)p[0] >> 3];
if (len > e - p) return 1;
switch (len) {
case 1: