summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-11-13 08:10:50 +0900
committerGitHub <[email protected]>2019-11-13 08:10:50 +0900
commit37c8cbe76baa9fb85b5a7c74d155279caa6907ed (patch)
treefca44a5efb27bc4bff7acf3fbe1c1770e509c1be
parent1259564c010c264a0200097cb0575cfee2cfb350 (diff)
parentac917983c50fe86f43ed1f50b6b9814b54d19616 (diff)
downloadmruby-37c8cbe76baa9fb85b5a7c74d155279caa6907ed.tar.gz
mruby-37c8cbe76baa9fb85b5a7c74d155279caa6907ed.zip
Merge pull request #4819 from shuujii/use-intern-instead-of-intern_cstr-if-possible-in-parse.y
Use `intern` instead of `intern_cstr` if possible in `parse.y`
-rw-r--r--mrbgems/mruby-compiler/core/parse.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 55075a271..53c80bfe3 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -5765,7 +5765,7 @@ parser_yylex(parser_state *p)
tokadd(p, '$');
tokadd(p, c);
tokfix(p);
- pylval.id = intern_cstr(tok(p));
+ pylval.id = intern(tok(p), toklen(p));
return tGVAR;
case '-':
@@ -5775,7 +5775,7 @@ parser_yylex(parser_state *p)
pushback(p, c);
gvar:
tokfix(p);
- pylval.id = intern_cstr(tok(p));
+ pylval.id = intern(tok(p), toklen(p));
return tGVAR;
case '&': /* $&: last match */
@@ -5941,7 +5941,7 @@ parser_yylex(parser_state *p)
if (IS_LABEL_SUFFIX(0)) {
p->lstate = EXPR_END;
tokfix(p);
- pylval.id = intern_cstr(tok(p));
+ pylval.id = intern(tok(p), toklen(p));
return tIDENTIFIER;
}
}
@@ -6000,7 +6000,7 @@ parser_yylex(parser_state *p)
}
}
{
- mrb_sym ident = intern_cstr(tok(p));
+ mrb_sym ident = intern(tok(p), toklen(p));
pylval.id = ident;
if (last_state != EXPR_DOT && ISLOWER(tok(p)[0]) && local_var_p(p, ident)) {