e$B1J0fe(B@e$BCNG=!%6e9)Bg$G$9!%e(B
e$B;XDj$7$?%b%8%e!<%k2<$Ke(B load e$B$9$k$?$a$Ke(B subject
e$B$K<($7$?$h$&$Je(B
e$B4X?t7?$N%a%=%C%I$,e(B (e$BL>A0$NNI$70-$7$OJ]N1$H$7$Fe(B)
e$BM_$7$$$J$H;W$C$F$$$^$9!%e(B
load(file, true) e$B$Oe(B load_to(file, Module.new) e$B$HF1$8$G$9!%e(B
e$B$=$&$$$&$b$N$,$J$$$h$&$K8+$($k$N$O!$<B$Oe(B
(1) e$BE,@Z$JJ}K!$,B>$KB8:$9$ke(B
(2) Thread e$B$H$NMm$$GMn$A$ke(B or
e$B@5>o$KF0$+$J$$4m81@-$,$"$k$?$ae(B
(3) e$B2?$i$+$N%;%-%e%j%F%#%[!<%k$H$J$j$&$k$?$ae(B
(4) e$B$=$b$=$b$=$s$J$b$N$,M_$7$$$H;W$&H/A[<+BN$,$*$+$7$$e(B
(5) e$B$=$NB>!$FCJL$JM}M3$,B8:_$9$ke(B
e$B$N$$$:$l$+$^$?$OJ#?t$,@.N)$7$F$$$k$N$Ke(B
e$BC1$K;d$,5$$,IU$$$F$$$J$$$@$1$J$N$G$7$g$&$+!)e(B
e$B$A$g$C$HD4$Y$?8B$j$O8+$D$1$k$3$H$,$G$-$J$+$C$?$N$G$9$,!$e(B
e$B$=$l$bC1$KD4$YJ}$,B-$j$J$$$@$1$J$N$G$7$g$&$+!)e(B(^_^;
e$BG0$N$?$a!$%Q%C%A$rE:$($F$*$-$^$9!%e(B
e$B0z?t$,>/$75$;}$A0-$$$G$9$,!$=>Mh$H$N8_49@-0];}$He(B
e$BF1$8%3!<%I$N7+$jJV$72sHr$H$N$?$ae(B ( + e$B<jH4$-$N$?$ae(B ) e$B$Ke(B
e$B$=$&$7$F$^$9!%e(B
e$B1J0fe(B e$B=(Mxe(B
e$B!J6e9)Bge(B e$BCNG=>pJs!Ke(B
[email protected]
Index: eval.c
RCS file: /var/cvs/src/ruby/eval.c,v
retrieving revision 1.890
diff -u -r1.890 eval.c
— eval.c 23 Feb 2006 04:24:39 -0000 1.890
+++ eval.c 11 May 2006 15:56:35 -0000
@@ -6618,7 +6618,7 @@
NORETURN(static void load_failed(VALUE));
void
-rb_load(VALUE fname, int wrap)
+rb_load_to(VALUE fname, int wrap, VALUE wrapper_mod)
{
VALUE tmp;
int state;
@@ -6647,8 +6647,14 @@
ruby_wrapper = 0;
}
else {
- /* load in anonymous module as toplevel */
- ruby_wrapper = rb_module_new();
-
if (rb_obj_is_kind_of(wrapper_mod, rb_cModule)) { -
/* load in the module as toplevel */ -
ruby_wrapper = wrapper_mod; -
} -
else { -
/* load in anonymous module as toplevel */ -
ruby_wrapper = rb_module_new(); -
self = rb_obj_clone(ruby_top_self);}
rb_extend_object(self, ruby_wrapper);
PUSH_CREF(ruby_wrapper);
@@ -6712,6 +6718,12 @@
}
void
+rb_load(VALUE fname, int wrap)
+{
- rb_load_to(fname, wrap, Qnil);
+}
+void
rb_load_protect(VALUE fname, int wrap, int *state)
{
int status;
@@ -6727,6 +6739,22 @@
if (state) *state = status;
}
+void
+rb_load_protect_to(VALUE fname, int wrap, VALUE wrapper_mod, int
*state)
+{
- int status;
- PUSH_THREAD_TAG();
- if ((status = EXEC_TAG()) == 0) {
- rb_load_to(fname, wrap, wrapper_mod);
- }
- else if (status == TAG_THREAD) {
- rb_thread_start_1();
- }
- POP_THREAD_TAG();
- if (state) *state = status;
+}
/*
- call-seq:
-
load(filename, wrap=false) => true
@@ -6752,6 +6780,26 @@
return Qtrue;
}
+/*
-
- call-seq:
-
-
load_to(filename, wrapper) => true
-
-
-
- Loads and executes the Ruby
-
- program in the file filename under the specified module wrapper
-
- (See also the wrap parameter of
loadfunction).
- (See also the wrap parameter of
-
- If the filename does not
-
- resolve to an absolute path, the file is searched for in the
library
- resolve to an absolute path, the file is searched for in the
-
- directories listed in
$:.
- directories listed in
- */
+static VALUE
+rb_f_load_to(VALUE obj, VALUE fname, VALUE wrapper_mod)
+{
- rb_load_to(fname, 1, wrapper_mod);
- return Qtrue;
+}
VALUE ruby_dln_librefs;
static VALUE rb_features;
static st_table *loading_tbl;
@@ -7875,6 +7923,7 @@
rb_features = rb_ary_new();
rb_define_global_function("load", rb_f_load, -1);
- rb_define_global_function(“load_to”, rb_f_load_to, 2);
rb_define_global_function(“require”, rb_f_require, 1);
rb_define_method(rb_cModule, “autoload”, rb_mod_autoload, 2);
rb_define_method(rb_cModule, “autoload?”, rb_mod_autoload_p, 1);