* eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,

	  vm.c: need to add const to prototypes, of course.



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

6 files changed, 50 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index f27753e39e..6376e196f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 22 15:20:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
+	  vm.c: need to add const to prototypes, of course.
+
 Thu May 22 13:24:43 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
diff --git a/eval_intern.h b/eval_intern.h
index d4949822d7..0b4592bfa1 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -222,12 +222,12 @@ NORETURN(void rb_fiber_start(void));
 
 NORETURN(void rb_raise_jump(VALUE));
 NORETURN(void rb_print_undef(VALUE, ID, int));
-NORETURN(void vm_localjump_error(const char *, VALUE, int));
-NORETURN(void vm_jump_tag_but_local_jump(int, VALUE));
+NORETURN(void vm_localjump_error(const char * const, const VALUE, const int));
+NORETURN(void vm_jump_tag_but_local_jump(const int, const VALUE));
 
-NODE *vm_cref_push(rb_thread_t *th, VALUE, int);
+NODE *vm_cref_push(rb_thread_t * const th, const VALUE, const int);
 NODE *vm_set_special_cref(rb_thread_t *th, VALUE *lfp, NODE * cref_stack);
-VALUE vm_make_jump_tag_but_local_jump(int state, VALUE val);
+VALUE vm_make_jump_tag_but_local_jump(const int state, VALUE val);
 
 NODE *ruby_cref(void);
 
@@ -244,10 +244,12 @@ vm_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp)
 }
 
 VALUE rb_obj_is_proc(VALUE);
-void rb_vm_check_redefinition_opt_method(NODE *node);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, rb_block_t *blockptr, VALUE filename);
+void rb_vm_check_redefinition_opt_method(NODE * const node);
+VALUE rb_vm_call_cfunc(const VALUE recv, VALUE (* const func)(VALUE),
+		       const VALUE arg, rb_block_t * const blockptr,
+		       const VALUE filename);
 void rb_thread_terminate_all(void);
-void rb_vm_set_eval_stack(rb_thread_t *, VALUE iseq, NODE *cref);
+void rb_vm_set_eval_stack(rb_thread_t * const, const VALUE iseq, NODE * const cref);
 VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
 
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index b95f2d02d3..20f3aa29aa 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -277,7 +277,7 @@ VALUE rb_obj_method(VALUE, VALUE);
 VALUE rb_method_call(int, VALUE*, VALUE);
 int rb_mod_method_arity(VALUE, ID);
 int rb_obj_method_arity(VALUE, ID);
-VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
+VALUE rb_protect(VALUE (* const)(VALUE), const VALUE, int* const);
 void rb_set_end_proc(void (*)(VALUE), VALUE);
 void rb_mark_end_proc(void);
 void rb_exec_end_proc(void);
@@ -438,9 +438,9 @@ int rb_symname_p(const char*);
 int rb_sym_interned_p(VALUE);
 void rb_gc_mark_symbols(void);
 VALUE rb_backref_get(void);
-void rb_backref_set(VALUE);
+void rb_backref_set(const VALUE);
 VALUE rb_lastline_get(void);
-void rb_lastline_set(VALUE);
+void rb_lastline_set(const VALUE);
 VALUE rb_sym_all_symbols(void);
 /* process.c */
 void rb_last_status_set(int status, rb_pid_t pid);
@@ -662,7 +662,7 @@ VALUE rb_str_succ(VALUE);
 VALUE rb_time_succ(VALUE);
 void Init_stack(VALUE*);
 void rb_frame_pop(void);
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
+int rb_frame_method_id_and_class(ID * const idp, VALUE * const klassp);
 
 #if defined(__cplusplus)
 #if 0
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index a7afc51494..499e5ee643 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -788,7 +788,7 @@ VALUE rb_funcall(VALUE, ID, int, ...);
 VALUE rb_funcall2(VALUE, ID, int, const VALUE*);
 VALUE rb_funcall3(VALUE, ID, int, const VALUE*);
 int rb_scan_args(int, const VALUE*, const char*, ...);
-VALUE rb_call_super(int, const VALUE*);
+VALUE rb_call_super(const int, const VALUE* const);
 
 VALUE rb_gv_set(const char*, VALUE);
 VALUE rb_gv_get(const char*);
@@ -817,17 +817,17 @@ PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
 
 typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*);
 
-VALUE rb_each(VALUE);
-VALUE rb_yield(VALUE);
-VALUE rb_yield_values(int n, ...);
-VALUE rb_yield_values2(int n, VALUE *argv);
-VALUE rb_yield_splat(VALUE);
+VALUE rb_each(const VALUE);
+VALUE rb_yield(const VALUE);
+VALUE rb_yield_values(const int n, ...);
+VALUE rb_yield_values2(const int n, VALUE * const argv);
+VALUE rb_yield_splat(const VALUE);
 int rb_block_given_p(void);
 void rb_need_block(void);
-VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_block_call(VALUE,ID,int,VALUE*,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...);
+VALUE rb_iterate(VALUE(* const)(VALUE),const VALUE,VALUE(* const)(ANYARGS),const VALUE);
+VALUE rb_block_call(const VALUE,const ID,const int,VALUE* const,VALUE(* const)(ANYARGS),const VALUE);
+VALUE rb_rescue(VALUE(* const)(ANYARGS),const VALUE,VALUE(* const)(ANYARGS),const VALUE);
+VALUE rb_rescue2(VALUE(* const)(ANYARGS),const VALUE,VALUE(* const)(ANYARGS),VALUE,...);
 VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
 VALUE rb_catch(const char*,VALUE(*)(ANYARGS),VALUE);
 VALUE rb_catch_obj(VALUE,VALUE(*)(ANYARGS),VALUE);
diff --git a/vm.c b/vm.c
index 212d19b73b..786c94e5fa 100644
--- a/vm.c
+++ b/vm.c
@@ -150,7 +150,7 @@ env_alloc(void)
     return obj;
 }
 
-static VALUE check_env_value(VALUE envval);
+static VALUE check_env_value(const VALUE envval);
 
 static int
 check_env(rb_env_t * const env)
diff --git a/vm_core.h b/vm_core.h
index a33a298b3e..df8038ff27 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -586,7 +586,7 @@ typedef rb_control_frame_t *
 
 /* VM related object allocate functions */
 /* TODO: should be static functions */
-VALUE rb_thread_alloc(VALUE klass);
+VALUE rb_thread_alloc(const VALUE klass);
 VALUE rb_proc_alloc(VALUE klass);
 
 /* for debug */
@@ -598,22 +598,28 @@ void rb_vm_bugreport(void);
 
 /* functions about thread/vm execution */
 
-VALUE rb_iseq_eval(VALUE iseqval);
+VALUE rb_iseq_eval(const VALUE iseqval);
 void rb_enable_interrupt(void);
 void rb_disable_interrupt(void);
-int rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, VALUE *klassp);
-
-VALUE vm_eval_body(rb_thread_t *th);
-VALUE vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
-		     int argc, const VALUE *argv, rb_block_t *blockptr);
-VALUE vm_make_proc(rb_thread_t *th, rb_control_frame_t *cfp, rb_block_t *block);
-VALUE vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
-VALUE vm_backtrace(rb_thread_t *, int);
-
-VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv);
-VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, NODE *cref);
-VALUE vm_call0(rb_thread_t *th, VALUE klass, VALUE recv, VALUE id, ID oid,
-	       int argc, const VALUE *argv, NODE *body, int nosuper);
+int rb_thread_method_id_and_class(rb_thread_t * const th, ID * const idp,
+				  VALUE * const klassp);
+
+VALUE vm_eval_body(rb_thread_t * const th);
+VALUE vm_invoke_proc(rb_thread_t *const th, rb_proc_t * const proc,
+		     const VALUE self, const int argc, const VALUE * const argv,
+		     rb_block_t * const blockptr);
+VALUE vm_make_proc(rb_thread_t * const th, rb_control_frame_t *const cfp,
+		   rb_block_t * const block);
+VALUE vm_make_env_object(rb_thread_t * const th, rb_control_frame_t *cfp);
+VALUE vm_backtrace(rb_thread_t * const, int);
+
+VALUE vm_yield(rb_thread_t * const th, const int argc,
+	       const VALUE * const argv);
+VALUE vm_yield_with_cref(rb_thread_t * const th, const int argc,
+			 const VALUE * const argv, NODE * const cref);
+VALUE vm_call0(rb_thread_t * const th, const VALUE klass, const VALUE recv,
+	       const VALUE id, const ID oid, const int argc,
+	       const VALUE * const argv, NODE *const body, const int nosuper);
 
 int vm_get_sourceline(rb_control_frame_t *);