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: reduce goto.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aamine 2002-08-06 23:42:04 +00:00
parent fc2a1ad79f
commit 30bc60cfe4
2 changed files with 50 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Aug 7 08:44:32 2002 Minero Aoki <aamine@loveruby.net>
* ext/racc/cparse/cparse.c: reduce goto.
Tue Aug 6 15:19:39 2002 NAKAMURA Usaku <usa@ruby-lang.org> Tue Aug 6 15:19:39 2002 NAKAMURA Usaku <usa@ruby-lang.org>
* string.c (rb_str_rindex): must return -1 if unmatched. * string.c (rb_str_rindex): must return -1 if unmatched.

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

@ -1,4 +1,4 @@
/* vi:set sw=4: /*
cparse.c cparse.c
@ -519,7 +519,8 @@ parse_main(v, tok, val, resume)
} }
else if (act == -(v->reduce_n)) { else if (act == -(v->reduce_n)) {
goto error; goto error;
error_return: ; error_return:
; /* goto label requires stmt */
} }
else if (act == v->shift_n) { else if (act == v->shift_n) {
D(puts("accept")); D(puts("accept"));
@ -566,55 +567,54 @@ parse_main(v, tok, val, resume)
/* check if we can shift/reduce error token */ /* check if we can shift/reduce error token */
D(printf("(err) k1=%ld\n", v->curstate)); D(printf("(err) k1=%ld\n", v->curstate));
D(printf("(err) k2=%d (error)\n", ERROR_TOKEN)); D(printf("(err) k2=%d (error)\n", ERROR_TOKEN));
e_lookup: while (1) {
tmp = AREF(v->action_pointer, v->curstate); tmp = AREF(v->action_pointer, v->curstate);
if (NIL_P(tmp)) goto e_notfound; if (NIL_P(tmp)) goto e_notfound;
D(puts("(err) pointer[k1] true")); D(puts("(err) pointer[k1] true"));
i = NUM2LONG(tmp) + ERROR_TOKEN; i = NUM2LONG(tmp) + ERROR_TOKEN;
D(printf("(err) i=%ld\n", i)); D(printf("(err) i=%ld\n", i));
if (i < 0) goto e_notfound; if (i < 0) goto e_notfound;
vact = AREF(v->action_table, i); vact = AREF(v->action_table, i);
if (NIL_P(vact)) { if (NIL_P(vact)) {
D(puts("(err) table[i] == nil")); D(puts("(err) table[i] == nil"));
goto e_notfound; goto e_notfound;
} }
D(printf("(err) table[i]=%ld\n", NUM2LONG(vact))); D(printf("(err) table[i]=%ld\n", NUM2LONG(vact)));
tmp = AREF(v->action_check, i); tmp = AREF(v->action_check, i);
if (NIL_P(tmp)) { if (NIL_P(tmp)) {
D(puts("(err) check[i] == nil")); D(puts("(err) check[i] == nil"));
goto e_notfound; goto e_notfound;
} }
if (NUM2LONG(tmp) != v->curstate) { if (NUM2LONG(tmp) != v->curstate) {
D(puts("(err) check[i]!=k1 or nil")); D(puts("(err) check[i]!=k1 or nil"));
goto e_notfound; goto e_notfound;
}
D(puts("(err) found: can handle error token"));
act = NUM2LONG(vact);
break;
e_notfound:
D(puts("(err) not found: can't handle error token; pop"));
if (RARRAY(v->state)->len == 0) {
v->retval = Qnil;
v->fin = CP_FIN_CANTPOP;
return;
}
POP(v->state);
POP(v->vstack);
v->curstate = num_to_long(LAST_I(v->state));
if (v->debug) {
POP(v->tstack);
rb_funcall(v->parser, id_d_e_pop,
3, v->state, v->tstack, v->vstack);
}
} }
D(puts("(err) found: can handle error token"));
act = NUM2LONG(vact);
goto e_handle_act;
e_notfound:
D(puts("(err) not found: can't handle error token; pop"));
if (RARRAY(v->state)->len == 0) {
v->retval = Qnil;
v->fin = CP_FIN_CANTPOP;
return;
}
POP(v->state);
POP(v->vstack);
v->curstate = num_to_long(LAST_I(v->state));
if (v->debug) {
POP(v->tstack);
rb_funcall(v->parser, id_d_e_pop,
3, v->state, v->tstack, v->vstack);
}
goto e_lookup;
e_handle_act:
/* shift/reduce error token */ /* shift/reduce error token */
if (act > 0 && act < v->shift_n) { if (act > 0 && act < v->shift_n) {
D(puts("e shift")); D(puts("e shift"));