ruby-dev

なかだです。

At Tue, 21 Aug 2001 22:13:34 +0900,
Tanaka Akira <akr@m17n.org> wrote:
> もはやあっちは inspect とはほとんど関係ない話なので、こっちはこっちで
> やればいいとおもいます。ruby-dev:14437 の案はいいと思います。ただ、API
> なんで、作者の意向次第ですかねぇ。

　参考までに[ruby-dev:14437]と[ruby-dev:14449]の実装案。Arrayの
かわりにHashを使うようになってます。あんまりグローバルにしたく
なかったこともあって、array.cからobject.cにまるごと引っ越してま
す。たぶんこっちの方が自然に思えるのですが。


Index: object.c
===================================================================
RCS file: /cvs/ruby/src/ruby/object.c,v
retrieving revision 1.57
diff -u -2 -p -r1.57 object.c
--- object.c	2001/08/20 04:29:56	1.57
+++ object.c	2001/08/20 06:19:52
@@ -221,5 +221,155 @@ rb_obj_inspect(obj)
 }
 
+static VALUE inspect_key;
+
+struct inspect_arg {
+    VALUE (*func)();
+    VALUE arg1, arg2;
+};
+
+static VALUE
+inspect_call(arg)
+    struct inspect_arg *arg;
+{
+    return (*arg->func)(arg->arg1, arg->arg2);
+}
+
+#define HASH_FOR_INSPECTION
+#ifdef HASH_FOR_INSPECTION
+#define INSPECT_NEW()		rb_hash_new3(Qfalse)
+#define INSPECT_BEGIN(tbl, id)	rb_hash_aset(inspect_tbl, id, Qtrue)
+#define INSPECT_END(tbl, id)	rb_hash_delete(tbl, id)
+#define INSPECTING_P(tbl, id)	rb_hash_aref(tbl, id)
+static inline VALUE
+rb_hash_new3(ifnone)
+    VALUE ifnone;
+{
+    VALUE hash = rb_hash_new();
+    RHASH(hash)->ifnone = ifnone;
+    return hash;
+}
+#else
+#define INSPECT_NEW()		rb_ary_new()
+#define INSPECT_BEGIN(tbl, id)	rb_ary_push(tbl, id)
+#define INSPECT_END(tbl, id)	rb_ary_pop(tbl)
+#define INSPECTING_P(tbl, id)	rb_ary_includes(tbl, id)
+#endif
+
+#define INSPECT_TABLE() rb_hash_aref(inspect_key, rb_thread_current())
+#define INSPECT_TABLE_NEW() \
+    rb_hash_aset(inspect_key, rb_thread_current(), INSPECT_NEW())
+
+static void
+inspect_key_init()
+{
+    rb_gc_register_address(&inspect_key);
+    inspect_key = rb_hash_new();
+}
+
+static VALUE
+inspect_ensure(id)
+    VALUE id;
+{
+    INSPECT_END(INSPECT_TABLE(), id);
+    return 0;
+}
+
+VALUE
+rb_protect_inspect(func, obj, arg)
+    VALUE (*func)();
+    VALUE obj, arg;
+{
+    struct inspect_arg iarg;
+    VALUE inspect_tbl;
+    VALUE id;
+
+    id = rb_obj_id(obj);
+    if (inspect_key ? NIL_P(inspect_tbl = INSPECT_TABLE())
+		    : (inspect_key_init(), Qtrue)) {
+	inspect_tbl = INSPECT_TABLE_NEW();
+    }
+    else if (INSPECTING_P(inspect_tbl, id)) {
+	return (*func)(obj, arg);
+    }
+
+    INSPECT_BEGIN(inspect_tbl, id);
+    iarg.func = func;
+    iarg.arg1 = obj;
+    iarg.arg2 = arg;
+
+    return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, id);
+}
+
+VALUE
+rb_inspecting_p(obj)
+    VALUE obj;
+{
+    VALUE inspect_tbl;
+
+    if (!inspect_key) return Qfalse;
+    inspect_tbl = INSPECT_TABLE();
+    if (NIL_P(inspect_tbl)) return Qfalse;
+    return INSPECTING_P(inspect_tbl, rb_obj_id(obj));
+}
+
+static VALUE
+rb_inspection(obj)
+    VALUE obj;
+{
+    VALUE inspect_tbl;
+    VALUE id = rb_obj_id(obj);
+
+    if (inspect_key ? NIL_P(inspect_tbl = INSPECT_TABLE())
+		    : (inspect_key_init(), Qtrue)) {
+	inspect_tbl = INSPECT_TABLE_NEW();
+    }
+    else if (INSPECTING_P(inspect_tbl, id)) {
+	return rb_yield(Qtrue);
+    }
+
+    INSPECT_BEGIN(inspect_tbl, id);
+
+    return rb_ensure(rb_yield, Qfalse, inspect_ensure, id);
+}
+
+static VALUE
+remove_inspect_tbl(inspect_tbl)
+    VALUE inspect_tbl;
+{
+    rb_hash_delete(inspect_key, rb_thread_current());
+    return 0;
+}
+
+static VALUE
+restore_inspect_tbl(inspect_tbl)
+    VALUE inspect_tbl;
+{
+    rb_hash_aset(inspect_key, rb_thread_current(), inspect_tbl);
+    return 0;
+}
+
 VALUE
+rb_new_inspection()
+{
+    if (inspect_key) {
+	VALUE inspect_tbl = rb_hash_delete(inspect_key, rb_thread_current());
+	if (!NIL_P(inspect_tbl)) {
+	    return rb_ensure(rb_yield, Qnil, restore_inspect_tbl, inspect_tbl);
+	}
+    }
+    else {
+	inspect_key_init();
+    }
+    return rb_ensure(rb_yield, Qnil, remove_inspect_tbl, Qnil);
+}
+
+static VALUE
+rb_inspect_start(obj)
+    VALUE obj;
+{
+    return rb_protect_inspect(rb_yield, obj, Qnil);
+}
+
+VALUE
 rb_obj_is_instance_of(obj, c)
     VALUE obj, c;
@@ -1171,4 +1321,7 @@ Init_Object()
     rb_define_method(rb_mKernel, "to_s", rb_any_to_s, 0);
     rb_define_method(rb_mKernel, "inspect", rb_obj_inspect, 0);
+    rb_define_method(rb_mKernel, "inspecting?", rb_inspecting_p, 0);
+    rb_define_method(rb_mKernel, "inspection", rb_inspection, 0);
+    rb_define_method(rb_mKernel, "inspect_start", rb_inspect_start, 0);
     rb_define_method(rb_mKernel, "methods", rb_obj_methods, 0);
     rb_define_method(rb_mKernel, "public_methods", rb_obj_methods, 0);
@@ -1196,4 +1349,6 @@ Init_Object()
     rb_define_global_function("String", rb_f_string, 1);
     rb_define_global_function("Array", rb_f_array, 1);
+
+    rb_define_global_function("new_inspection", rb_new_inspection, 0);
 
     rb_cNilClass = rb_define_class("NilClass", rb_cObject);


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

Thread

Prev Next

In This Thread

Prev Next

[#14185] ruby on Linux/m68k — akira yamada / やまだあきら <akira@...>

[#14195] exception at IO.popen failure — nobu.nakada@...

[#14196] fork() on MacOS — nobu.nakada@...

[#14206] undef_method :method_missing — Kenichi Komiya <kom@...1.accsnet.ne.jp>

[#14229] [BUG] segv on [str].pack("p") — Koji Arai <JCA02266@...>

[#14300] 名前空間を調べる効果的な方法はありますか？ — 西 啓一朗 <receiver@...>

[#14327] Re: [ruby-cvs] ruby/ext/socket: * string.c (rb_str_lstrip_bang): new method. — "U.Nakamura" <usa@...>

[#14338] setup.rb (Re: Common GUI framework) — Minero Aoki <aamine@...>

[#14382] [BUG] segv on regex matching with long string — TAKAHASHI Masayoshi <maki@...>

[#14390] [Patch] pp.rb and debug.rb — "NAKAMURA, Hiroshi" <nakahiro@...>

[#14406] typo in ruby 1.7 — Koji Arai <JCA02266@...>

[#14413] 1.7.1 2001-08-06: if true && /match/ — WATANABE Tetsuya <tetsu@...>

[#14430] Re: [ruby-cvs] ruby: * object.c (rb_obj_inspect): merge from 1.7: remove useless space. — Kazuhiro NISHIYAMA <zn@...>

[#14436] 1.7.1 2001-08-06: [BUG] unknown node type 0 — akira yamada / やまだあきら <akira@...>

[#14441] "foo".lstrip! should return `nil'. — Koji Arai <JCA02266@...>

[#14445] string.c rb_str_cmp() — TOYOFUKU Chikanobu <toyofuku@...>

[#14464] Ruby/Bsearch — akira yamada / やまだあきら <akira@...>

[#14465] Ruby/Bsearch — akira yamada / やまだあきら <akira@...>

[#14480] avoid compile warning of tcltklib with VC5 — "U.Nakamura" <usa@...>

[#14505] BUG: ruby 1.6.4 cannot use threads on Sparc (segv) — akira yamada / やまだあきら <akira@...>

[#14516] ext/digest/sha2/extconf.rb and try_run — WATANABE Hirofumi <eban@...>

[#14530] restore terminal mode even if readline interrupted. — Koji Arai <JCA02266@...>

[#14547] setuid/setgid — nobu.nakada@...

[#14552] read in IO#eof? — nobu.nakada@...

[#14560] — nobu.nakada@...

[#14565] (mswin32) dln_strerror() returns empty message — Tietew <tietew@...>

[#14572] noisy warnings of resolv.rb — Koji Arai <JCA02266@...>

[#14573] [PATCH] ruby-mode.el — Kenichi Komiya <kom@...1.accsnet.ne.jp>

[#14575] infinite loop on Dir.glob("*/**/*") — nobu.nakada@...

[#14576] glob_helper: merge from 1.7 — nobu.nakada@...

[#14577] option nodynamic — Daisuke Aoki <dai@...>

[#14584] Array#merge, Array#squeeze — "Akinori MUSHA" <knu@...>

[#14590] rb_load — OJ <oj@...7.com>

[#14595] SEGV at `$0 = "long long string"' — nobu.nakada@...

[#14601] $stdout への代入 ( 再考) — Koji Arai <JCA02266@...>

[#14603] patch for GNU/Hurd — akira yamada / やまだあきら <akira@...>

[ruby-dev:14563] Re: marshal API (was Re: [Patch] pp.rb and debug.rb)

Thread

In This Thread

[#14300] 名前空間を調べる効果的な方法はありますか？ — 西啓一朗 <receiver@...>

[#14445] string.c rb_str_cmp() — TOYOFUKU　Chikanobu <toyofuku@...>