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

* ext/racc/cparse/cparse.c: use rb_ary_entry() and

Browse source 
rb_ary_subseq() instead of RARRAY_PTR.
  Based on a patch by Dirkjan Bussink. See Bug #8399.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2013-06-10 20:06:53 +00:00
parent 0ab44dbc3c
commit 8c6674ef03
2 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Jun 11 05:04:25 2013 Benoit Daloze <eregontp@gmail.com>
* ext/racc/cparse/cparse.c: use rb_ary_entry() and
rb_ary_subseq() instead of RARRAY_PTR.
Based on a patch by Dirkjan Bussink. See Bug #8399.
Mon Jun 10 23:51:51 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Mon Jun 10 23:51:51 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* array.c (rb_ary_new_from_values): fix a typo. pointed out by * array.c (rb_ary_new_from_values): fix a typo. pointed out by

46
ext/racc/cparse/cparse.c
View file

@ -91,7 +91,7 @@ num_to_long(VALUE n)
} }
#define AREF(s, idx) \ #define AREF(s, idx) \
((0 <= idx && idx < RARRAY_LEN(s)) ? RARRAY_PTR(s)[idx] : Qnil) ((0 <= idx && idx < RARRAY_LEN(s)) ? rb_ary_entry(s, idx) : Qnil)
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
Parser Stack Interfaces Parser Stack Interfaces
@ -105,7 +105,7 @@ get_stack_tail(VALUE stack, long len)
{ {
if (len < 0) return Qnil; /* system error */ if (len < 0) return Qnil; /* system error */
if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack); if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack);
return rb_ary_new4(len, RARRAY_PTR(stack) + RARRAY_LEN(stack) - len); return rb_ary_subseq(stack, RARRAY_LEN(stack) - len, len);
} }
static void static void
@ -122,7 +122,7 @@ cut_stack_tail(VALUE stack, long len)
#define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i) #define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
#define POP(s) rb_ary_pop(s) #define POP(s) rb_ary_pop(s)
#define LAST_I(s) \ #define LAST_I(s) \
((RARRAY_LEN(s) > 0) ? RARRAY_PTR(s)[RARRAY_LEN(s) - 1] : Qnil) ((RARRAY_LEN(s) > 0) ? rb_ary_entry(s, RARRAY_LEN(s) - 1) : Qnil)
#define GET_TAIL(s, len) get_stack_tail(s, len) #define GET_TAIL(s, len) get_stack_tail(s, len)
#define CUT_TAIL(s, len) cut_stack_tail(s, len) #define CUT_TAIL(s, len) cut_stack_tail(s, len)
@ -334,21 +334,21 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
Check_Type(arg, T_ARRAY); Check_Type(arg, T_ARRAY);
if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14)) if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg)); rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
v->action_table = assert_array (RARRAY_PTR(arg)[ 0]); v->action_table = assert_array (rb_ary_entry(arg, 0));
v->action_check = assert_array (RARRAY_PTR(arg)[ 1]); v->action_check = assert_array (rb_ary_entry(arg, 1));
v->action_default = assert_array (RARRAY_PTR(arg)[ 2]); v->action_default = assert_array (rb_ary_entry(arg, 2));
v->action_pointer = assert_array (RARRAY_PTR(arg)[ 3]); v->action_pointer = assert_array (rb_ary_entry(arg, 3));
v->goto_table = assert_array (RARRAY_PTR(arg)[ 4]); v->goto_table = assert_array (rb_ary_entry(arg, 4));
v->goto_check = assert_array (RARRAY_PTR(arg)[ 5]); v->goto_check = assert_array (rb_ary_entry(arg, 5));
v->goto_default = assert_array (RARRAY_PTR(arg)[ 6]); v->goto_default = assert_array (rb_ary_entry(arg, 6));
v->goto_pointer = assert_array (RARRAY_PTR(arg)[ 7]); v->goto_pointer = assert_array (rb_ary_entry(arg, 7));
v->nt_base = assert_integer(RARRAY_PTR(arg)[ 8]); v->nt_base = assert_integer(rb_ary_entry(arg, 8));
v->reduce_table = assert_array (RARRAY_PTR(arg)[ 9]); v->reduce_table = assert_array (rb_ary_entry(arg, 9));
v->token_table = assert_hash (RARRAY_PTR(arg)[10]); v->token_table = assert_hash (rb_ary_entry(arg, 10));
v->shift_n = assert_integer(RARRAY_PTR(arg)[11]); v->shift_n = assert_integer(rb_ary_entry(arg, 11));
v->reduce_n = assert_integer(RARRAY_PTR(arg)[12]); v->reduce_n = assert_integer(rb_ary_entry(arg, 12));
if (RARRAY_LEN(arg) > 13) { if (RARRAY_LEN(arg) > 13) {
v->use_result_var = RTEST(RARRAY_PTR(arg)[13]); v->use_result_var = RTEST(rb_ary_entry(arg, 13));
} }
else { else {
v->use_result_var = TRUE; v->use_result_var = TRUE;
@ -564,7 +564,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
accept: accept:
if (v->debug) rb_funcall(v->parser, id_d_accept, 0); if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
v->retval = RARRAY_PTR(v->vstack)[0]; v->retval = rb_ary_entry(v->vstack, 0);
v->fin = CP_FIN_ACCEPT; v->fin = CP_FIN_ACCEPT;
return; return;
@ -693,9 +693,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
VALUE goto_state; VALUE goto_state;
Data_Get_Struct(data, struct cparse_params, v); Data_Get_Struct(data, struct cparse_params, v);
reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno]; reduce_len = rb_ary_entry(v->reduce_table, v->ruleno);
reduce_to = RARRAY_PTR(v->reduce_table)[v->ruleno+1]; reduce_to = rb_ary_entry(v->reduce_table, v->ruleno+1);
method_id = RARRAY_PTR(v->reduce_table)[v->ruleno+2]; method_id = rb_ary_entry(v->reduce_table, v->ruleno+2);
len = NUM2LONG(reduce_len); len = NUM2LONG(reduce_len);
mid = value_to_id(method_id); mid = value_to_id(method_id);
@ -710,10 +710,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
else { else {
if (mid != id_noreduce) { if (mid != id_noreduce) {
tmp_v = GET_TAIL(v->vstack, len); tmp_v = GET_TAIL(v->vstack, len);
tmp = RARRAY_PTR(tmp_v)[0]; tmp = rb_ary_entry(tmp_v, 0);
} }
else { else {
tmp = RARRAY_PTR(v->vstack)[ RARRAY_LEN(v->vstack) - len ]; tmp = rb_ary_entry(v->vstack, RARRAY_LEN(v->vstack) - len);
} }
CUT_TAIL(v->vstack, len); CUT_TAIL(v->vstack, len);
if (v->debug) { if (v->debug) {