[前][次][番号順一覧][スレッド一覧]

ruby-changes:25200

From: ko1 <ko1@a...>
Date: Thu, 18 Oct 2012 14:22:24 +0900 (JST)
Subject: [ruby-changes:25200] ko1:r37252 (trunk): * class.c (rb_define_frameless_method): rename from

ko1	2012-10-18 14:22:13 +0900 (Thu, 18 Oct 2012)

  New Revision: 37252

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

  Log:
    * class.c (rb_define_frameless_method): rename from
      rb_define_method_fast(). Defined method with this C API
      does not make a method frame. It is bit lightweight than
      ordinal C functions. Now only 0 or 1 argc are permitted.
    * method.h (VM_METHOD_TYPE_CFUNC_FRAMELESS): rename macro name
      from VM_METHOD_TYPE_CFUNC_FAST.
    * vm_insnhelper.c, vm_method.c: rename related functions.
    * proc.c (rb_method_entry_arity): catch up above changes.

  Modified files:
    trunk/ChangeLog
    trunk/class.c
    trunk/method.h
    trunk/proc.c
    trunk/vm_insnhelper.c
    trunk/vm_method.c

Index: method.h
===================================================================
--- method.h	(revision 37251)
+++ method.h	(revision 37252)
@@ -42,7 +42,7 @@
     VM_METHOD_TYPE_NOTIMPLEMENTED,
     VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
     VM_METHOD_TYPE_MISSING,   /* wrapper for method_missing(id) */
-    VM_METHOD_TYPE_CFUNC_FAST
+    VM_METHOD_TYPE_CFUNC_FRAMELESS
 } rb_method_type_t;
 
 typedef struct rb_method_cfunc_struct {
@@ -89,7 +89,7 @@
 #define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
 
 void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
-void rb_add_method_cfunc_fast(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
+void rb_add_method_cfunc_frameless(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
 rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex);
 rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr);
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37251)
+++ ChangeLog	(revision 37252)
@@ -1,3 +1,17 @@
+Thu Oct 18 14:11:08 2012  Koichi Sasada  <ko1@a...>
+
+	* class.c (rb_define_frameless_method): rename from
+	  rb_define_method_fast(). Defined method with this C API
+	  does not make a method frame. It is bit lightweight than
+	  ordinal C functions. Now only 0 or 1 argc are permitted.
+
+	* method.h (VM_METHOD_TYPE_CFUNC_FRAMELESS): rename macro name
+	  from VM_METHOD_TYPE_CFUNC_FAST.
+
+	* vm_insnhelper.c, vm_method.c: rename related functions.
+
+	* proc.c (rb_method_entry_arity): catch up above changes.
+
 Thu Oct 18 10:30:34 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (assignable_gen): fail if yyerror occurred.  fix a bug in
Index: proc.c
===================================================================
--- proc.c	(revision 37251)
+++ proc.c	(revision 37252)
@@ -1656,7 +1656,7 @@
     const rb_method_definition_t *def = me->def;
     if (!def) return 0;
     switch (def->type) {
-      case VM_METHOD_TYPE_CFUNC_FAST:
+      case VM_METHOD_TYPE_CFUNC_FRAMELESS:
       case VM_METHOD_TYPE_CFUNC:
 	if (def->body.cfunc.argc < 0)
 	    return -1;
Index: vm_method.c
===================================================================
--- vm_method.c	(revision 37251)
+++ vm_method.c	(revision 37252)
@@ -96,13 +96,13 @@
 }
 
 void
-rb_add_method_cfunc_fast(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex)
+rb_add_method_cfunc_frameless(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex)
 {
     if (func != rb_f_notimplement) {
 	rb_method_cfunc_t opt;
 	opt.func = func;
 	opt.argc = argc;
-	rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC_FAST, &opt, noex);
+	rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC_FRAMELESS, &opt, noex);
     }
     else {
 	rb_define_notimplement_method_id(klass, mid, noex);
@@ -318,7 +318,7 @@
 	def->body.iseq = (rb_iseq_t *)opts;
 	break;
       case VM_METHOD_TYPE_CFUNC:
-      case VM_METHOD_TYPE_CFUNC_FAST:
+      case VM_METHOD_TYPE_CFUNC_FRAMELESS:
 	def->body.cfunc = *(rb_method_cfunc_t *)opts;
 	break;
       case VM_METHOD_TYPE_ATTRSET:
Index: class.c
===================================================================
--- class.c	(revision 37251)
+++ class.c	(revision 37252)
@@ -1254,9 +1254,9 @@
 }
 
 void
-rb_define_method_fast(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_frameless_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc_fast(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
+    rb_add_method_cfunc_frameless(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
 }
 
 void
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 37251)
+++ vm_insnhelper.c	(revision 37252)
@@ -1506,14 +1506,14 @@
 }
 
 static VALUE
-vm_call_cfunc_fast_unary(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
+vm_call_cfunc_frameless_unary(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
 {
     cfp->sp -= 1;
     return (*ci->me->def->body.cfunc.func)(ci->recv);
 }
 
 static VALUE
-vm_call_cfunc_fast_binary(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
+vm_call_cfunc_frameless_binary(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
 {
     VALUE obj = *cfp->sp;
     cfp->sp -= 2;
@@ -1613,16 +1613,16 @@
 		}
 		break;
 	      }
-	      case VM_METHOD_TYPE_CFUNC_FAST:
+	      case VM_METHOD_TYPE_CFUNC_FRAMELESS:
 		switch (ci->me->def->body.cfunc.argc) {
 		  case 0:
 		    rb_check_arity(ci->argc, 0, 0);
-		    CI_SET_FASTPATH(ci, vm_call_cfunc_fast_unary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
-		    return vm_call_cfunc_fast_unary(th, cfp, ci);
+		    CI_SET_FASTPATH(ci, vm_call_cfunc_frameless_unary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
+		    return vm_call_cfunc_frameless_unary(th, cfp, ci);
 		  case 1:
 		    rb_check_arity(ci->argc, 0, 1);
-		    CI_SET_FASTPATH(ci, vm_call_cfunc_fast_binary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
-		    return vm_call_cfunc_fast_binary(th, cfp, ci);
+		    CI_SET_FASTPATH(ci, vm_call_cfunc_frameless_binary, enable_fastpath && !(ci->flag & VM_CALL_ARGS_SPLAT));
+		    return vm_call_cfunc_frameless_binary(th, cfp, ci);
 		  default:
 		    rb_bug("vm_call_method: unsupported cfunc_fast argc (%d)", ci->me->def->body.cfunc.argc);
 		}

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

[前][次][番号順一覧][スレッド一覧]