Encapsulate RCLASS_ATTACHED_OBJECT

Right now the attached object is stored as an instance variable
and all the call sites that either get or set it have to know how it's
stored.

It's preferable to hide this implementation detail behind accessors
so that it is easier to change how it's stored.

1 files changed, 3 insertions, 5 deletions

diff --git a/proc.c b/proc.c
index 3d26fa9623..6b6ed73832 100644
--- a/proc.c
+++ b/proc.c
@@ -56,8 +56,6 @@ static int method_arity(VALUE);
 static int method_min_max_arity(VALUE, int *max);
 static VALUE proc_binding(VALUE self);
 
-#define attached id__attached__
-
 /* Proc */
 
 #define IS_METHOD_PROC_IFUNC(ifunc) ((ifunc)->func == bmcall)
@@ -1946,7 +1944,7 @@ rb_method_name_error(VALUE klass, VALUE str)
     VALUE s = Qundef;
 
     if (FL_TEST(c, FL_SINGLETON)) {
-        VALUE obj = rb_ivar_get(klass, attached);
+        VALUE obj = RCLASS_ATTACHED_OBJECT(klass);
 
         switch (BUILTIN_TYPE(obj)) {
           case T_MODULE:
@@ -3116,7 +3114,7 @@ method_inspect(VALUE method)
         rb_str_buf_append(str, rb_inspect(defined_class));
     }
     else if (FL_TEST(mklass, FL_SINGLETON)) {
-        VALUE v = rb_ivar_get(mklass, attached);
+        VALUE v = RCLASS_ATTACHED_OBJECT(mklass);
 
         if (UNDEF_P(data->recv)) {
             rb_str_buf_append(str, rb_inspect(mklass));
@@ -3136,7 +3134,7 @@ method_inspect(VALUE method)
     else {
         mklass = data->klass;
         if (FL_TEST(mklass, FL_SINGLETON)) {
-            VALUE v = rb_ivar_get(mklass, attached);
+            VALUE v = RCLASS_ATTACHED_OBJECT(mklass);
             if (!(RB_TYPE_P(v, T_CLASS) || RB_TYPE_P(v, T_MODULE))) {
                 do {
                    mklass = RCLASS_SUPER(mklass);