`catch' accepts one or no argument

JosephKu · Jun 26, 2012 · 960fa9b · 960fa9b
1 parent c1cc109
commit 960fa9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/spec/frozen/tags/macruby/core/kernel/catch_tags.txt b/spec/frozen/tags/macruby/core/kernel/catch_tags.txt
@@ -1,2 +1 @@
 fails:Kernel.catch yields a new, unique object when called without arguments
-fails:Kernel.catch yields an object when called without arguments
diff --git a/vm_eval.c b/vm_eval.c
@@ -682,8 +682,15 @@ rb_throw_obj(VALUE tag, VALUE val)
  */
 
 static VALUE
-rb_f_catch(VALUE rcv, SEL sel, VALUE tag)
+rb_f_catch(VALUE rcv, SEL sel, int argc, VALUE *argv)
 {
+    VALUE tag;
+    if (argc == 0) {
+	tag = rb_obj_alloc(rb_cObject);
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &tag);
+    }
     return rb_vm_catch(tag);
 }
 
@@ -751,7 +758,7 @@ rb_make_backtrace(void)
 void
 Init_vm_eval(void)
 {
-    rb_objc_define_module_function(rb_mKernel, "catch", rb_f_catch, 1);
+    rb_objc_define_module_function(rb_mKernel, "catch", rb_f_catch, -1);
     rb_objc_define_module_function(rb_mKernel, "throw", rb_f_throw, -1);
 
     rb_objc_define_module_function(rb_mKernel, "loop", rb_f_loop, 0);