ruby-dev

　ささだです。

　今 env.h を include しているソースに variable.c error.c numeric.c があ
りますが、アクセサを 2 つ用意するだけで env.h は要らなくなったので、削っ
てみたパッチを添付します（ただし、error.c で参照している ruby_in_eval だ
けは extern で参照するようにした）。どうでしょうか。

　rb_frame_pop() は、参照されたくない内部関数かと思うので、intern.h に書
くのはどうかな、とも思うのですが。

-- 
SASADA Koichi at atdot dot net

Attachments (1)

remove_env.patch (2.82 KB, text/x-diff)

Index: error.c
===================================================================
RCS file: /src/ruby/error.c,v
retrieving revision 1.116
diff -u -2 -r1.116 error.c
--- error.c	27 Jul 2005 07:27:18 -0000	1.116
+++ error.c	18 Aug 2005 14:57:01 -0000
@@ -12,5 +12,4 @@
 
 #include "ruby.h"
-#include "env.h"
 #include "st.h"
 
@@ -31,4 +30,5 @@
 
 extern const char ruby_version[], ruby_release_date[], ruby_platform[];
+extern ruby_in_eval;
 
 int ruby_nerrs;
@@ -1145,5 +1145,5 @@
     rb_raise(rb_eNotImpError,
 	     "The %s() function is unimplemented on this machine",
-	     rb_id2name(ruby_frame->callee));
+	     rb_id2name(rb_frame_callee()));
 }
 
Index: eval.c
===================================================================
RCS file: /src/ruby/eval.c,v
retrieving revision 1.819
diff -u -2 -r1.819 eval.c
--- eval.c	17 Aug 2005 14:58:35 -0000	1.819
+++ eval.c	18 Aug 2005 14:57:03 -0000
@@ -6288,4 +6288,16 @@
 }
 
+ID
+rb_frame_callee()
+{
+    return ruby_frame->callee;
+}
+
+void
+rb_frame_pop()
+{
+    ruby_frame = ruby_frame->prev;
+}
+
 static NODE*
 compile(src, file, line)
Index: numeric.c
===================================================================
RCS file: /src/ruby/numeric.c,v
retrieving revision 1.125
diff -u -2 -r1.125 numeric.c
--- numeric.c	12 Aug 2005 08:13:27 -0000	1.125
+++ numeric.c	18 Aug 2005 14:57:03 -0000
@@ -12,5 +12,4 @@
 
 #include "ruby.h"
-#include "env.h"
 #include <ctype.h>
 #include <math.h>
@@ -190,5 +189,5 @@
     VALUE x, name;
 {
-    ruby_frame = ruby_frame->prev; /* pop frame for "singleton_method_added" */
+    rb_frame_pop(); /* pop frame for "singleton_method_added" */
     /* Numerics should be values; singleton_methods should not be added to them */
     rb_raise(rb_eTypeError,
Index: variable.c
===================================================================
RCS file: /src/ruby/variable.c,v
retrieving revision 1.125
diff -u -2 -r1.125 variable.c
--- variable.c	27 Jul 2005 07:27:17 -0000	1.125
+++ variable.c	18 Aug 2005 14:57:03 -0000
@@ -14,5 +14,4 @@
 
 #include "ruby.h"
-#include "env.h"
 #include "node.h"
 #include "st.h"
@@ -1250,5 +1249,5 @@
     VALUE klass, name;
 {
-    ruby_frame = ruby_frame->prev; /* pop frame for "const_missing" */
+    rb_frame_pop(); /* pop frame for "const_missing" */
     uninitialized_constant(klass, rb_to_id(name));
     return Qnil;		/* not reached */
Index: intern.h
===================================================================
RCS file: /src/ruby/intern.h,v
retrieving revision 1.177
diff -u -2 -r1.177 intern.h
--- intern.h	14 Aug 2005 22:25:09 -0000	1.177
+++ intern.h	18 Aug 2005 14:57:04 -0000
@@ -223,4 +223,6 @@
 void rb_backtrace _((void));
 ID rb_frame_this_func _((void));
+ID rb_frame_callee _((void));
+void rb_frame_pop _((void));
 VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
 VALUE rb_mod_module_eval _((int, VALUE*, VALUE));

Thread

Prev Next

In This Thread

Prev Next