mame	2017-11-04 19:56:50 +0900 (Sat, 04 Nov 2017)

  New Revision: 60642

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60642

  Log:
    Rename imemo_strterm to imemo_parser_strterm
    
    Per ko1's request.

  Modified files:
    trunk/ext/objspace/objspace.c
    trunk/gc.c
    trunk/internal.h
    trunk/parse.y
Index: gc.c
===================================================================
--- gc.c	(revision 60641)
+++ gc.c	(revision 60642)
@@ -4541,7 +4541,7 @@ gc_mark_imemo(rb_objspace_t *objspace, V https://github.com/ruby/ruby/blob/trunk/gc.c#L4541
       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
Index: parse.y
===================================================================
--- parse.y	(revision 60641)
+++ parse.y	(revision 60642)
@@ -6513,9 +6513,9 @@ parser_tokadd_string(struct parser_param https://github.com/ruby/ruby/blob/trunk/parse.y#L6513
     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_ https://github.com/ruby/ruby/blob/trunk/parse.y#L6769
     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 */
Index: ext/objspace/objspace.c
===================================================================
--- ext/objspace/objspace.c	(revision 60641)
+++ ext/objspace/objspace.c	(revision 60642)
@@ -625,7 +625,7 @@ count_imemo_objects(int argc, VALUE *arg https://github.com/ruby/ruby/blob/trunk/ext/objspace/objspace.c#L625
 	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);
Index: internal.h
===================================================================
--- internal.h	(revision 60641)
+++ internal.h	(revision 60642)
@@ -836,17 +836,17 @@ struct RIMemo { https://github.com/ruby/ruby/blob/trunk/internal.h#L836
 };
 
 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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/