* blockinlining.c, compile.c, compile.h, error.c, eval.c,

  eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
  eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
  process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
  vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
  yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
  * yarv_*_t -> rb_*_t
  * yarv_*_struct -> rb_*_struct
  * yarv_tag -> rb_vm_tag
  * YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
  from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
  from proc.c to ruby.c.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 18 insertions, 18 deletions

diff --git a/blockinlining.c b/blockinlining.c
index 7a74f3492e..c599d57a49 100644
--- a/blockinlining.c
+++ b/blockinlining.c
@@ -17,7 +17,7 @@ VALUE yarv_new_iseqval(VALUE node, VALUE name, VALUE file,
 		       VALUE parent, VALUE type, VALUE block_opt, VALUE opt);
 
 static VALUE
-yarv_iseq_special_block(yarv_iseq_t *iseq, void *builder)
+yarv_iseq_special_block(rb_iseq_t *iseq, void *builder)
 {
 #if OPT_BLOCKINLINING
     VALUE parent = Qfalse;
@@ -110,7 +110,7 @@ new_assign(NODE * lnode, NODE * rhs)
 }
 
 static NODE *
-build_Integer_times_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
+build_Integer_times_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
 			 VALUE param_vars, VALUE local_vars)
 {
     /* Special Block for Integer#times
@@ -183,17 +183,17 @@ build_Integer_times_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
 VALUE
 yarv_invoke_Integer_times_special_block(VALUE num)
 {
-    yarv_thread_t *th = GET_THREAD();
-    yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
+    rb_thead_t *th = GET_THREAD();
+    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
 
     if (orig_block && BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
 	VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq,
 						  build_Integer_times_node);
-	yarv_iseq_t *tsiseq;
+	rb_iseq_t *tsiseq;
 	VALUE argv[2], val;
 
 	if (tsiseqval) {
-	    yarv_block_t block = *orig_block;
+	    rb_block_t block = *orig_block;
 	    GetISeqPtr(tsiseqval, tsiseq);
 	    block.iseq = tsiseq;
 	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
@@ -212,7 +212,7 @@ yarv_invoke_Integer_times_special_block(VALUE num)
 }
 
 static NODE *
-build_Range_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
+build_Range_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
 		      VALUE param_vars, VALUE local_vars, ID mid)
 {
     /* Special Block for Range#each
@@ -281,7 +281,7 @@ build_Range_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
 }
 
 static NODE *
-build_Range_each_node_LE(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
+build_Range_each_node_LE(rb_iseq_t *iseq, NODE * node, NODE * lnode,
 			 VALUE param_vars, VALUE local_vars)
 {
     return build_Range_each_node(iseq, node, lnode,
@@ -289,7 +289,7 @@ build_Range_each_node_LE(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
 }
 
 static NODE *
-build_Range_each_node_LT(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
+build_Range_each_node_LT(rb_iseq_t *iseq, NODE * node, NODE * lnode,
 			 VALUE param_vars, VALUE local_vars)
 {
     return build_Range_each_node(iseq, node, lnode,
@@ -300,19 +300,19 @@ VALUE
 yarv_invoke_Range_each_special_block(VALUE range,
 				     VALUE beg, VALUE end, int excl)
 {
-    yarv_thread_t *th = GET_THREAD();
-    yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
+    rb_thead_t *th = GET_THREAD();
+    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
 
     if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
 	void *builder =
 	    excl ? build_Range_each_node_LT : build_Range_each_node_LE;
 	VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq, builder);
-	yarv_iseq_t *tsiseq;
+	rb_iseq_t *tsiseq;
 	VALUE argv[2];
 
 	if (tsiseqval) {
 	    VALUE val;
-	    yarv_block_t block = *orig_block;
+	    rb_block_t block = *orig_block;
 	    GetISeqPtr(tsiseqval, tsiseq);
 	    block.iseq = tsiseq;
 	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
@@ -332,7 +332,7 @@ yarv_invoke_Range_each_special_block(VALUE range,
 
 
 static NODE *
-build_Array_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
+build_Array_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
 		      VALUE param_vars, VALUE local_vars)
 {
     /* Special block for Array#each
@@ -431,18 +431,18 @@ build_Array_each_node(yarv_iseq_t *iseq, NODE * node, NODE * lnode,
 VALUE
 yarv_invoke_Array_each_special_block(VALUE ary)
 {
-    yarv_thread_t *th = GET_THREAD();
-    yarv_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
+    rb_thead_t *th = GET_THREAD();
+    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
 
     if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
 	VALUE tsiseqval = yarv_iseq_special_block(orig_block->iseq,
 						  build_Array_each_node);
-	yarv_iseq_t *tsiseq;
+	rb_iseq_t *tsiseq;
 	VALUE argv[2];
 
 	if (tsiseqval) {
 	    VALUE val;
-	    yarv_block_t block = *orig_block;
+	    rb_block_t block = *orig_block;
 	    GetISeqPtr(tsiseqval, tsiseq);
 	    block.iseq = tsiseq;
 	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);