[ruby-dev:14932] Re: alias $gvar

なかだです。

At Mon, 15 Oct 2001 00:32:25 +0900,
Nobuyoshi-Nakada wrote:
> 　うーん、気に入らないけど。

　気に入らないというか、aliasしただけでdefinedになってしまうの
はやっぱり言語道断のような気がして来ました。それに自前のsetter
なんかを使ってるとダメだし。


Index: variable.c
===================================================================
RCS file: /cvs/ruby/src/ruby/variable.c,v
retrieving revision 1.47
diff -u -2 -p -r1.47 variable.c
--- variable.c	2001/10/03 07:19:11	1.47
+++ variable.c	2001/10/15 13:11:59
@@ -314,4 +314,7 @@ static void  var_setter();
 static void  var_marker();
 
+static VALUE alias_getter();
+static void  alias_setter();
+
 struct global_entry*
 rb_global_entry(id)
@@ -423,4 +426,29 @@ readonly_setter(val, id, var)
 }
 
+static VALUE
+alias_getter(id, data, entry)
+    ID id;
+    void *data;
+    struct global_entry *entry;
+{
+    entry = data;
+    if (entry->getter == alias_getter)
+	entry = entry->data;
+    return (*entry->getter)(id, entry->data, entry);
+}
+
+static void
+alias_setter(val, id, data, entry)
+    VALUE val;
+    ID id;
+    void *data;
+    struct global_entry *entry;
+{
+    entry = data;
+    if (entry->setter == alias_setter)
+	entry = entry->data;
+    (*entry->setter)(val, id, entry->data, entry);
+}
+
 static int
 mark_global_entry(key, entry)
@@ -606,4 +634,5 @@ rb_f_untrace_var(argc, argv)
     return Qnil;
 }
+
 VALUE
 rb_gvar_get(entry)
@@ -685,4 +714,6 @@ rb_gvar_defined(entry)
     struct global_entry *entry;
 {
+    if (entry->getter == alias_getter)
+	entry = entry->data;
     if (entry->getter == undef_getter) return Qfalse;
     return Qtrue;
@@ -728,8 +759,10 @@ rb_alias_variable(name1, name2)
     entry2 = rb_global_entry(name2);
 
-    entry1->data   = entry2->data;
-    entry1->getter = entry2->getter;
-    entry1->setter = entry2->setter;
-    entry1->marker = entry2->marker;
+    if (entry2->getter == alias_getter)
+	entry2 = entry2->data;
+    entry1->data   = entry2;
+    entry1->getter = alias_getter;
+    entry1->setter = alias_setter;
+    entry1->marker = undef_marker;
 }
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦