diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-13 01:28:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-13 01:28:57 +0000 |
commit | da7475b00daab9e2128f9c70c098db0c2b51f443 (patch) | |
tree | 61a6e4676fb0acf3d7e3955ceac9b08cb872d721 /parse.y | |
parent | 0fa955360437fc8e1aee58c72ab7fc96f0d54f0d (diff) |
parse.y: intern_cstr
* parse.y (intern_cstr): remove `_without_pindown` suffix and use
rb_intern3() as well as RIPPER, for the time being.
[ruby-core:65009] [Bug #10206]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -283,16 +283,16 @@ struct parser_params { }; #ifdef RIPPER -#define intern_cstr_without_pindown(n,l,en) rb_intern3(n,l,en) +#define intern_cstr(n,l,en) rb_intern3(n,l,en) #else -#define intern_cstr_without_pindown(n,l,en) rb_intern_cstr_without_pindown(n,l,en) +#define intern_cstr(n,l,en) rb_intern3(n,l,en) #endif #define STR_NEW(p,n) rb_enc_str_new((p),(n),current_enc) #define STR_NEW0() rb_enc_str_new(0,0,current_enc) #define STR_NEW2(p) rb_enc_str_new((p),strlen(p),current_enc) #define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),current_enc) -#define TOK_INTERN() intern_cstr_without_pindown(tok(), toklen(), current_enc) +#define TOK_INTERN() intern_cstr(tok(), toklen(), current_enc) static int parser_yyerror(struct parser_params*, const char*); #define yyerror(msg) parser_yyerror(parser, (msg)) @@ -7447,7 +7447,7 @@ parse_gvar(struct parser_params *parser, const enum lex_state_e last_state) return '$'; } gvar: - set_yylval_name(intern_cstr_without_pindown(tok(), tokidx, current_enc)); + set_yylval_name(intern_cstr(tok(), tokidx, current_enc)); return tGVAR; case '&': /* $&: last match */ @@ -9941,7 +9941,7 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end, !rb_enc_symname2_p(s, len, enc)) { return ST_CONTINUE; } - var = intern_cstr_without_pindown(s, len, enc); + var = intern_cstr(s, len, enc); if (dvar_defined(var) || local_id(var)) { rb_warningV("named capture conflicts a local variable - %"PRIsVALUE, rb_id2str(var)); |