Commit 103ef78e authored by Yukihiro Matsumoto's avatar Yukihiro Matsumoto

no SEGV for nth_ref & back_ref; close #152

parent b68e69aa
...@@ -1477,11 +1477,27 @@ codegen(codegen_scope *s, node *tree, int val) ...@@ -1477,11 +1477,27 @@ codegen(codegen_scope *s, node *tree, int val)
break; break;
case NODE_BACK_REF: 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; break;
case NODE_NTH_REF: 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; break;
case NODE_ARG: case NODE_ARG:
......
...@@ -4406,7 +4406,6 @@ parser_yylex(parser_state *p) ...@@ -4406,7 +4406,6 @@ parser_yylex(parser_state *p)
case '1': case '2': case '3': case '1': case '2': case '3':
case '4': case '5': case '6': case '4': case '5': case '6':
case '7': case '8': case '9': case '7': case '8': case '9':
tokadd(p, '$');
do { do {
tokadd(p, c); tokadd(p, c);
c = nextc(p); c = nextc(p);
...@@ -4414,7 +4413,7 @@ parser_yylex(parser_state *p) ...@@ -4414,7 +4413,7 @@ parser_yylex(parser_state *p)
pushback(p, c); pushback(p, c);
if (last_state == EXPR_FNAME) goto gvar; if (last_state == EXPR_FNAME) goto gvar;
tokfix(p); tokfix(p);
yylval.node = new_nth_ref(p, atoi(tok(p)+1)); yylval.node = new_nth_ref(p, atoi(tok(p)));
return tNTH_REF; return tNTH_REF;
default: default:
...@@ -5239,13 +5238,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5239,13 +5238,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
break; break;
case NODE_BACK_REF: case NODE_BACK_REF:
printf("NODE_BACK_REF:\n"); printf("NODE_BACK_REF: $%c\n", (int)tree);
parser_dump(mrb, tree, offset+1);
break; break;
case NODE_NTH_REF: case NODE_NTH_REF:
printf("NODE_NTH_REF:\n"); printf("NODE_NTH_REF: $%d\n", (int)tree);
parser_dump(mrb, tree, offset+1);
break; break;
case NODE_ARG: case NODE_ARG:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment