diff options
| author | Zefram <zefram@fysh.org> | 2010-10-14 17:02:36 +0100 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2010-10-21 05:53:50 -0700 |
| commit | 9eb5c532bf567fdd066254fcaacf4a66722714c5 (patch) | |
| tree | 518311ad05d028dab7c1ef9be5bddfb43083e951 /ext/XS-APItest/APItest.xs | |
| parent | 1e2159890b8bf881fbc717f671f87ba2dec1da46 (diff) | |
| download | perl-9eb5c532bf567fdd066254fcaacf4a66722714c5.tar.gz | |
fix and test PL_expect in recdescent parsing
Set PL_expect at the start of parse_fullstmt() as well as at the start
of parse_stmtseq(). Test both.
Diffstat (limited to 'ext/XS-APItest/APItest.xs')
| -rw-r--r-- | ext/XS-APItest/APItest.xs | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs index f93f20a539..4aad258b95 100644 --- a/ext/XS-APItest/APItest.xs +++ b/ext/XS-APItest/APItest.xs @@ -519,6 +519,7 @@ test_op_linklist_describe(OP *start) static SV *hintkey_rpn_sv, *hintkey_calcrpn_sv, *hintkey_stufftest_sv; static SV *hintkey_swaptwostmts_sv, *hintkey_looprest_sv; static SV *hintkey_scopelessblock_sv; +static SV *hintkey_stmtasexpr_sv, *hintkey_stmtsasexpr_sv; static int (*next_keyword_plugin)(pTHX_ char *, STRLEN, OP **); /* low-level parser helpers */ @@ -715,6 +716,33 @@ static OP *THX_parse_keyword_scopelessblock(pTHX) return body; } +#define parse_keyword_stmtasexpr() THX_parse_keyword_stmtasexpr(aTHX) +static OP *THX_parse_keyword_stmtasexpr(pTHX) +{ + OP *o = parse_fullstmt(0); + o = op_prepend_elem(OP_LINESEQ, newOP(OP_ENTER, 0), o); + o->op_type = OP_LEAVE; + o->op_ppaddr = PL_ppaddr[OP_LEAVE]; + return o; +} + +#define parse_keyword_stmtsasexpr() THX_parse_keyword_stmtsasexpr(aTHX) +static OP *THX_parse_keyword_stmtsasexpr(pTHX) +{ + OP *o; + lex_read_space(0); + if(lex_peek_unichar(0) != '{'/*}*/) croak("syntax error"); + lex_read_unichar(0); + o = parse_stmtseq(0); + lex_read_space(0); + if(lex_peek_unichar(0) != /*{*/'}') croak("syntax error"); + lex_read_unichar(0); + o = op_prepend_elem(OP_LINESEQ, newOP(OP_ENTER, 0), o); + o->op_type = OP_LEAVE; + o->op_ppaddr = PL_ppaddr[OP_LEAVE]; + return o; +} + /* plugin glue */ #define keyword_active(hintkey_sv) THX_keyword_active(aTHX_ hintkey_sv) @@ -755,6 +783,14 @@ static int my_keyword_plugin(pTHX_ keyword_active(hintkey_scopelessblock_sv)) { *op_ptr = parse_keyword_scopelessblock(); return KEYWORD_PLUGIN_STMT; + } else if(keyword_len == 10 && strnEQ(keyword_ptr, "stmtasexpr", 10) && + keyword_active(hintkey_stmtasexpr_sv)) { + *op_ptr = parse_keyword_stmtasexpr(); + return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 11 && strnEQ(keyword_ptr, "stmtsasexpr", 11) && + keyword_active(hintkey_stmtsasexpr_sv)) { + *op_ptr = parse_keyword_stmtsasexpr(); + return KEYWORD_PLUGIN_EXPR; } else { return next_keyword_plugin(aTHX_ keyword_ptr, keyword_len, op_ptr); } @@ -2163,6 +2199,8 @@ BOOT: hintkey_swaptwostmts_sv = newSVpvs_share("XS::APItest/swaptwostmts"); hintkey_looprest_sv = newSVpvs_share("XS::APItest/looprest"); hintkey_scopelessblock_sv = newSVpvs_share("XS::APItest/scopelessblock"); + hintkey_stmtasexpr_sv = newSVpvs_share("XS::APItest/stmtasexpr"); + hintkey_stmtsasexpr_sv = newSVpvs_share("XS::APItest/stmtsasexpr"); next_keyword_plugin = PL_keyword_plugin; PL_keyword_plugin = my_keyword_plugin; } |