kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Rename imemo_strterm to imemo_parser_strterm

Browse source 
Per ko1's request.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2017-11-04 10:56:50 +00:00
parent 739aadbb52
commit 1aa34afd41
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/objspace/objspace.c
View file

@ -625,7 +625,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
imemo_type_ids[6] = rb_intern("imemo_ment");
imemo_type_ids[7] = rb_intern("imemo_iseq");
imemo_type_ids[8] = rb_intern("imemo_alloc");
imemo_type_ids[9] = rb_intern("imemo_strterm");
imemo_type_ids[9] = rb_intern("imemo_parser_strterm");
}
rb_objspace_each_objects(count_imemo_objects_i, (void *)hash);

2
gc.c
View file

@ -4541,7 +4541,7 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
case imemo_ast:
rb_ast_mark(&RANY(obj)->as.imemo.ast);
return;
case imemo_strterm:
case imemo_parser_strterm:
rb_strterm_mark(obj);
return;
#if VM_CHECK_MODE > 0

22
internal.h
View file

@ -836,17 +836,17 @@ struct RIMemo {
};
enum imemo_type {
imemo_env = 0,
imemo_cref = 1, /*!< class reference */
imemo_svar = 2, /*!< special variable */
imemo_throw_data = 3,
imemo_ifunc = 4, /*!< iterator function */
imemo_memo = 5,
imemo_ment = 6,
imemo_iseq = 7,
imemo_alloc = 8,
imemo_ast = 9,
imemo_strterm = 10
imemo_env = 0,
imemo_cref = 1, /*!< class reference */
imemo_svar = 2, /*!< special variable */
imemo_throw_data = 3,
imemo_ifunc = 4, /*!< iterator function */
imemo_memo = 5,
imemo_ment = 6,
imemo_iseq = 7,
imemo_alloc = 8,
imemo_ast = 9,
imemo_parser_strterm = 10
};
#define IMEMO_MASK 0x0f

6
parse.y
View file

@ -6513,9 +6513,9 @@ parser_tokadd_string(struct parser_params *parser,
return c;
}
/* imemo_strterm for literal */
/* imemo_parser_strterm for literal */
#define NEW_STRTERM(func, term, paren) \
(rb_strterm_t*)rb_imemo_new(imemo_strterm, (VALUE)(func), (VALUE)(paren), (VALUE)(term), 0)
(rb_strterm_t*)rb_imemo_new(imemo_parser_strterm, (VALUE)(func), (VALUE)(paren), (VALUE)(term), 0)
#ifdef RIPPER
static void
@ -6769,7 +6769,7 @@ parser_heredoc_identifier(struct parser_params *parser)
len = lex_p - lex_pbeg;
lex_goto_eol(parser);
lex_strterm = (rb_strterm_t*)rb_imemo_new(imemo_strterm,
lex_strterm = (rb_strterm_t*)rb_imemo_new(imemo_parser_strterm,
STR_NEW(tok(), toklen()), /* term */
lex_lastline, /* lastline */
len, /* lastidx */