From eb93987cd4c7a483839054e6a19b46f44d9b839b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jan 2009 11:09:51 +0000
Subject: merges r21660 from trunk into ruby_1_9_1. * vm_eval.c, eval.c
 (rb_f_block_given_p): move definition of   "iterator?" and "block_given?" to
 make static. * vm.c (vm_get_ruby_level_caller_cfp): make it static. *
 eval_intern.h, vm_insnhelper.c: move decl. of  
 vm_get_ruby_level_caller_cfp()   from eval_intern.h to vm_insnhelper.c.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index dfeab0049..dce877a27 100644
--- a/eval.c
+++ b/eval.c
@@ -548,45 +548,6 @@ rb_iterator_p()
     return rb_block_given_p();
 }
 
-/*
- *  call-seq:
- *     block_given?   => true or false
- *     iterator?      => true or false
- *
- *  Returns <code>true</code> if <code>yield</code> would execute a
- *  block in the current context. The <code>iterator?</code> form
- *  is mildly deprecated.
- *
- *     def try
- *       if block_given?
- *         yield
- *       else
- *         "no block"
- *       end
- *     end
- *     try                  #=> "no block"
- *     try { "hello" }      #=> "hello"
- *     try do "hello" end   #=> "hello"
- */
-
-
-VALUE
-rb_f_block_given_p(void)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
-
-    if (cfp != 0 &&
-	(cfp->lfp[0] & 0x02) == 0 &&
-	GC_GUARDED_PTR_REF(cfp->lfp[0])) {
-	return Qtrue;
-    }
-    else {
-	return Qfalse;
-    }
-}
-
 VALUE rb_eThreadError;
 
 void
@@ -1070,9 +1031,6 @@ Init_eval(void)
     rb_define_virtual_variable("$@", errat_getter, errat_setter);
     rb_define_virtual_variable("$!", errinfo_getter, 0);
 
-    rb_define_global_function("iterator?", rb_f_block_given_p, 0);
-    rb_define_global_function("block_given?", rb_f_block_given_p, 0);
-
     rb_define_global_function("raise", rb_f_raise, -1);
     rb_define_global_function("fail", rb_f_raise, -1);
 
-- 
cgit