summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 21:18:04 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-15 21:18:04 +0000
commit6a54d4b6fe2cc397716080a01394f75c6b6cfb4a (patch)
treed43104fcb61ac3e5710e317f5ea604a7bbcd582f
parentdad5135d269217d1cfca35cd16d51c93e3565423 (diff)
* vm_eval.c (rb_catch_obj, rb_catch, rb_f_catch): No longer use the obsolete function rb_iterate.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_eval.c56
2 files changed, 29 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fe42f3928..c7091e002a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 16 06:17:33 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * vm_eval.c (rb_catch_obj, rb_catch, rb_f_catch): No longer use the
+ obsolete function rb_iterate.
+
Tue Sep 15 21:48:12 2009 Tanaka Akira <akr@fsij.org>
* configure.in (--enable-frame-address): removed.
diff --git a/vm_eval.c b/vm_eval.c
index 97466a0cd2..c27c2a3b0e 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1264,6 +1264,10 @@ rb_throw(const char *tag, VALUE val)
rb_throw_obj(ID2SYM(rb_intern(tag)), val);
}
+static VALUE
+catch_i(VALUE tag, VALUE data) {
+ return rb_yield_0(1, &tag);
+}
/*
* call-seq:
* catch([arg]) {|tag| block } => obj
@@ -1305,10 +1309,6 @@ static VALUE
rb_f_catch(int argc, VALUE *argv)
{
VALUE tag;
- int state;
- volatile VALUE val = Qnil; /* OK */
- rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *saved_cfp = th->cfp;
if (argc == 0) {
tag = rb_obj_alloc(rb_cObject);
@@ -1316,12 +1316,31 @@ rb_f_catch(int argc, VALUE *argv)
else {
rb_scan_args(argc, argv, "01", &tag);
}
+ return rb_catch_obj(tag, catch_i, 0);
+}
+
+VALUE
+rb_catch(const char *tag, VALUE (*func)(), VALUE data)
+{
+ VALUE vtag = tag ? ID2SYM(rb_intern(tag)) : rb_obj_alloc(rb_cObject);
+ return rb_catch_obj(vtag, func, data);
+}
+
+VALUE
+rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
+{
+ int state;
+ volatile VALUE val = Qnil; /* OK */
+ rb_thread_t *th = GET_THREAD();
+ rb_control_frame_t *saved_cfp = th->cfp;
+
PUSH_TAG();
th->tag->tag = tag;
if ((state = EXEC_TAG()) == 0) {
- val = rb_yield_0(1, &tag);
+ /* call with argc=1, argv = [tag], block = Qnil to insure compatibility */
+ val = (*func)(tag, data, 1, &tag, Qnil);
}
else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) {
th->cfp = saved_cfp;
@@ -1336,33 +1355,6 @@ rb_f_catch(int argc, VALUE *argv)
return val;
}
-static VALUE
-catch_null_i(VALUE dmy)
-{
- return rb_funcall(Qnil, rb_intern("catch"), 0, 0);
-}
-
-static VALUE
-catch_i(VALUE tag)
-{
- return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
-}
-
-VALUE
-rb_catch(const char *tag, VALUE (*func)(), VALUE data)
-{
- if (!tag) {
- return rb_iterate(catch_null_i, 0, func, data);
- }
- return rb_iterate(catch_i, ID2SYM(rb_intern(tag)), func, data);
-}
-
-VALUE
-rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
-{
- return rb_iterate((VALUE (*)_((VALUE)))catch_i, tag, func, data);
-}
-
/*
* call-seq:
* caller(start=1) => array