ruby-core

Hi,

2009/11/17 Shugo Maeda <shugo@ruby-lang.org>:
> I guess we have four options now:
>
> (1) As you suggested, revert to the behavior of Ruby 1.8, and add a
> =A0 =A0new method (or flag) to enable the new behavior.

My proposal is as follows:

(1) Revert instance_eval, class_eval, and module_eval back to the
behavior of 1.8.
(2) But do not revert instance_exec, class_exec, and module_exec.

I have attached a patch.
My patch also reverts the behavior of class variables, but it may be
unnecessary.

--=20
Shugo Maeda

Attachments (1)

class_eval_1119.diff (7.41 KB, text/x-diff)

diff --git a/compile.c b/compile.c
index 5581ea8..4f6ce21 100644
--- a/compile.c
+++ b/compile.c
@@ -2549,7 +2549,8 @@ compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
     }
     else {
 	/* class at cbase Foo */
-	ADD_INSN1(ret, nd_line(cpath), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
+		  INT2FIX(VM_SPECIAL_OBJECT_CONST_CBASE));
 	return Qtrue;
     }
 }
@@ -3710,7 +3711,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 
 	if (node->nd_vid) {
-	    ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	    ADD_INSN1(ret, nd_line(node), putspecialobject,
+		      INT2FIX(VM_SPECIAL_OBJECT_CONST_CBASE));
 	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
 	}
 	else {
diff --git a/eval.c b/eval.c
index 9ac6388..c5a72dc 100644
--- a/eval.c
+++ b/eval.c
@@ -274,7 +274,8 @@ rb_mod_nesting(void)
 
     while (cref && cref->nd_next) {
 	VALUE klass = cref->nd_clss;
-	if (!NIL_P(klass)) {
+	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
+	    !NIL_P(klass)) {
 	    rb_ary_push(ary, klass);
 	}
 	cref = cref->nd_next;
diff --git a/insns.def b/insns.def
index 4952297..932dbcc 100644
--- a/insns.def
+++ b/insns.def
@@ -343,6 +343,9 @@ putspecialobject
       case VM_SPECIAL_OBJECT_CBASE:
 	val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
 	break;
+      case VM_SPECIAL_OBJECT_CONST_CBASE:
+	val = vm_get_const_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
+	break;
       default:
 	rb_bug("putspecialobject insn: unknown value_type");
     }
@@ -944,7 +947,7 @@ defineclass
 	rb_bug("unknown defineclass type: %d", (int)define_type);
     }
 
-    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
+    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
 
     /* enter scope */
     vm_push_frame(th, class_iseq,
diff --git a/node.h b/node.h
index c0fb774..4eb3ded 100644
--- a/node.h
+++ b/node.h
@@ -262,6 +262,7 @@ typedef struct RNode {
 
 /* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */
 #define NODE_FL_NEWLINE (((VALUE)1)<<7)
+#define NODE_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
 
 #define NODE_TYPESHIFT 8
 #define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
diff --git a/vm_core.h b/vm_core.h
index 3d0f239..d275148 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -524,8 +524,9 @@ typedef struct {
 #define VM_CALL_SUPER_BIT          (0x01 << 7)
 #define VM_CALL_OPT_SEND_BIT       (0x01 << 8)
 
-#define VM_SPECIAL_OBJECT_VMCORE   0x01
-#define VM_SPECIAL_OBJECT_CBASE    0x02
+#define VM_SPECIAL_OBJECT_VMCORE       0x01
+#define VM_SPECIAL_OBJECT_CBASE        0x02
+#define VM_SPECIAL_OBJECT_CONST_CBASE  0x03
 
 #define VM_FRAME_MAGIC_METHOD 0x11
 #define VM_FRAME_MAGIC_BLOCK  0x21
diff --git a/vm_eval.c b/vm_eval.c
index d989353..adca839 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -17,7 +17,7 @@ static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *a
 static inline VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv);
 static inline VALUE vm_backtrace(rb_thread_t *th, int lev);
 static int vm_backtrace_each(rb_thread_t *th, int lev, rb_backtrace_iter_func *iter, void *arg);
-static NODE *vm_cref_push(rb_thread_t *th, VALUE klass, int noex);
+static NODE *vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr);
 static VALUE vm_exec(rb_thread_t *th);
 static void vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref);
 static int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary);
@@ -1142,17 +1142,21 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
 /* block eval under the class/module context */
 
 static VALUE
-yield_under(VALUE under, VALUE self, VALUE values)
+yield_under(VALUE under, VALUE self, VALUE values, int is_eval)
 {
     rb_thread_t *th = GET_THREAD();
     rb_block_t block, *blockptr;
-    NODE *cref = vm_cref_push(th, under, NOEX_PUBLIC);
+    NODE *cref;
 
     if ((blockptr = GC_GUARDED_PTR_REF(th->cfp->lfp[0])) != 0) {
 	block = *blockptr;
 	block.self = self;
 	th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
     }
+    cref = vm_cref_push(th, under, NOEX_PUBLIC, &block);
+    if (is_eval) {
+	cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
+    }
 
     if (values == Qundef) {
 	return vm_yield_with_cref(th, 0, 0, cref);
@@ -1166,7 +1170,7 @@ yield_under(VALUE under, VALUE self, VALUE values)
 static VALUE
 eval_under(VALUE under, VALUE self, VALUE src, const char *file, int line)
 {
-    NODE *cref = vm_cref_push(GET_THREAD(), under, NOEX_PUBLIC);
+    NODE *cref = vm_cref_push(GET_THREAD(), under, NOEX_PUBLIC, NULL);
 
     if (rb_safe_level() >= 4) {
 	StringValue(src);
@@ -1185,7 +1189,7 @@ specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
 	}
-	return yield_under(klass, self, Qundef);
+	return yield_under(klass, self, Qundef, TRUE);
     }
     else {
 	const char *file = "(eval)";
@@ -1283,7 +1287,7 @@ rb_obj_instance_exec(int argc, VALUE *argv, VALUE self)
     else {
 	klass = rb_singleton_class(self);
     }
-    return yield_under(klass, self, rb_ary_new4(argc, argv));
+    return yield_under(klass, self, rb_ary_new4(argc, argv), FALSE);
 }
 
 /*
@@ -1339,7 +1343,7 @@ rb_mod_module_eval(int argc, VALUE *argv, VALUE mod)
 VALUE
 rb_mod_module_exec(int argc, VALUE *argv, VALUE mod)
 {
-    return yield_under(mod, mod, rb_ary_new4(argc, argv));
+    return yield_under(mod, mod, rb_ary_new4(argc, argv), FALSE);
 }
 
 /*
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index a05574f..be9ff49 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1066,14 +1066,17 @@ vm_get_cref(const rb_iseq_t *iseq, const VALUE *lfp, const VALUE *dfp)
 }
 
 static NODE *
-vm_cref_push(rb_thread_t *th, VALUE klass, int noex)
+vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr)
 {
     rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp);
     NODE *cref = NEW_BLOCK(klass);
     cref->nd_file = 0;
     cref->nd_visi = noex;
 
-    if (cfp) {
+    if (blockptr) {
+	cref->nd_next = vm_get_cref(blockptr->iseq, blockptr->lfp, blockptr->dfp);
+    }
+    else if (cfp) {
 	cref->nd_next = vm_get_cref(cfp->iseq, cfp->lfp, cfp->dfp);
     }
 
@@ -1096,6 +1099,23 @@ vm_get_cbase(const rb_iseq_t *iseq, const VALUE *lfp, const VALUE *dfp)
     return klass;
 }
 
+static inline VALUE
+vm_get_const_cbase(const rb_iseq_t *iseq, const VALUE *lfp, const VALUE *dfp)
+{
+    NODE *cref = vm_get_cref(iseq, lfp, dfp);
+    VALUE klass = Qundef;
+
+    while (cref) {
+	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
+	    (klass = cref->nd_clss) != 0) {
+	    break;
+	}
+	cref = cref->nd_next;
+    }
+
+    return klass;
+}
+
 static inline void
 vm_check_if_namespace(VALUE klass)
 {
@@ -1122,7 +1142,8 @@ vm_get_ev_const(rb_thread_t *th, const rb_iseq_t *iseq,
 	VALUE klass = orig_klass;
 
 	while (cref && cref->nd_next) {
-	    klass = cref->nd_clss;
+	    if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL))
+		klass = cref->nd_clss;
 	    cref = cref->nd_next;
 
 	    if (!NIL_P(klass)) {
@@ -1178,7 +1199,8 @@ vm_get_cvar_base(NODE *cref)
     VALUE klass;
 
     while (cref && cref->nd_next &&
-	   (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
+	   (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON) ||
+	    (cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL))) {
 	cref = cref->nd_next;
 
 	if (!cref->nd_next) {

Thread

Prev Next

In This Thread

Prev Next

[#26463] New Features for the Array Module — Daniel Cohen <danielc2017@...>

[#26467] ARGF.binmode limitation — Vladimir Sizikov <vsizikov@...>

[#26470] [Feature #2321] [PATCH] Array Module sum and mean features — Daniel Cohen <redmine@...>

[#26473] [Feature #2322] [PATCH] Add standard deviation function to Math Module — Daniel Cohen <redmine@...>

[#26474] Building with gcov — Aaron Patterson <aaron@...>

[#26488] Add Standard Deviation Function to Math Module — Daniel Cohen <danielc2017@...>

[#26492] HashWithIndifferentAccess to core — Urabe Shyouhei <shyouhei@...>

[#26497] [Bug #2326] 1.8.7 Segmentation fault — Johan Holmberg <redmine@...>

[#26509] pathname--is this a bug? — Roger Pack <rogerdpack@...>

[#26512] why RUBY_INIT_STACK in main? — Suraj Kurapati <sunaku@...>

[#26523] [Bug #2330] Non systematic segmentation fault with autoload rubyspec — Marc-Andre Lafortune <redmine@...>

[#26525] [Bug #2332] Ruby doesn't run properly from unicode folder on windows — Vit Ondruch <redmine@...>

[#26526] [Bug #2333] __FILE__ macro should have unicode encoding — Vit Ondruch <redmine@...>

[#26540] [Bug #2336] pathname compare fails in windows — Roger Pack <redmine@...>

[#26544] [Bug #2337] "for object in collection" syntax not thread-safe — John-Michael fischer <redmine@...>

[#26554] [Bug #2339] DRb leaves connections half-open — Pierre-Alexandre Meyer <redmine@...>

[#26560] [Feature #2340] Removing YAML/Syck — Yui NARUSE <redmine@...>

[#26563] [Bug #2343] Timeout.timeout doesn't raise Timeout::Error by default — Hongli Lai <redmine@...>

[#26608] code review please — Aaron Patterson <aaron@...>

[#26616] getters and setters for vmode — Roger Pack <rogerdpack@...>

[#26618] [Bug #2345] RDoc improvement for Test::Unit — Andrew Grimm <redmine@...>

[#26623] Re: [ruby-cvs:32896] Ruby:r25678 (trunk): * ext/dl/cptr.c (rb_dlptr_s_malloc, rb_dlptr_initialize): adding — Tanaka Akira <akr@...>

[#26628] [Bug #2346] Array(nil) fails after redefining NilClass.method_missing to throw NoMethodError — Romulo Ceccon <redmine@...>

[#26632] [Feature #2347] Math::INFINITY — Marc-Andre Lafortune <redmine@...>

[#26635] [Feature #2348] RBTree Should be Added to the Standard Library — James Gray <redmine@...>

[#26646] [Bug #2349] lib/bigdecimal: errors in comparisons [patch] — Marc-Andre Lafortune <redmine@...>

[#26650] [Feature #2350] Unicode specific functionality on String in 1.9 — Manfred Stienstra <redmine@...>

[#26652] [Bug #2351] system() hardlinked to /bin/sh — Marcus Franke <redmine@...>

[#26660] [ANN] RubyInstaller Release Candidate 1 - 1.8 and 1.9 releases signed! — Luis Lavena <luislavena@...>

[#26663] [Bug #2352] C:/Ruby/lib/ruby/site_ruby/1.9.1/rubygems.rb:578: [BUG] Segmentation fault ruby 1.9.1p129 (2009-05-12 revision 23412) [i386-mswin32] — Vladimir Sibirskiy <redmine@...>

[#26668] [Bug #2353] hash.c:setenv causes crashes in Solaris — Christian Höltje <redmine@...>

[#26670] [Bug #2354] Undefined BLOCKING_REGION definitions when compiling under MinGW — Luis Lavena <redmine@...>

[#26678] [Bug #2066](Assigned) Merge Latest RDoc/Ri — Yui NARUSE <redmine@...>

[#26679] [Bug #2355] Please update rubygems! — Yusuke Endoh <redmine@...>

[#26680] keys aus der combobox — hamid i. <al_caponeiran@...>

[#26681] [Bug #2357] make install fails due recent Tempfile modifications — Luis Lavena <redmine@...>

[#26693] [Bug #2358] Segmentation fault using dl/import — Luis Adolfo Hernandez Lara <redmine@...>

[#26694] [Bug #2359] test_threads.rb:test_list — Christian Höltje <redmine@...>

[#26695] [Bug #2359] test_threads.rb:test_list — Christian Höltje <redmine@...>

[#26704] Maintainer confirmation process done. — "Yugui (Yuki Sonoda)" <yugui@...>

[#26712] [Bug #2361] "undefined method in 'targetnamespace='" in wsdl/import after upgrading to Snow Leopard/1.8.7 — Bill Gathen <redmine@...>

[#26722] [Bug #2362] undefined variable has value? — Vit Ondruch <redmine@...>

[#26732] [Bug #2363] Syck needs more tests — Aaron Patterson <redmine@...>

[#26733] [Bug #2364] Float conversion of NaN in 1.8.x — Marc-Andre Lafortune <redmine@...>

[#26735] warnings on build — Roger Pack <rogerdpack@...>

[#26736] [Bug #2365] Matrix: poor handling of coercion errors [patch] — Marc-Andre Lafortune <redmine@...>

[#26744] [Bug #2370] Forked process generates spurious signal errors — Chris Schlaeger <redmine@...>

[#26745] [Bug #2371] [BUG] thread_free: locking _mutex must be NULL — Chris Schlaeger <redmine@...>

[#26752] --enabled-shared configure flags/vars — Ryan Davis <ryand-ruby@...>

[#26753] (send #2) cgi.rb cleanup — Ryan Davis <ryand-ruby@...>

[#26761] [Bug #2375] protected singleton methods can be called from other instances — Shugo Maeda <redmine@...>

[#26767] [Bug #2376] Kernel.__method__ rubyspec failures for 1.8.* — Vladimir Sizikov <redmine@...>

[#26771] [Bug #2377] update documentation for IO#eof? — Roger Pack <redmine@...>

[#26772] [Bug #2378] Regression in ParseDate.parsedate('nn-nn') — Vladimir Sizikov <redmine@...>

[#26774] Ruby constant lookup — Yehuda Katz <wycats@...>

[#26787] [Bug #2379] String#[] returns invalid values for short multibyte strings — Alexey Froloff <redmine@...>

[#26788] [Bug #2380] IO#eof? behavior different with 1.9.1p243-mingw32 than other platforms — Ian Dees <redmine@...>

[#26807] [Bug #2382] test_process.rb runs very slowly — Hongli Lai <redmine@...>

[#26808] [Bug #2382] test_process.rb runs very slowly — Hongli Lai <redmine@...>

[#26813] [Bug #2383] windows - calling FreeEnvironmentStrings on envarea invalidates memory in use — Mos Bessus <redmine@...>

[#26814] Weird rubygems behaviour on ruby 1.9.1 — Saimon Moore <saimonmoore@...>

[#26821] [Bug #2384] mkmf find_executable doesn't find batch files in doze — Roger Pack <redmine@...>

[#26837] [Bug #2389] REXML rails to format parsed SVGs created with inkscape — Alexey Froloff <redmine@...>

[#26842] latest test results in mingw — Roger Pack <rogerdpack@...>

[#26852] Internals: #to_s .vs. #to_str? — Kurt Stephens <ks@...>

[#26858] [Bug #2391] in CentOS after some times Ruby 1.9.1 get "segmentation fault" — Salvo Micciché <redmine@...>

[#26867] cref in nil.instance_eval — Shugo Maeda <shugo@...>

[#26868] [Bug #2392] "Date.valid_civil?" issue in p383 — Ozgun Koyun <redmine@...>

[#26869] Caching #to_s for immutables (and a possible future for constant-folding) — Kurt Stephens <ks@...>

[#26877] [Bug #2394] [BUG] pthread_mutex_lock: 22 revisited — Roger Pack <redmine@...>

[#26889] email from redmine — danielcavanagh@...

[#26893] Reproducible crashes on 1.9.2.preview1 and 1.9.2.preview2 — Mikel Lindsaar <raasdnil@...>

[#26894] [Bug #2396] Time.strftime returns a wrong time zone as hour offset (%z) — Chulki Lee <redmine@...>

[#26898] [Bug #2399] pthread_mutex_lock: 22 — Tim Pease <redmine@...>

[#26899] [Bug #2400] string formating in, e. g. rb_raise, is truncated differently depending on OS/build environment — Florian Frank <redmine@...>

[#26909] [Bug #2403] Segment fault when converting method to block — Jan Berdajs <redmine@...>

[#26910] [Bug #2404] [PATCH] force_encoding on frozen string in gem_prelude — Sam Ruby <redmine@...>

[#26923] [Bug #2406] Regression in RSS 2.0 creation — Petteri Räty <redmine@...>

[#26925] [Feature #2408] better error reporting in windows when you try to run a directory — Roger Pack <redmine@...>

[#26931] Re: something broke ruby floats — Ryan Davis <ryand-ruby@...>

[#26526] [Bug #2333] FILE macro should have unicode encoding — Vit Ondruch <redmine@...>

[#26767] [Bug #2376] Kernel.method rubyspec failures for 1.8.* — Vladimir Sizikov <redmine@...>