https://git.ruby-lang.org/ruby.git/commit/?id=dd29ba0764

From dd29ba076439375c6e235218ce5a0a3f01d41b29 Mon Sep 17 00:00:00 2001
From: Koichi Sasada <ko1@a...>
Date: Sun, 19 Dec 2021 05:35:16 +0900
Subject: `iseq_type_sym()` -> `iseq_type_id()`

`iseq_type_sym()` returns `ID` (surprisingly!) so rename it
to `iseq_type_id()`.
---
 iseq.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/iseq.c b/iseq.c
index 351c1e815fe..a1940f70ce4 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1194,12 +1194,12 @@ rb_iseq_code_location(const rb_iseq_t *iseq, int *beg_pos_lineno, int *beg_pos_c https://github.com/ruby/ruby/blob/trunk/iseq.c#L1194
     if (end_pos_column) *end_pos_column = loc->end_pos.column;
 }
 
-static VALUE iseq_type_sym(enum iseq_type type);
+static ID iseq_type_id(enum iseq_type type);
 
 VALUE
 rb_iseq_type(const rb_iseq_t *iseq)
 {
-    return iseq_type_sym(iseq->body->type);
+    return ID2SYM(iseq_type_id(iseq->body->type));
 }
 
 VALUE
@@ -2675,12 +2675,6 @@ ruby_node_name(int node) https://github.com/ruby/ruby/blob/trunk/iseq.c#L2675
     }
 }
 
-#define DECL_SYMBOL(name) \
-  static ID sym_##name
-
-#define INIT_SYMBOL(name) \
-  sym_##name = rb_intern(#name)
-
 static VALUE
 register_label(struct st_table *table, unsigned long idx)
 {
@@ -2720,41 +2714,47 @@ static const rb_data_type_t label_wrapper = { https://github.com/ruby/ruby/blob/trunk/iseq.c#L2714
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
+#define DECL_ID(name) \
+  static ID id_##name
+
+#define INIT_ID(name) \
+  id_##name = rb_intern(#name)
+
 static VALUE
-iseq_type_sym(enum iseq_type type)
-{
-    DECL_SYMBOL(top);
-    DECL_SYMBOL(method);
-    DECL_SYMBOL(block);
-    DECL_SYMBOL(class);
-    DECL_SYMBOL(rescue);
-    DECL_SYMBOL(ensure);
-    DECL_SYMBOL(eval);
-    DECL_SYMBOL(main);
-    DECL_SYMBOL(plain);
-
-    if (sym_top == 0) {
-        INIT_SYMBOL(top);
-        INIT_SYMBOL(method);
-        INIT_SYMBOL(block);
-        INIT_SYMBOL(class);
-        INIT_SYMBOL(rescue);
-        INIT_SYMBOL(ensure);
-        INIT_SYMBOL(eval);
-        INIT_SYMBOL(main);
-        INIT_SYMBOL(plain);
+iseq_type_id(enum iseq_type type)
+{
+    DECL_ID(top);
+    DECL_ID(method);
+    DECL_ID(block);
+    DECL_ID(class);
+    DECL_ID(rescue);
+    DECL_ID(ensure);
+    DECL_ID(eval);
+    DECL_ID(main);
+    DECL_ID(plain);
+
+    if (id_top == 0) {
+        INIT_ID(top);
+        INIT_ID(method);
+        INIT_ID(block);
+        INIT_ID(class);
+        INIT_ID(rescue);
+        INIT_ID(ensure);
+        INIT_ID(eval);
+        INIT_ID(main);
+        INIT_ID(plain);
     }
 
     switch (type) {
-      case ISEQ_TYPE_TOP:    return sym_top;
-      case ISEQ_TYPE_METHOD: return sym_method;
-      case ISEQ_TYPE_BLOCK:  return sym_block;
-      case ISEQ_TYPE_CLASS:  return sym_class;
-      case ISEQ_TYPE_RESCUE: return sym_rescue;
-      case ISEQ_TYPE_ENSURE: return sym_ensure;
-      case ISEQ_TYPE_EVAL:   return sym_eval;
-      case ISEQ_TYPE_MAIN:   return sym_main;
-      case ISEQ_TYPE_PLAIN:  return sym_plain;
+      case ISEQ_TYPE_TOP:    return id_top;
+      case ISEQ_TYPE_METHOD: return id_method;
+      case ISEQ_TYPE_BLOCK:  return id_block;
+      case ISEQ_TYPE_CLASS:  return id_class;
+      case ISEQ_TYPE_RESCUE: return id_rescue;
+      case ISEQ_TYPE_ENSURE: return id_ensure;
+      case ISEQ_TYPE_EVAL:   return id_eval;
+      case ISEQ_TYPE_MAIN:   return id_main;
+      case ISEQ_TYPE_PLAIN:  return id_plain;
     };
 
     rb_bug("unsupported iseq type: %d", (int)type);
@@ -2792,7 +2792,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/iseq.c#L2792
     }
 
     /* type */
-    type = iseq_type_sym(iseq_body->type);
+    type = iseq_type_id(iseq_body->type);
 
     /* locals */
     for (i=0; i<iseq_body->local_table_size; i++) {
-- 
cgit v1.2.1


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