nagachika	2012-12-19 02:04:05 +0900 (Wed, 19 Dec 2012)

  New Revision: 38452

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38452

  Log:
    * vm.c (rb_vm_jump_tag_but_local_jump): remove unnessesary 2nd
      argument.
    
    * load.c (rb_load_internal): ditto.
    
    * eval_intern.h (rb_vm_jump_tag_but_local_jump): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/eval_intern.h
    trunk/load.c
    trunk/vm.c

Index: eval_intern.h
===================================================================
--- eval_intern.h	(revision 38451)
+++ eval_intern.h	(revision 38452)
@@ -184,7 +184,7 @@ NORETURN(void rb_fiber_start(void)); https://github.com/ruby/ruby/blob/trunk/eval_intern.h#L184
 NORETURN(void rb_print_undef(VALUE, ID, int));
 NORETURN(void rb_print_undef_str(VALUE, VALUE));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
-NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE));
+NORETURN(void rb_vm_jump_tag_but_local_jump(int));
 NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
 				      VALUE obj, int call_status));
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38451)
+++ ChangeLog	(revision 38452)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Dec 19 01:51:24 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* vm.c (rb_vm_jump_tag_but_local_jump): remove unnessesary 2nd
+	  argument.
+
+	* load.c (rb_load_internal): ditto.
+
+	* eval_intern.h (rb_vm_jump_tag_but_local_jump): ditto.
+
 Tue Dec 18 18:57:58 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (rb_io_wait_writable): don't use rb_thread_wait_fd()
Index: load.c
===================================================================
--- load.c	(revision 38451)
+++ load.c	(revision 38452)
@@ -571,7 +571,7 @@ rb_load_internal(VALUE fname, int wrap) https://github.com/ruby/ruby/blob/trunk/load.c#L571
 	rb_exc_raise(GET_THREAD()->errinfo);
     }
     if (state) {
-	rb_vm_jump_tag_but_local_jump(state, Qundef);
+	rb_vm_jump_tag_but_local_jump(state);
     }
 
     if (!NIL_P(GET_THREAD()->errinfo)) {
Index: vm.c
===================================================================
--- vm.c	(revision 38451)
+++ vm.c	(revision 38452)
@@ -929,12 +929,10 @@ rb_vm_make_jump_tag_but_local_jump(int s https://github.com/ruby/ruby/blob/trunk/vm.c#L929
 }
 
 void
-rb_vm_jump_tag_but_local_jump(int state, VALUE val)
+rb_vm_jump_tag_but_local_jump(int state)
 {
-    if (val != Qnil) {
-	VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, val);
-	if (!NIL_P(exc)) rb_exc_raise(exc);
-    }
+    VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef);
+    if (!NIL_P(exc)) rb_exc_raise(exc);
     JUMP_TAG(state);
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/