1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

ruby/ruby.h, enum.c, vm_eval.c: constify argv

* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): constify argv.
* enum.c (rb_enum_values_pack): ditto.
* vm_eval.c (rb_block_call, rb_check_block_call): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-29 08:02:51 +00:00
parent 7566c49068
commit 58553ca184
6 changed files with 15 additions and 9 deletions

View file

@ -1,4 +1,10 @@
Fri Nov 29 16:59:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Nov 29 17:02:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): constify argv.
* enum.c (rb_enum_values_pack): ditto.
* vm_eval.c (rb_block_call, rb_check_block_call): ditto.
* include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): for declaration * include/ruby/ruby.h (RB_BLOCK_CALL_FUNC_ARGLIST): for declaration
argument list of rb_block_call_func. argument list of rb_block_call_func.

2
enum.c
View file

@ -30,7 +30,7 @@ static ID id_size;
#define id_lshift idLTLT #define id_lshift idLTLT
VALUE VALUE
rb_enum_values_pack(int argc, VALUE *argv) rb_enum_values_pack(int argc, const VALUE *argv)
{ {
if (argc == 0) return Qnil; if (argc == 0) return Qnil;
if (argc == 1) return argv[0]; if (argc == 1) return argv[0];

View file

@ -225,7 +225,7 @@ VALUE rb_fiber_yield(int argc, VALUE *args);
VALUE rb_fiber_current(void); VALUE rb_fiber_current(void);
VALUE rb_fiber_alive_p(VALUE); VALUE rb_fiber_alive_p(VALUE);
/* enum.c */ /* enum.c */
VALUE rb_enum_values_pack(int, VALUE*); VALUE rb_enum_values_pack(int, const VALUE*);
/* enumerator.c */ /* enumerator.c */
VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *); VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
typedef VALUE rb_enumerator_size_func(VALUE, VALUE, VALUE); typedef VALUE rb_enumerator_size_func(VALUE, VALUE, VALUE);

View file

@ -1495,7 +1495,7 @@ PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
#define RUBY_BLOCK_CALL_FUNC_TAKES_BLOCKARG 1 #define RUBY_BLOCK_CALL_FUNC_TAKES_BLOCKARG 1
#define RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg) \ #define RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg) \
VALUE yielded_arg, VALUE callback_arg, int argc, VALUE *argv, VALUE blockarg VALUE yielded_arg, VALUE callback_arg, int argc, const VALUE *argv, VALUE blockarg
typedef VALUE rb_block_call_func(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)); typedef VALUE rb_block_call_func(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg));
#if defined RB_BLOCK_CALL_FUNC_STRICT && RB_BLOCK_CALL_FUNC_STRICT #if defined RB_BLOCK_CALL_FUNC_STRICT && RB_BLOCK_CALL_FUNC_STRICT
@ -1512,7 +1512,7 @@ VALUE rb_yield_splat(VALUE);
int rb_block_given_p(void); int rb_block_given_p(void);
void rb_need_block(void); void rb_need_block(void);
VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE); VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE);
VALUE rb_block_call(VALUE,ID,int,VALUE*,rb_block_call_func_t,VALUE); VALUE rb_block_call(VALUE,ID,int,const VALUE*,rb_block_call_func_t,VALUE);
VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE); VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...); VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...);
VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE); VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);

View file

@ -751,7 +751,7 @@ void rb_print_backtrace(void);
/* vm_eval.c */ /* vm_eval.c */
void Init_vm_eval(void); void Init_vm_eval(void);
VALUE rb_current_realfilepath(void); VALUE rb_current_realfilepath(void);
VALUE rb_check_block_call(VALUE, ID, int, VALUE *, rb_block_call_func_t, VALUE); VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE);
typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE); typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE);
VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv,
rb_check_funcall_hook *hook, VALUE arg); rb_check_funcall_hook *hook, VALUE arg);

View file

@ -1122,7 +1122,7 @@ struct iter_method_arg {
VALUE obj; VALUE obj;
ID mid; ID mid;
int argc; int argc;
VALUE *argv; const VALUE *argv;
}; };
static VALUE static VALUE
@ -1135,7 +1135,7 @@ iterate_method(VALUE obj)
} }
VALUE VALUE
rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv, rb_block_call(VALUE obj, ID mid, int argc, const VALUE * argv,
VALUE (*bl_proc) (ANYARGS), VALUE data2) VALUE (*bl_proc) (ANYARGS), VALUE data2)
{ {
struct iter_method_arg arg; struct iter_method_arg arg;
@ -1157,7 +1157,7 @@ iterate_check_method(VALUE obj)
} }
VALUE VALUE
rb_check_block_call(VALUE obj, ID mid, int argc, VALUE * argv, rb_check_block_call(VALUE obj, ID mid, int argc, const VALUE *argv,
VALUE (*bl_proc) (ANYARGS), VALUE data2) VALUE (*bl_proc) (ANYARGS), VALUE data2)
{ {
struct iter_method_arg arg; struct iter_method_arg arg;