diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.c | 17 | ||||
| -rw-r--r-- | src/parse.y | 87 | ||||
| -rw-r--r-- | src/vm.c | 5 |
3 files changed, 61 insertions, 48 deletions
diff --git a/src/codegen.c b/src/codegen.c index e728da4ca..5c3614814 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -1938,16 +1938,21 @@ codegen(codegen_scope *s, node *tree, int val) case NODE_UNDEF: { - int sym = new_msym(s, sym(tree)); int undef = new_msym(s, mrb_intern(s->mrb, "undef_method")); + int num = 0; + node *t = tree; genop(s, MKOP_A(OP_TCLASS, cursp())); push(); - genop(s, MKOP_ABx(OP_LOADSYM, cursp(), sym)); - push(); - genop(s, MKOP_A(OP_LOADNIL, cursp())); - pop_n(2); - genop(s, MKOP_ABC(OP_SEND, cursp(), undef, 2)); + while (t) { + int symbol = new_msym(s, sym(t->car)); + genop(s, MKOP_ABx(OP_LOADSYM, cursp(), symbol)); + push(); + t = t->cdr; + num++; + } + pop_n(num + 1); + genop(s, MKOP_ABC(OP_SEND, cursp(), undef, num)); if (val) { push(); } diff --git a/src/parse.y b/src/parse.y index 403db1cc8..1ca3385f5 100644 --- a/src/parse.y +++ b/src/parse.y @@ -570,7 +570,7 @@ new_const(parser_state *p, mrb_sym sym) static node* new_undef(parser_state *p, mrb_sym sym) { - return cons((node*)NODE_UNDEF, nsym(sym)); + return list2((node*)NODE_UNDEF, nsym(sym)); } // (:class class super body) @@ -917,7 +917,7 @@ var_reference(parser_state *p, node *lhs) %type <nd> assoc_list assocs assoc undef_list backref for_var %type <nd> block_param opt_block_param block_param_def f_opt %type <nd> bv_decls opt_bv_decl bvar f_larglist lambda_body -%type <nd> brace_block cmd_brace_block do_block lhs none fitem f_bad_arg +%type <nd> brace_block cmd_brace_block do_block lhs none f_bad_arg %type <nd> mlhs mlhs_list mlhs_post mlhs_basic mlhs_item mlhs_node mlhs_inner %type <id> fsym sym basic_symbol operation operation2 operation3 %type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg @@ -1050,7 +1050,7 @@ bodystmt : compstmt } else if ($3) { yywarn(p, "else without rescue is useless"); - $$ = append($$, $3); + $$ = push($1, $3); } else { $$ = $1; @@ -1485,19 +1485,13 @@ fsym : fname | basic_symbol ; -fitem : fsym - { - $$ = new_sym(p, $1); - } - ; - undef_list : fsym { $$ = new_undef(p, $1); } - | undef_list ',' {p->lstate = EXPR_FNAME;} fitem + | undef_list ',' {p->lstate = EXPR_FNAME;} fsym { - $$ = push($1, (node*)$4); + $$ = push($1, nsym($4)); } ; @@ -3434,36 +3428,39 @@ parse_string(parser_state *p, int term) } static node* -qstring_node(parser_state *p, int term) +qstring_node(parser_state *p, int beg, int end) { int c; + int nest_level = 0; newtok(p); - while ((c = nextc(p)) != term) { + while ((c = nextc(p)) != end || nest_level != 0) { if (c == -1) { yyerror(p, "unterminated string meets end of file"); return 0; } - if (c == '\\') { + else if (c == beg) { + nest_level++; + } + else if (c == end) { + nest_level--; + } + else if (c == '\\') { c = nextc(p); - switch (c) { - case '\n': - p->lineno++; - p->column = 0; - continue; - - case '\\': - c = '\\'; - break; - - case '\'': - if (term == '\'') { - c = '\''; - break; - } - /* fall through */ - default: - tokadd(p, '\\'); + if (c != beg && c != end) { + switch (c) { + case '\n': + p->lineno++; + p->column = 0; + continue; + + case '\\': + c = '\\'; + break; + + default: + tokadd(p, '\\'); + } } } tokadd(p, c); @@ -3475,12 +3472,12 @@ qstring_node(parser_state *p, int term) } static int -parse_qstring(parser_state *p, int term) +parse_qstring(parser_state *p, int beg, int end) { - node *nd = qstring_node(p, term); + node *nd = qstring_node(p, beg, end); if (nd) { - yylval.nd = new_str(p, tok(p), toklen(p)); + yylval.nd = nd; return tSTRING; } return 0; @@ -3714,7 +3711,7 @@ parser_yylex(parser_state *p) return tSTRING_BEG; case '\'': - return parse_qstring(p, c); + return parse_qstring(p, '\'', '\''); case '?': if (IS_END()) { @@ -4317,7 +4314,7 @@ parser_yylex(parser_state *p) case '%': if (IS_BEG()) { - int term; + int beg = 0, term; #if 0 int paren; #endif @@ -4329,7 +4326,7 @@ parser_yylex(parser_state *p) c = 'Q'; } else { - term = nextc(p); + beg = term = nextc(p); if (isalnum(term)) { yyerror(p, "unknown type of %string"); return 0; @@ -4362,7 +4359,8 @@ parser_yylex(parser_state *p) #if 0 p->lex_strterm = new_strterm(p, str_squote, term, paren); #endif - return tSTRING_BEG; + p->sterm = 0; + return parse_qstring(p, beg, term); case 'W': #if 0 @@ -5458,8 +5456,15 @@ parser_dump(mrb_state *mrb, node *tree, int offset) break; case NODE_UNDEF: - printf("NODE_UNDEF %s:\n", - mrb_sym2name(mrb, sym(tree))); + printf("NODE_UNDEF"); + { + node *t = tree; + while (t) { + printf(" %s", mrb_sym2name(mrb, sym(t->car))); + t = t->cdr; + } + } + printf(":\n"); break; case NODE_CLASS: @@ -1121,6 +1121,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) } else { if (argv0 != argv) { + regs[len+1] = *blk; /* move block */ memmove(®s[1], argv, sizeof(mrb_value)*(m1+o)); /* m1 + o */ } if (r) { /* r */ @@ -1129,7 +1130,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) if (m2) { memmove(®s[m1+o+r+1], &argv[argc-m2], sizeof(mrb_value)*m2); } - regs[len+1] = *blk; /* move block */ + if (argv0 == argv) { + regs[len+1] = *blk; /* move block */ + } pc += o + 1; } JUMP; |