* this commit is a result of refactoring. only renaming functions,

  moving definitions place, add/remove prototypes, deleting
  unused variables and removing yarv.h.
  This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
  * debug.[ch]: debug_*() -> ruby_debug_*()
  * iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
  * iseq.c: node_name() -> ruby_node_name()
  * vm.c: yarv_check_redefinition_opt_method() ->
    rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
  local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
  mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
  rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
  yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().



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

1 files changed, 6 insertions, 7 deletions

diff --git a/eval.c b/eval.c
index 1dfacc0dac..dca33debb0 100644
--- a/eval.c
+++ b/eval.c
@@ -1645,7 +1645,7 @@ rb_call(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope)
 	//static int level;
 	//int i;
 	//for(i=0; i<level; i++){printf("  ");}
-	//printf("invoke %s (%s)\n", rb_id2name(mid), node_name(nd_type(body)));
+	//printf("invoke %s (%s)\n", rb_id2name(mid), ruby_node_name(nd_type(body)));
 	//level++;
 	//printf("%s with %d args\n", rb_id2name(mid), argc);
 	*/
@@ -1655,7 +1655,7 @@ rb_call(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope)
 	/*
 	//level--;
 	//for(i=0; i<level; i++){printf("  ");}
-	//printf("done %s (%s)\n", rb_id2name(mid), node_name(nd_type(body)));
+	//printf("done %s (%s)\n", rb_id2name(mid), ruby_node_name(nd_type(body)));
 	*/
 	return val;
     }
@@ -1911,9 +1911,6 @@ rb_sourceline(void)
     return th_get_sourceline(th->cfp);
 }
 
-VALUE th_set_eval_stack(rb_thead_t *, VALUE iseq);
-VALUE th_eval_body(rb_thead_t *);
-
 static VALUE
 eval(VALUE self, VALUE src, VALUE scope, char *file, int line)
 {
@@ -1964,7 +1961,8 @@ eval(VALUE self, VALUE src, VALUE scope, char *file, int line)
 	th_set_eval_stack(th, iseqval);
 	th->base_block = 0;
 	if (0) {		/* for debug */
-	    printf("%s\n", RSTRING_PTR(iseq_disasm(iseqval)));
+	    extern VALUE ruby_iseq_disasm(VALUE);
+	    printf("%s\n", RSTRING_PTR(ruby_iseq_disasm(iseqval)));
 	}
 
 	/* save new env */
@@ -2179,9 +2177,10 @@ specific_eval(int argc, VALUE *argv, VALUE klass, VALUE self)
 		SafeStringValue(argv[0]);
 	    }
 	    if (argc > 3) {
+		char *name = rb_id2name(rb_frame_callee());
 		rb_raise(rb_eArgError,
 			 "wrong number of arguments: %s(src) or %s{..}",
-			 rb_frame_callee(), rb_frame_callee());
+			 name, name);
 	    }
 	    if (argc > 2)
 		line = NUM2INT(argv[2]);