Skip to content

Commit

Permalink
use rb_ary_entry() and rb_ary_subseq() instead of RARRAY_PTR
Browse files Browse the repository at this point in the history 
* Based on a patch by Dirkjan Bussink
* See MRI Bug #8399: https://bugs.ruby-lang.org/issues/8399
  • Loading branch information
@eregon
eregon committed Jun 10, 2013
1 parent 5c53f20 commit c43068f
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions ext/racc/cparse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ num_to_long(VALUE n)
}

#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
Expand All @@ -98,7 +98,7 @@ get_stack_tail(VALUE stack, long len)
{
if (len < 0) return Qnil; /* system error */
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
Expand All @@ -115,7 +115,7 @@ cut_stack_tail(VALUE stack, long len)
#define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
#define POP(s) rb_ary_pop(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 CUT_TAIL(s, len) cut_stack_tail(s, len)

Expand Down Expand Up @@ -327,21 +327,21 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
Check_Type(arg, T_ARRAY);
if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
v->action_table = assert_array (RARRAY_PTR(arg)[ 0]);
v->action_check = assert_array (RARRAY_PTR(arg)[ 1]);
v->action_default = assert_array (RARRAY_PTR(arg)[ 2]);
v->action_pointer = assert_array (RARRAY_PTR(arg)[ 3]);
v->goto_table = assert_array (RARRAY_PTR(arg)[ 4]);
v->goto_check = assert_array (RARRAY_PTR(arg)[ 5]);
v->goto_default = assert_array (RARRAY_PTR(arg)[ 6]);
v->goto_pointer = assert_array (RARRAY_PTR(arg)[ 7]);
v->nt_base = assert_integer(RARRAY_PTR(arg)[ 8]);
v->reduce_table = assert_array (RARRAY_PTR(arg)[ 9]);
v->token_table = assert_hash (RARRAY_PTR(arg)[10]);
v->shift_n = assert_integer(RARRAY_PTR(arg)[11]);
v->reduce_n = assert_integer(RARRAY_PTR(arg)[12]);
v->action_table = assert_array (rb_ary_entry(arg, 0));
v->action_check = assert_array (rb_ary_entry(arg, 1));
v->action_default = assert_array (rb_ary_entry(arg, 2));
v->action_pointer = assert_array (rb_ary_entry(arg, 3));
v->goto_table = assert_array (rb_ary_entry(arg, 4));
v->goto_check = assert_array (rb_ary_entry(arg, 5));
v->goto_default = assert_array (rb_ary_entry(arg, 6));
v->goto_pointer = assert_array (rb_ary_entry(arg, 7));
v->nt_base = assert_integer(rb_ary_entry(arg, 8));
v->reduce_table = assert_array (rb_ary_entry(arg, 9));
v->token_table = assert_hash (rb_ary_entry(arg, 10));
v->shift_n = assert_integer(rb_ary_entry(arg, 11));
v->reduce_n = assert_integer(rb_ary_entry(arg, 12));
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 {
v->use_result_var = Qtrue;
Expand Down Expand Up @@ -557,7 +557,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)

accept:
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;
return;

Expand Down Expand Up @@ -686,9 +686,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
VALUE goto_state;

Data_Get_Struct(data, struct cparse_params, v);
reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno];
reduce_to = RARRAY_PTR(v->reduce_table)[v->ruleno+1];
method_id = RARRAY_PTR(v->reduce_table)[v->ruleno+2];
reduce_len = rb_ary_entry(v->reduce_table, v->ruleno);
reduce_to = rb_ary_entry(v->reduce_table, v->ruleno+1);
method_id = rb_ary_entry(v->reduce_table, v->ruleno+2);
len = NUM2LONG(reduce_len);
mid = value_to_id(method_id);

Expand All @@ -703,10 +703,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
else {
if (mid != id_noreduce) {
tmp_v = GET_TAIL(v->vstack, len);
tmp = RARRAY_PTR(tmp_v)[0];
tmp = rb_ary_entry(tmp_v, 0);
}
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);
if (v->debug) {
Expand Down

3 comments on commit c43068f

@zzak
Copy link
Member

@zzak zzak commented on c43068f Oct 29, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this breaks Ruby 1.8 support, which RDoc still supports afaik, I will open a ticket to try to get some feedback

@zenspider
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit should be reverted. @tenderlove?

@eregon
Copy link
Member Author

@eregon eregon commented on c43068f Oct 29, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be enough just to use an alternative for the rb_ary_subseq().

Please sign in to comment.