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

From 6764256dc7e768582f52aa8bee274815bc5f318c Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Wed, 17 Nov 2021 23:39:34 +0900
Subject: node/h: clean node field accessors

This change removes nd_oid, nd_rest, and nd_opt, and adds some comments
for special accessors.
---
 node.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/node.h b/node.h
index 8b09e81a8cb..84504556242 100644
--- a/node.h
+++ b/node.h
@@ -231,11 +231,6 @@ typedef struct RNode { https://github.com/ruby/ruby/blob/trunk/node.h#L231
 
 #define nd_entry u3.id
 #define nd_vid   u1.id
-#define nd_cflag u2.id
-#define nd_cval  u3.value
-
-#define nd_oid   u1.id
-#define nd_tbl   u1.tbl
 
 #define nd_var   u1.node
 #define nd_iter  u3.node
@@ -245,11 +240,6 @@ typedef struct RNode { https://github.com/ruby/ruby/blob/trunk/node.h#L240
 
 #define nd_lit   u1.value
 
-#define nd_rest  u1.id
-#define nd_opt   u1.node
-#define nd_pid   u1.id
-#define nd_plen  u2.argc
-
 #define nd_recv  u1.node
 #define nd_mid   u2.id
 #define nd_args  u3.node
@@ -263,12 +253,9 @@ typedef struct RNode { https://github.com/ruby/ruby/blob/trunk/node.h#L253
 #define nd_beg   u1.node
 #define nd_end   u2.node
 #define nd_state u3.state
-#define nd_rval  u2.value
 
 #define nd_nth   u2.argc
 
-#define nd_tag   u1.id
-
 #define nd_alias  u1.id
 #define nd_orig   u2.id
 #define nd_undef  u2.node
@@ -283,6 +270,19 @@ typedef struct RNode { https://github.com/ruby/ruby/blob/trunk/node.h#L270
 
 #define nd_fpinfo u3.fpinfo
 
+// for NODE_SCOPE
+#define nd_tbl   u1.tbl
+
+// for NODE_ARGS_AUX
+#define nd_pid   u1.id
+#define nd_plen  u2.argc
+#define nd_cflag u2.id
+
+// for ripper
+#define nd_cval  u3.value
+#define nd_rval  u2.value
+#define nd_tag   u1.id
+
 #define NEW_NODE(t,a0,a1,a2,loc) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2),loc)
 #define NEW_NODE_WITH_LOCALS(t,a1,a2,loc) node_newnode_with_locals(p, (t),(VALUE)(a1),(VALUE)(a2),loc)
 
-- 
cgit v1.2.1


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