From 986a893d7a420b8472c06b2e36b71b8bf00e9e21 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 6 Oct 2014 03:08:48 +0000 Subject: symbol.c: junk-base attrset * symbol.c (rb_enc_symname_type): allow junk-base attrset ID unless the stem is not an attrset name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- symbol.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'symbol.c') diff --git a/symbol.c b/symbol.c index 6a1c0d351a..cc7da77ead 100644 --- a/symbol.c +++ b/symbol.c @@ -268,7 +268,8 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a break; case '[': - if (*++m != ']') return -1; + if (m[1] != ']') goto id; + ++m; if (*++m == '=') ++m; break; @@ -276,15 +277,22 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a if (len == 1) return ID_JUNK; switch (*++m) { case '=': case '~': ++m; break; - default: return -1; + default: + if (allowed_attrset & (1U << ID_JUNK)) goto id; + return -1; } break; default: type = rb_enc_isupper(*m, enc) ? ID_CONST : ID_LOCAL; id: - if (m >= e || (*m != '_' && !rb_enc_isalpha(*m, enc) && ISASCII(*m))) + if (m >= e || (*m != '_' && !rb_enc_isalpha(*m, enc) && ISASCII(*m))) { + if (len > 1 && *(e-1) == '=') { + type = rb_enc_symname_type(name, len-1, enc, allowed_attrset); + if (type != ID_ATTRSET) return ID_ATTRSET; + } return -1; + } while (m < e && is_identchar(m, e, enc)) m += rb_enc_mbclen(m, e, enc); if (m >= e) break; switch (*m) { -- cgit v1.2.3