summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/objspace/objspace.c2
-rw-r--r--gc.c2
-rw-r--r--internal.h22
-rw-r--r--parse.y6
4 files changed, 16 insertions, 16 deletions
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 247ba148b2..d5e86353f1 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -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);
diff --git a/gc.c b/gc.c
index 108302b0bd..e2c5714fa2 100644
--- a/gc.c
+++ b/gc.c
@@ -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
diff --git a/internal.h b/internal.h
index e21a2b6801..0813e7eaa9 100644
--- a/internal.h
+++ b/internal.h
@@ -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
diff --git a/parse.y b/parse.y
index a538c81452..403953f767 100644
--- a/parse.y
+++ b/parse.y
@@ -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 */