1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn SET_LEX_STATE macro into an inline function call

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-12-15 00:37:45 +09:00
parent a3934cd1e5
commit 637c3cfc5d
Notes: git 2021-12-15 01:52:35 +09:00 
Merged: https://github.com/ruby/ruby/pull/5266
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
parse.y
View File

@ -165,10 +165,8 @@ enum lex_state_e {
#define IS_lex_state_all(ls) IS_lex_state_all_for(p->lex.state, (ls)) #define IS_lex_state_all(ls) IS_lex_state_all_for(p->lex.state, (ls))
# define SET_LEX_STATE(ls) \ # define SET_LEX_STATE(ls) \
(p->lex.state = \ parser_set_lex_state(p, ls, __LINE__)
(p->debug ? \ static inline enum lex_state_e parser_set_lex_state(struct parser_params *p, enum lex_state_e ls, int line);
rb_parser_trace_lex_state(p, p->lex.state, (ls), __LINE__) : \
(enum lex_state_e)(ls)))
typedef VALUE stack_type; typedef VALUE stack_type;
@ -10694,6 +10692,14 @@ new_regexp(struct parser_params *p, VALUE re, VALUE opt, const YYLTYPE *loc)
} }
#endif /* !RIPPER */ #endif /* !RIPPER */
static inline enum lex_state_e
parser_set_lex_state(struct parser_params *p, enum lex_state_e ls, int line)
{
if (p->debug) {
ls = rb_parser_trace_lex_state(p, p->lex.state, ls, line);
}
return p->lex.state = ls;
}
#ifndef RIPPER #ifndef RIPPER
static const char rb_parser_lex_state_names[][8] = { static const char rb_parser_lex_state_names[][8] = {