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

Merge pull request #4278 from shuujii/add-length-argument-for-sym_inline_unpack

Browse Source 
Add length argument for `sym_inline_unpack()`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-02-16 21:52:39 +09:00
committed by GitHub
parent c769013f9b 2c8af128f4
commit 21933b7790
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/symbol.c
+10 -23
View File
@@ -69,32 +69,21 @@ sym_inline_pack(const char *name, uint16_t len)
}
static const char*
sym_inline_unpack_with_bit(mrb_sym sym, char *buf, int bit_per_char)
sym_inline_unpack(mrb_sym sym, char *buf, mrb_int *lenp)
{
int bit_per_char = sym&2 ? 5 : 6; /* all lower case if `sym&2` is true */
int i;
for (i=0; i<30/bit_per_char; i++) {
uint32_t bits;
char c;
bits = sym>>(i*bit_per_char+2) & (1<<bit_per_char)-1;
if (bits == 0) break;
c = pack_table[bits-1];
buf[i] = c;
}
buf[i] = '\0';
return buf;
}
static const char*
sym_inline_unpack(mrb_sym sym, char *buf)
{
mrb_assert(sym&1);
if (sym&2) { /* all lower case (5bits/char) */
return sym_inline_unpack_with_bit(sym, buf, 5);
for (i=0; i<30/bit_per_char; i++) {
uint32_t bits = sym>>(i*bit_per_char+2) & (1<<bit_per_char)-1;
if (bits == 0) break;
buf[i] = pack_table[bits-1];;
}
return sym_inline_unpack_with_bit(sym, buf, 6);
buf[i] = '\0';
if (lenp) *lenp = i;
return buf;
}
#endif
@@ -248,9 +237,7 @@ mrb_sym2name_len(mrb_state *mrb, mrb_sym sym, mrb_int *lenp)
{
#ifndef MRB_ENABLE_ALL_SYMBOLS
if (sym & 1) { /* inline packed symbol */
sym_inline_unpack(sym, mrb->symbuf);
if (lenp) *lenp = strlen(mrb->symbuf);
return mrb->symbuf;
return sym_inline_unpack(sym, mrb->symbuf, lenp);
}
#endif