summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordearblue <[email protected]>2019-02-16 21:26:45 +0900
committerdearblue <[email protected]>2019-02-16 21:26:45 +0900
commit81cbc92513b82bf4ee173fab0a7779ac05a8ef04 (patch)
tree1d594178cd658ca63385322825321613f4502800
parentd1db959cabd017ecf167edff343d6aacf25142fe (diff)
downloadmruby-81cbc92513b82bf4ee173fab0a7779ac05a8ef04.tar.gz
mruby-81cbc92513b82bf4ee173fab0a7779ac05a8ef04.zip
Fix inline packed symbols on 32 bit mode with MRB_WORD_BOXING
-rw-r--r--src/symbol.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/symbol.c b/src/symbol.c
index 620ae3418..1bc9f2676 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -34,13 +34,18 @@ static const char pack_table[] = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS
static mrb_sym
sym_inline_pack(const char *name, uint16_t len)
{
+ enum {
+ lower_length_max = (MRB_SYMBOL_BITSIZE - 2) / 5,
+ mix_length_max = (MRB_SYMBOL_BITSIZE - 2) / 6
+ };
+
char c;
const char *p;
int i;
mrb_sym sym = 0;
int lower = 1;
- if (len > 6) return 0; /* too long */
+ if (len > lower_length_max) return 0; /* too long */
for (i=0; i<len; i++) {
uint32_t bits;
@@ -64,7 +69,7 @@ sym_inline_pack(const char *name, uint16_t len)
}
return sym | 3;
}
- if (len == 6) return 0;
+ if (len > mix_length_max) return 0;
return sym | 1;
}