yugui	2008-12-17 15:15:16 +0900 (Wed, 17 Dec 2008)

  New Revision: 20811

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

  Log:
    merges r20744 from trunk into ruby_1_9_1.
    * vm_eval.c (vm_call0): NODE_ZSUPER supported.  [ruby-core:20480]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/vm_eval.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20810)
+++ ruby_1_9_1/ChangeLog	(revision 20811)
@@ -1,5 +1,7 @@
-Mon Dec 15 14:15:23 2008  Nobuyoshi Nakada  <nobu@r...>
+Mon Dec 15 14:39:37 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* vm_eval.c (vm_call0): NODE_ZSUPER supported.  [ruby-core:20480]
+
 	* vm_eval.c (vm_call_super): uses method_missing().
 
 	* vm_eval.c (method_missing): get rid of too large alloca.
Index: ruby_1_9_1/vm_eval.c
===================================================================
--- ruby_1_9_1/vm_eval.c	(revision 20810)
+++ ruby_1_9_1/vm_eval.c	(revision 20811)
@@ -35,6 +35,7 @@
 	blockptr = th->passed_block;
 	th->passed_block = 0;
     }
+  again:
     switch (nd_type(body)) {
       case RUBY_VM_METHOD_NODE:{
 	rb_control_frame_t *reg_cfp;
@@ -99,6 +100,16 @@
 			      recv, klass, argc, (VALUE *)argv, blockptr);
 	break;
       }
+      case NODE_ZSUPER:{
+	klass = RCLASS_SUPER(klass);
+	if (!klass || !(body = rb_method_node(klass, id))) {
+	    return method_missing(recv, id, argc, argv, 0);
+	}
+	RUBY_VM_CHECK_INTS();
+	nosuper = CALL_SUPER;
+	body = body->nd_body;
+	goto again;
+      }
       default:
 	rb_bug("unsupported: vm_call0(%s)", ruby_node_name(nd_type(body)));
     }

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