admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

no SEGV for nth_ref & back_ref; close #152

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-05-17 13:21:01 +09:00
parent b68e69aa32
commit 103ef78e59
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/codegen.c
+18 -2
View File
@@ -1477,11 +1477,27 @@ codegen(codegen_scope *s, node *tree, int val)
break;
case NODE_BACK_REF:
codegen(s, tree, VAL);
{
char buf[4];
int sym;
snprintf(buf, 3, "$%c", (intptr_t)tree);
sym = new_sym(s, mrb_intern(s->mrb, buf));
genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym));
push();
}
break;
case NODE_NTH_REF:
codegen(s, tree, VAL);
{
char buf[4];
int sym;
snprintf(buf, 3, "$%d", (intptr_t)tree);
sym = new_sym(s, mrb_intern(s->mrb, buf));
genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym));
push();
}
break;
case NODE_ARG:
src/parse.y
+3 -6
View File
@@ -4406,7 +4406,6 @@ parser_yylex(parser_state *p)
case '1': case '2': case '3':
case '4': case '5': case '6':
case '7': case '8': case '9':
tokadd(p, '$');
do {
tokadd(p, c);
c = nextc(p);
@@ -4414,7 +4413,7 @@ parser_yylex(parser_state *p)
pushback(p, c);
if (last_state == EXPR_FNAME) goto gvar;
tokfix(p);
yylval.node = new_nth_ref(p, atoi(tok(p)+1));
yylval.node = new_nth_ref(p, atoi(tok(p)));
return tNTH_REF;
default:
@@ -5239,13 +5238,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
break;
case NODE_BACK_REF:
printf("NODE_BACK_REF:\n");
parser_dump(mrb, tree, offset+1);
printf("NODE_BACK_REF: $%c\n", (int)tree);
break;
case NODE_NTH_REF:
printf("NODE_NTH_REF:\n");
parser_dump(mrb, tree, offset+1);
printf("NODE_NTH_REF: $%d\n", (int)tree);
break;
case NODE_ARG: