diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-17 13:21:01 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-17 13:21:01 +0900 |
| commit | 103ef78e59348d5aef4775759cfb651ae1b340ee (patch) | |
| tree | 66e66ebe3a4bb03a6ebda9dfa0ed410c889057fa /src | |
| parent | b68e69aa326c98fbe9676e00aea211a49c6ae361 (diff) | |
| download | mruby-103ef78e59348d5aef4775759cfb651ae1b340ee.tar.gz mruby-103ef78e59348d5aef4775759cfb651ae1b340ee.zip | |
no SEGV for nth_ref & back_ref; close #152
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.c | 20 | ||||
| -rw-r--r-- | src/parse.y | 9 |
2 files changed, 21 insertions, 8 deletions
diff --git a/src/codegen.c b/src/codegen.c index a943c607a..ae5eafdf7 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -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: diff --git a/src/parse.y b/src/parse.y index e6d980d1c..b8fb54c84 100644 --- a/src/parse.y +++ b/src/parse.y @@ -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: |