diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 62 | ||||
| -rw-r--r-- | src/vm.c | 5 |
2 files changed, 37 insertions, 30 deletions
diff --git a/src/parse.y b/src/parse.y index a2864b02c..1ca3385f5 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1050,7 +1050,7 @@ bodystmt : compstmt } else if ($3) { yywarn(p, "else without rescue is useless"); - $$ = append($$, $3); + $$ = push($1, $3); } else { $$ = $1; @@ -3428,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); @@ -3469,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; @@ -3708,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()) { @@ -4311,7 +4314,7 @@ parser_yylex(parser_state *p) case '%': if (IS_BEG()) { - int term; + int beg = 0, term; #if 0 int paren; #endif @@ -4323,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; @@ -4356,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 @@ -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; |