summaryrefslogtreecommitdiff
path: root/yarvcore.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-26 22:51:33 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-26 22:51:33 +0000
commit8a1b1c2b41b475cc40a8013623b5b6fe5381d6da (patch)
tree7fdb3d79de934510585bc5572642eaefb8e1471e /yarvcore.h
parent3623df9bc68adf445814f2d1ec5bc81e7e0450bb (diff)
* yarvcore.h, vm.h: rename th_invoke_yield() to th_yield().
* blockinlining.c: ditto. * eval.c: ditto. * vm.c, insns.def: rename th_invoke_yield_cfunc() to th_yield_with_cfunc(). * yarvcore.h, yarvcore.c: rename theYarvVM to ruby_current_vm and yarvCurrentThread to ruby_current_thread. remove yarvVMArray. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'yarvcore.h')
-rw-r--r--yarvcore.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/yarvcore.h b/yarvcore.h
index e2885711ccc..b82896896a3 100644
--- a/yarvcore.h
+++ b/yarvcore.h
@@ -609,7 +609,7 @@ VALUE th_make_proc(rb_thread_t *th, rb_control_frame_t *cfp, rb_block_t *block);
VALUE th_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
VALUE th_backtrace(rb_thread_t *, int);
-VALUE th_invoke_yield(rb_thread_t *th, int argc, VALUE *argv);
+VALUE th_yield(rb_thread_t *th, int argc, VALUE *argv);
VALUE th_call0(rb_thread_t *th, VALUE klass, VALUE recv,
VALUE id, ID oid, int argc, const VALUE *argv,
NODE * body, int nosuper);
@@ -622,12 +622,12 @@ VALUE yarvcore_eval(VALUE self, VALUE str, VALUE file, VALUE line);
/* for thread */
#if RUBY_VM_THREAD_MODEL == 2
-extern rb_thread_t *yarvCurrentThread;
-extern rb_vm_t *theYarvVM;
+extern rb_thread_t *ruby_current_thread;
+extern rb_vm_t *ruby_current_vm;
-#define GET_VM() theYarvVM
-#define GET_THREAD() yarvCurrentThread
-#define rb_thread_set_current_raw(th) (yarvCurrentThread = th)
+#define GET_VM() ruby_current_vm
+#define GET_THREAD() ruby_current_thread
+#define rb_thread_set_current_raw(th) (ruby_current_thread = th)
#define rb_thread_set_current(th) do { \
rb_thread_set_current_raw(th); \
th->vm->running_thread = th; \