In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4c9d53d59a35f57a9c3f30e6f419076cd0cb676e?hp=72aa120d9a32a14196c9e39aa26993909423f096>
- Log ----------------------------------------------------------------- commit 4c9d53d59a35f57a9c3f30e6f419076cd0cb676e Author: Father Chrysostomos <[email protected]> Date: Sat Dec 11 16:28:59 2010 -0800 perldelta for [perl #68712] M pod/perldelta.pod commit 78cdf10786e359ee461137c8a18efb13ea76c331 Author: Zefram <[email protected]> Date: Sat Dec 11 01:31:03 2010 +0000 recursive-descent expression parsing New API functions parse_fullexpr(), parse_listexpr(), parse_termexpr(), and parse_arithexpr(), to parse an expression at various precedence levels. M MANIFEST M embed.fnc M embed.h M ext/XS-APItest/APItest.pm M ext/XS-APItest/APItest.xs A ext/XS-APItest/t/arrayexpr.t M global.sym M parser.h M perly.act M perly.h M perly.tab M perly.y M proto.h M toke.c ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + embed.fnc | 4 + embed.h | 4 + ext/XS-APItest/APItest.pm | 2 +- ext/XS-APItest/APItest.xs | 67 ++ ext/XS-APItest/t/arrayexpr.t | 366 ++++++++++ global.sym | 4 + parser.h | 21 +- perly.act | 799 +++++++++++----------- perly.h | 306 +++++---- perly.tab | 1564 +++++++++++++++++++++--------------------- perly.y | 11 +- pod/perldelta.pod | 9 +- proto.h | 4 + toke.c | 501 ++++++++++++-- 15 files changed, 2280 insertions(+), 1383 deletions(-) create mode 100644 ext/XS-APItest/t/arrayexpr.t diff --git a/MANIFEST b/MANIFEST index 7a017fc..084f8f1 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3426,6 +3426,7 @@ ext/XS-APItest/MANIFEST XS::APItest extension ext/XS-APItest/notcore.c Test API functions when PERL_CORE is not defined ext/XS-APItest/numeric.xs XS::APItest wrappers for numeric.c ext/XS-APItest/README XS::APItest extension +ext/XS-APItest/t/arrayexpr.t test recursive descent expression parsing ext/XS-APItest/t/BHK.pm Helper for ./blockhooks.t ext/XS-APItest/t/blockasexpr.t test recursive descent block parsing ext/XS-APItest/t/blockhooks-csc.t XS::APItest: more tests for PL_blockhooks diff --git a/embed.fnc b/embed.fnc index cca7a78..ed1cd71 100644 --- a/embed.fnc +++ b/embed.fnc @@ -627,6 +627,10 @@ AMpd |I32 |lex_peek_unichar|U32 flags AMpd |I32 |lex_read_unichar|U32 flags AMpd |void |lex_read_space |U32 flags : Public parser API +AMpd |OP* |parse_arithexpr|U32 flags +AMpd |OP* |parse_termexpr |U32 flags +AMpd |OP* |parse_listexpr |U32 flags +AMpd |OP* |parse_fullexpr |U32 flags AMpd |OP* |parse_block |U32 flags AMpd |OP* |parse_barestmt |U32 flags AMpd |SV* |parse_label |U32 flags diff --git a/embed.h b/embed.h index 85ec05c..5f846f5 100644 --- a/embed.h +++ b/embed.h @@ -380,11 +380,15 @@ #define pack_cat(a,b,c,d,e,f,g) Perl_pack_cat(aTHX_ a,b,c,d,e,f,g) #define packlist(a,b,c,d,e) Perl_packlist(aTHX_ a,b,c,d,e) #define pad_findmy(a,b,c) Perl_pad_findmy(aTHX_ a,b,c) +#define parse_arithexpr(a) Perl_parse_arithexpr(aTHX_ a) #define parse_barestmt(a) Perl_parse_barestmt(aTHX_ a) #define parse_block(a) Perl_parse_block(aTHX_ a) +#define parse_fullexpr(a) Perl_parse_fullexpr(aTHX_ a) #define parse_fullstmt(a) Perl_parse_fullstmt(aTHX_ a) #define parse_label(a) Perl_parse_label(aTHX_ a) +#define parse_listexpr(a) Perl_parse_listexpr(aTHX_ a) #define parse_stmtseq(a) Perl_parse_stmtseq(aTHX_ a) +#define parse_termexpr(a) Perl_parse_termexpr(aTHX_ a) #define pmop_dump(a) Perl_pmop_dump(aTHX_ a) #define pop_scope() Perl_pop_scope(aTHX) #define pregcomp(a,b) Perl_pregcomp(aTHX_ a,b) diff --git a/ext/XS-APItest/APItest.pm b/ext/XS-APItest/APItest.pm index 1427e0d..6c3e48a 100644 --- a/ext/XS-APItest/APItest.pm +++ b/ext/XS-APItest/APItest.pm @@ -36,7 +36,7 @@ sub import { } } foreach (keys %{$exports||{}}) { - next unless /\A(?:rpn|calcrpn|stufftest|swaptwostmts|looprest|scopelessblock|stmtasexpr|stmtsasexpr|loopblock|blockasexpr|swaplabel|labelconst)\z/; + next unless /\A(?:rpn|calcrpn|stufftest|swaptwostmts|looprest|scopelessblock|stmtasexpr|stmtsasexpr|loopblock|blockasexpr|swaplabel|labelconst|arrayfullexpr|arraylistexpr|arraytermexpr|arrayarithexp ... [21 chars truncated] $^H{"XS::APItest/$_"} = 1; delete $exports->{$_}; } diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs index 03bbc92..dda137f 100644 --- a/ext/XS-APItest/APItest.xs +++ b/ext/XS-APItest/APItest.xs @@ -601,6 +601,9 @@ static SV *hintkey_scopelessblock_sv; static SV *hintkey_stmtasexpr_sv, *hintkey_stmtsasexpr_sv; static SV *hintkey_loopblock_sv, *hintkey_blockasexpr_sv; static SV *hintkey_swaplabel_sv, *hintkey_labelconst_sv; +static SV *hintkey_arrayfullexpr_sv, *hintkey_arraylistexpr_sv; +static SV *hintkey_arraytermexpr_sv, *hintkey_arrayarithexpr_sv; +static SV *hintkey_arrayexprflags_sv; static int (*next_keyword_plugin)(pTHX_ char *, STRLEN, OP **); /* low-level parser helpers */ @@ -849,6 +852,45 @@ static OP *THX_parse_keyword_labelconst(pTHX) return newSVOP(OP_CONST, 0, parse_label(0)); } +#define parse_keyword_arrayfullexpr() THX_parse_keyword_arrayfullexpr(aTHX) +static OP *THX_parse_keyword_arrayfullexpr(pTHX) +{ + return newANONLIST(parse_fullexpr(0)); +} + +#define parse_keyword_arraylistexpr() THX_parse_keyword_arraylistexpr(aTHX) +static OP *THX_parse_keyword_arraylistexpr(pTHX) +{ + return newANONLIST(parse_listexpr(0)); +} + +#define parse_keyword_arraytermexpr() THX_parse_keyword_arraytermexpr(aTHX) +static OP *THX_parse_keyword_arraytermexpr(pTHX) +{ + return newANONLIST(parse_termexpr(0)); +} + +#define parse_keyword_arrayarithexpr() THX_parse_keyword_arrayarithexpr(aTHX) +static OP *THX_parse_keyword_arrayarithexpr(pTHX) +{ + return newANONLIST(parse_arithexpr(0)); +} + +#define parse_keyword_arrayexprflags() THX_parse_keyword_arrayexprflags(aTHX) +static OP *THX_parse_keyword_arrayexprflags(pTHX) +{ + U32 flags = 0; + I32 c; + OP *o; + lex_read_space(0); + c = lex_peek_unichar(0); + if (c != '!' && c != '?') croak("syntax error"); + lex_read_unichar(0); + if (c == '?') flags |= PARSE_OPTIONAL; + o = parse_listexpr(flags); + return o ? newANONLIST(o) : newANONHASH(newOP(OP_STUB, 0)); +} + /* plugin glue */ #define keyword_active(hintkey_sv) THX_keyword_active(aTHX_ hintkey_sv) @@ -913,6 +955,26 @@ static int my_keyword_plugin(pTHX_ keyword_active(hintkey_labelconst_sv)) { *op_ptr = parse_keyword_labelconst(); return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 13 && strnEQ(keyword_ptr, "arrayfullexpr", 13) && + keyword_active(hintkey_arrayfullexpr_sv)) { + *op_ptr = parse_keyword_arrayfullexpr(); + return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 13 && strnEQ(keyword_ptr, "arraylistexpr", 13) && + keyword_active(hintkey_arraylistexpr_sv)) { + *op_ptr = parse_keyword_arraylistexpr(); + return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 13 && strnEQ(keyword_ptr, "arraytermexpr", 13) && + keyword_active(hintkey_arraytermexpr_sv)) { + *op_ptr = parse_keyword_arraytermexpr(); + return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 14 && strnEQ(keyword_ptr, "arrayarithexpr", 14) && + keyword_active(hintkey_arrayarithexpr_sv)) { + *op_ptr = parse_keyword_arrayarithexpr(); + return KEYWORD_PLUGIN_EXPR; + } else if(keyword_len == 14 && strnEQ(keyword_ptr, "arrayexprflags", 14) && + keyword_active(hintkey_arrayexprflags_sv)) { + *op_ptr = parse_keyword_arrayexprflags(); + return KEYWORD_PLUGIN_EXPR; } else { return next_keyword_plugin(aTHX_ keyword_ptr, keyword_len, op_ptr); } @@ -2659,6 +2721,11 @@ BOOT: hintkey_blockasexpr_sv = newSVpvs_share("XS::APItest/blockasexpr"); hintkey_swaplabel_sv = newSVpvs_share("XS::APItest/swaplabel"); hintkey_labelconst_sv = newSVpvs_share("XS::APItest/labelconst"); + hintkey_arrayfullexpr_sv = newSVpvs_share("XS::APItest/arrayfullexpr"); + hintkey_arraylistexpr_sv = newSVpvs_share("XS::APItest/arraylistexpr"); + hintkey_arraytermexpr_sv = newSVpvs_share("XS::APItest/arraytermexpr"); + hintkey_arrayarithexpr_sv = newSVpvs_share("XS::APItest/arrayarithexpr"); + hintkey_arrayexprflags_sv = newSVpvs_share("XS::APItest/arrayexprflags"); next_keyword_plugin = PL_keyword_plugin; PL_keyword_plugin = my_keyword_plugin; } diff --git a/ext/XS-APItest/t/arrayexpr.t b/ext/XS-APItest/t/arrayexpr.t new file mode 100644 index 0000000..01a43cb --- /dev/null +++ b/ext/XS-APItest/t/arrayexpr.t @@ -0,0 +1,366 @@ +use warnings; +use strict; + +use Test::More tests => 2*10; + +BEGIN { $^H |= 0x20000; } + +my @t; + +sub mymap(&@) { my $sub = shift; return map { $sub->($_) } @_; } +sub myneg(@) { return map { -$_ } @_; } +package AA { sub listmeth { shift; return map { -$_ } @_; } } + +...@t = (); +eval q{ + use XS::APItest qw(arrayfullexpr); + no warnings "void"; + push @t, arrayfullexpr 1+2; + push @t, arrayfullexpr 0 || 2; + push @t, arrayfullexpr 1 || 2; + push @t, arrayfullexpr 0 || 2, 3; + push @t, arrayfullexpr 1 || 2, 3; + push @t, arrayfullexpr 1, 2; + push @t, arrayfullexpr 0 or 2; + push @t, arrayfullexpr 1 or 2; + push @t, arrayfullexpr 0 or 2, 3; + push @t, arrayfullexpr 1 or 2, 3; + { push @t, arrayfullexpr 1, 2 } + push @t, (arrayfullexpr 1, 2), 3; + push @t, arrayfullexpr do { 1; 1 }, 2; + push @t, arrayfullexpr 3, 4 if 1; + push @t, arrayfullexpr 5, 6 if 0; + push @t, arrayfullexpr (7, 8), 9; + push @t, arrayfullexpr a => "b"; + push @t, arrayfullexpr 1 ? reverse 2, 3 : 4, 5; + push @t, arrayfullexpr 0 ? reverse 2, 3 : 4, 5; + push @t, 1 ? reverse arrayfullexpr 2, 3 : 4, 5; + push @t, 0 ? reverse arrayfullexpr 2, 3 : 4, 5; + push @t, arrayfullexpr reverse 1, 2, 3; + push @t, sub { arrayfullexpr return 1, 2, 3 }->(); + push @t, arrayfullexpr myneg 1, 2, 3; + push @t, arrayfullexpr map { -$_ } 1, 2, 3; + push @t, arrayfullexpr mymap { -$_[0] } 1, 2, 3; + push @t, arrayfullexpr AA->listmeth(1, 2), 3; + push @t, arrayfullexpr listmeth AA (1, 2), 3; + push @t, arrayfullexpr listmeth AA 1, 2, 3; + push @t, arrayfullexpr not 1, 2; + push @t, arrayfullexpr reverse 6, 7, 8 or 9; + push @t, arrayfullexpr reverse 6, 7, 8 and 9; + push @t, arrayfullexpr 1 << 2; + push @t, arrayfullexpr 7 < 8; +}; +is $@, ""; +is_deeply \...@t, [ + [3], + [2], + [1], + [2,3], + [1,3], + [1,2], + [2], + [1], + [2,3], + [1], + [1,2], + [1,2], 3, + [1,2], + [3,4], + [7,8,9], + ["a","b"], + [3,2,5], + [4,5], + [2,3], 5, + 4, 5, + [3,2,1], + 1, 2, 3, + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,3], + [-1,-2,3], + [-1,-2,-3], + [!1], + [876], + [9], + [4], + [!!1], +]; + +...@t = (); +eval q{ + use XS::APItest qw(arraylistexpr); + no warnings "void"; + push @t, arraylistexpr 1+2; + push @t, arraylistexpr 0 || 2; + push @t, arraylistexpr 1 || 2; + push @t, arraylistexpr 0 || 2, 3; + push @t, arraylistexpr 1 || 2, 3; + push @t, arraylistexpr 1, 2; + push @t, arraylistexpr 0 or 2; + push @t, arraylistexpr 1 or 2; + push @t, arraylistexpr 0 or 2, 3; + push @t, arraylistexpr 1 or 2, 3; + { push @t, arraylistexpr 1, 2 } + push @t, (arraylistexpr 1, 2), 3; + push @t, arraylistexpr do { 1; 1 }, 2; + push @t, arraylistexpr 3, 4 if 1; + push @t, arraylistexpr 5, 6 if 0; + push @t, arraylistexpr (7, 8), 9; + push @t, arraylistexpr a => "b"; + push @t, arraylistexpr 1 ? reverse 2, 3 : 4, 5; + push @t, arraylistexpr 0 ? reverse 2, 3 : 4, 5; + push @t, 1 ? reverse arraylistexpr 2, 3 : 4, 5; + push @t, 0 ? reverse arraylistexpr 2, 3 : 4, 5; + push @t, arraylistexpr reverse 1, 2, 3; + push @t, sub { arraylistexpr return 1, 2, 3 }->(); + push @t, arraylistexpr myneg 1, 2, 3; + push @t, arraylistexpr map { -$_ } 1, 2, 3; + push @t, arraylistexpr mymap { -$_[0] } 1, 2, 3; + push @t, arraylistexpr AA->listmeth(1, 2), 3; + push @t, arraylistexpr listmeth AA (1, 2), 3; + push @t, arraylistexpr listmeth AA 1, 2, 3; + push @t, arraylistexpr not 1, 2; + push @t, arraylistexpr reverse 6, 7, 8 or 9; + push @t, arraylistexpr reverse 6, 7, 8 and 9; + push @t, arraylistexpr 1 << 2; + push @t, arraylistexpr 7 < 8; +}; +is $@, ""; +is_deeply \...@t, [ + [3], + [2], + [1], + [2,3], + [1,3], + [1,2], + [0], + [1], + [0], + [1], + [1,2], + [1,2], 3, + [1,2], + [3,4], + [7,8,9], + ["a","b"], + [3,2,5], + [4,5], + [2,3], 5, + 4, 5, + [3,2,1], + 1, 2, 3, + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,3], + [-1,-2,3], + [-1,-2,-3], + [!1], + [8,7,6], + [8,7,6], + [4], + [!!1], +]; + +...@t = (); +eval q{ + use XS::APItest qw(arraytermexpr); + no warnings "void"; + push @t, arraytermexpr 1+2; + push @t, arraytermexpr 0 || 2; + push @t, arraytermexpr 1 || 2; + push @t, arraytermexpr 0 || 2, 3; + push @t, arraytermexpr 1 || 2, 3; + push @t, arraytermexpr 1, 2; + push @t, arraytermexpr 0 or 2; + push @t, arraytermexpr 1 or 2; + push @t, arraytermexpr 0 or 2, 3; + push @t, arraytermexpr 1 or 2, 3; + { push @t, arraytermexpr 1 } + push @t, (arraytermexpr 1, 2), 3; + push @t, arraytermexpr do { 1; 1 }, 2; + push @t, arraytermexpr 3, 4 if 1; + push @t, arraytermexpr 5, 6 if 0; + push @t, arraytermexpr (7, 8), 9; + push @t, arraytermexpr a => "b"; + push @t, arraytermexpr 1 ? reverse 2, 3 : 4, 5; + push @t, arraytermexpr 0 ? reverse 2, 3 : 4, 5; + push @t, 1 ? reverse arraytermexpr 2, 3 : 4, 5; + push @t, 0 ? reverse arraytermexpr 2, 3 : 4, 5; + push @t, arraytermexpr reverse 1, 2, 3; + push @t, sub { arraytermexpr return 1, 2, 3 }->(); + push @t, arraytermexpr myneg 1, 2, 3; + push @t, arraytermexpr map { -$_ } 1, 2, 3; + push @t, arraytermexpr mymap { -$_[0] } 1, 2, 3; + push @t, arraytermexpr AA->listmeth(1, 2), 3; + push @t, arraytermexpr listmeth AA (1, 2), 3; + push @t, arraytermexpr listmeth AA 1, 2, 3; + push @t, arraytermexpr not 1, 2; + push @t, arraytermexpr reverse 6, 7, 8 or 9; + push @t, arraytermexpr reverse 6, 7, 8 and 9; + push @t, arraytermexpr 1 << 2; + push @t, arraytermexpr 7 < 8; +}; +is $@, ""; +is_deeply \...@t, [ + [3], + [2], + [1], + [2], 3, + [1], 3, + [1], 2, + [0], + [1], + [0], + [1], + [1], + [1], 2, 3, + [1], 2, + [3], 4, + [7,8], 9, + ["a"], "b", + [3,2], 5, + [4], 5, + 3, [2], 5, + 4, 5, + [3,2,1], + 1, 2, 3, + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,-3], + [-1,-2], 3, + [-1,-2], 3, + [-1,-2,-3], + [!1], + [8,7,6], + [8,7,6], + [4], + [!!1], +]; + +...@t = (); +eval q{ + use XS::APItest qw(arrayarithexpr); + no warnings "void"; + push @t, arrayarithexpr 1+2; + push @t, arrayarithexpr 0 || 2; + push @t, arrayarithexpr 1 || 2; + push @t, arrayarithexpr 0 || 2, 3; + push @t, arrayarithexpr 1 || 2, 3; + push @t, arrayarithexpr 1, 2; + push @t, arrayarithexpr 0 or 2; + push @t, arrayarithexpr 1 or 2; + push @t, arrayarithexpr 0 or 2, 3; + push @t, arrayarithexpr 1 or 2, 3; + { push @t, arrayarithexpr 1 } + push @t, (arrayarithexpr 1, 2), 3; + push @t, arrayarithexpr do { 1; 1 }, 2; + push @t, arrayarithexpr 3, 4 if 1; + push @t, arrayarithexpr 5, 6 if 0; + push @t, arrayarithexpr (7, 8), 9; + push @t, arrayarithexpr a => "b"; + push @t, arrayarithexpr 1 ? reverse 2, 3 : 4, 5; + push @t, arrayarithexpr 0 ? reverse 2, 3 : 4, 5; + push @t, 1 ? reverse arrayarithexpr 2, 3 : 4, 5; + push @t, 0 ? reverse arrayarithexpr 2, 3 : 4, 5; + push @t, arrayarithexpr reverse 1, 2, 3; + push @t, sub { arrayarithexpr return 1, 2, 3 }->(); + push @t, arrayarithexpr myneg 1, 2, 3; + push @t, arrayarithexpr map { -$_ } 1, 2, 3; + push @t, arrayarithexpr mymap { -$_[0] } 1, 2, 3; + push @t, arrayarithexpr AA->listmeth(1, 2), 3; + push @t, arrayarithexpr listmeth AA (1, 2), 3; + push @t, arrayarithexpr listmeth AA 1, 2, 3; + push @t, arrayarithexpr not 1, 2; + push @t, arrayarithexpr reverse 6, 7, 8 or 9; + push @t, arrayarithexpr reverse 6, 7, 8 and 9; + push @t, arrayarithexpr 1 << 2; + push @t, arrayarithexpr 7 < 8; +}; +is $@, ""; +is_deeply \...@t, [ + [3], + [0], + [1], + [0], 3, + [1], 3, + [1], 2, + [0], + [1], + [0], + [1], + [1], + [1], 2, 3, + [1], 2, + [3], 4, + [7,8], 9, + ["a"], "b", + 3, 2, 5, + 3, 2, 5, + 3, [2], 5, + 4, 5, + [3,2,1], + 1, 2, 3, + [-1,-2,-3], + [-1,-2,-3], + [-1,-2,-3], + [-1,-2], 3, + [-1,-2], 3, + [-1,-2,-3], + [!1], + [8,7,6], + [8,7,6], + [4], + !!0, +]; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags! 1, 2; +}; +is $@, ""; +is_deeply \...@t, [ [1,2] ]; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags? 1, 2; +}; +is $@, ""; +is_deeply \...@t, [ [1,2] ]; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags! [); +}; +like $@, qr/\A(?:Parse|syntax) error/; +is_deeply \...@t, []; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags? [); +}; +like $@, qr/\A(?:Parse|syntax) error/; +is_deeply \...@t, []; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags! ; +}; +like $@, qr/\A(?:Parse|syntax) error/; +is_deeply \...@t, []; + +...@t = (); +eval q{ + use XS::APItest qw(arrayexprflags); + push @t, arrayexprflags? ; +}; +is $@, ""; +is_deeply \...@t, [ {} ]; + +1; diff --git a/global.sym b/global.sym index 3831f00..cf19e6c 100644 --- a/global.sym +++ b/global.sym @@ -431,11 +431,15 @@ Perl_pack_cat Perl_packlist Perl_pad_findmy Perl_pad_push +Perl_parse_arithexpr Perl_parse_barestmt Perl_parse_block +Perl_parse_fullexpr Perl_parse_fullstmt Perl_parse_label +Perl_parse_listexpr Perl_parse_stmtseq +Perl_parse_termexpr perl_alloc perl_construct perl_destruct diff --git a/parser.h b/parser.h index e2769a7..e4a06dc 100644 --- a/parser.h +++ b/parser.h @@ -39,7 +39,7 @@ typedef struct yy_parser { /* lexer state */ - I32 lex_brackets; /* bracket count */ + I32 lex_brackets; /* square and curly bracket count */ I32 lex_casemods; /* casemod count */ char *lex_brackstack;/* what kind of brackets to pop */ char *lex_casestack; /* what kind of case mods in effect */ @@ -61,7 +61,7 @@ typedef struct yy_parser { char multi_close; /* delimiter of said string */ char pending_ident; /* pending identifier lookup */ bool preambled; - /* XXX I32 space */ + I32 lex_allbrackets;/* (), [], {}, ?: bracket count */ SUBLEXINFO sublex_info; SV *linestr; /* current chunk of src text */ char *bufptr; @@ -106,6 +106,7 @@ typedef struct yy_parser { char tokenbuf[256]; bool in_pod; /* lexer is within a =pod section */ + U8 lex_fakeeof; /* precedence at which to fake EOF */ } yy_parser; /* flags for lexer API */ @@ -115,6 +116,22 @@ typedef struct yy_parser { /* flags for parser API */ #define PARSE_OPTIONAL 0x00000001 +/* values for lex_fakeeof */ +enum { + LEX_FAKEEOF_NEVER, /* don't fake EOF */ + LEX_FAKEEOF_CLOSING, /* fake EOF at unmatched closing punctuation */ + LEX_FAKEEOF_NONEXPR, /* ... and at token that can't be in expression */ + LEX_FAKEEOF_LOWLOGIC, /* ... and at low-precedence logic operator */ + LEX_FAKEEOF_COMMA, /* ... and at comma */ + LEX_FAKEEOF_ASSIGN, /* ... and at assignment operator */ + LEX_FAKEEOF_IFELSE, /* ... and at ?: operator */ + LEX_FAKEEOF_RANGE, /* ... and at range operator */ + LEX_FAKEEOF_LOGIC, /* ... and at logic operator */ + LEX_FAKEEOF_BITWISE, /* ... and at bitwise operator */ + LEX_FAKEEOF_COMPARE, /* ... and at comparison operator */ + LEX_FAKEEOF_MAX +}; + /* * Local variables: * c-indentation-style: bsd diff --git a/perly.act b/perly.act index c3aed71..98bef36 100644 --- a/perly.act +++ b/perly.act @@ -16,30 +16,27 @@ case 2: case 4: #line 152 "perly.y" { - parser->expect = XBLOCK; + parser->expect = XTERM; ;} break; case 5: #line 156 "perly.y" { - PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; - yyunlex(); - parser->yychar = YYEOF; ;} break; case 6: -#line 164 "perly.y" +#line 161 "perly.y" { - parser->expect = XSTATE; + parser->expect = XBLOCK; ;} break; case 7: -#line 168 "perly.y" +#line 165 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -50,14 +47,14 @@ case 2: break; case 8: -#line 176 "perly.y" +#line 173 "perly.y" { parser->expect = XSTATE; ;} break; case 9: -#line 180 "perly.y" +#line 177 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -68,22 +65,40 @@ case 2: break; case 10: -#line 188 "perly.y" +#line 185 "perly.y" { parser->expect = XSTATE; ;} break; case 11: -#line 192 "perly.y" +#line 189 "perly.y" { + PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; + yyunlex(); + parser->yychar = YYEOF; ;} break; case 12: -#line 200 "perly.y" +#line 197 "perly.y" + { + parser->expect = XSTATE; + ;} + break; + + case 13: +#line 201 "perly.y" + { + PL_eval_root = (ps[(3) - (3)].val.opval); + (yyval.ival) = 0; + ;} + break; + + case 14: +#line 209 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -92,18 +107,18 @@ case 2: ;} break; - case 13: -#line 209 "perly.y" + case 15: +#line 218 "perly.y" { (yyval.ival) = block_start(TRUE); ;} break; - case 14: -#line 213 "perly.y" + case 16: +#line 222 "perly.y" { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;} break; - case 15: -#line 217 "perly.y" + case 17: +#line 226 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -112,18 +127,18 @@ case 2: ;} break; - case 16: -#line 226 "perly.y" + case 18: +#line 235 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; - case 17: -#line 231 "perly.y" + case 19: +#line 240 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 18: -#line 233 "perly.y" + case 20: +#line 242 "perly.y" { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval)); PL_pad_reset_pending = TRUE; if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) @@ -131,8 +146,8 @@ case 2: ;} break; - case 19: -#line 242 "perly.y" + case 21: +#line 251 "perly.y" { if (PVAL((ps[(1) - (2)].val.p_tkval)) || (ps[(2) - (2)].val.opval)) { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); @@ -144,21 +159,21 @@ case 2: ;} break; - case 20: -#line 255 "perly.y" + case 22: +#line 264 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 21: -#line 257 "perly.y" + case 23: +#line 266 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); ;} break; - case 22: -#line 262 "perly.y" + case 24: +#line 271 "perly.y" { CV *fmtcv = PL_compcv; SvREFCNT_inc_simple_void(PL_compcv); @@ -178,8 +193,8 @@ case 2: ;} break; - case 23: -#line 280 "perly.y" + case 25: +#line 289 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD @@ -202,8 +217,8 @@ case 2: ;} break; - case 24: -#line 301 "perly.y" + case 26: +#line 310 "perly.y" { /* Unimplemented "my sub foo { }" */ SvREFCNT_inc_simple_void(PL_compcv); @@ -217,8 +232,8 @@ case 2: ;} break; - case 25: -#line 313 "perly.y" + case 27: +#line 322 "perly.y" { #ifdef MAD (yyval.opval) = package((ps[(3) - (4)].val.opval)); @@ -235,13 +250,13 @@ case 2: ;} break; - case 26: -#line 328 "perly.y" + case 28: +#line 337 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; - case 27: -#line 330 "perly.y" + case 29: +#line 339 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD @@ -258,8 +273,8 @@ case 2: ;} break; - case 28: -#line 345 "perly.y" + case 30: +#line 354 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -270,8 +285,8 @@ case 2: ;} break; - case 29: -#line 354 "perly.y" + case 31: +#line 363 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -282,8 +297,8 @@ case 2: ;} break; - case 30: -#line 363 "perly.y" + case 32: +#line 372 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newGIVENOP((ps[(5) - (7)].val.opval), op_scope((ps[(7) - (7)].val.opval)), (PADOFFSET)(ps[(4) - (7)].val.ival))); @@ -291,18 +306,18 @@ case 2: ;} break; - case 31: -#line 369 "perly.y" + case 33: +#line 378 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;} break; - case 32: -#line 371 "perly.y" + case 34: +#line 380 "perly.y" { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;} break; - case 33: -#line 373 "perly.y" + case 35: +#line 382 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -314,8 +329,8 @@ case 2: ;} break; - case 34: -#line 383 "perly.y" + case 36: +#line 392 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -327,8 +342,8 @@ case 2: ;} break; - case 35: -#line 394 "perly.y" + case 37: +#line 403 "perly.y" { OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval)); OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -350,8 +365,8 @@ case 2: ;} break; - case 36: -#line 414 "perly.y" + case 38: +#line 423 "perly.y" { (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval))); TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W'); @@ -362,8 +377,8 @@ case 2: ;} break; - case 37: -#line 423 "perly.y" + case 39: +#line 432 "perly.y" { (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0, op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); @@ -374,8 +389,8 @@ case 2: ;} break; - case 38: -#line 432 "perly.y" + case 40: +#line 441 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))); @@ -386,8 +401,8 @@ case 2: ;} break; - case 39: -#line 441 "perly.y" + case 41: +#line 450 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -395,8 +410,8 @@ case 2: ;} break; - case 40: -#line 447 "perly.y" + case 42: +#line 456 "perly.y" { int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree; (ps[(3) - (5)].val.opval)->op_latefree = 1; @@ -411,8 +426,8 @@ case 2: ;} break; - case 41: -#line 460 "perly.y" + case 43: +#line 469 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -427,8 +442,8 @@ case 2: ;} break; - case 42: -#line 473 "perly.y" + case 44: +#line 482 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = (ps[(1) - (2)].val.opval); @@ -436,8 +451,8 @@ case 2: ;} break; - case 43: -#line 479 "perly.y" + case 45: +#line 488 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL); @@ -446,64 +461,64 @@ case 2: ;} break; - case 44: -#line 489 "perly.y" + case 46: +#line 498 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 45: -#line 491 "perly.y" + case 47: +#line 500 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 46: -#line 493 "perly.y" + case 48: +#line 502 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; - case 47: -#line 497 "perly.y" + case 49: +#line 506 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; - case 48: -#line 501 "perly.y" + case 50: +#line 510 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; - case 49: -#line 505 "perly.y" + case 51: +#line 514 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; - case 50: -#line 509 "perly.y" + case 52: +#line 518 "perly.y" { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval)); ;} break; - case 51: -#line 514 "perly.y" + case 53: +#line 523 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;} break; - case 52: -#line 519 "perly.y" + case 54: +#line 528 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 53: -#line 521 "perly.y" + case 55: +#line 530 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); @@ -511,8 +526,8 @@ case 2: ;} break; - case 54: -#line 527 "perly.y" + case 56: +#line 536 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), @@ -524,60 +539,60 @@ case 2: ;} break; - case 55: -#line 540 "perly.y" + case 57: +#line 549 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 56: -#line 542 "perly.y" + case 58: +#line 551 "perly.y" { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 57: -#line 550 "perly.y" + case 59: +#line 559 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; - case 58: -#line 556 "perly.y" + case 60: +#line 565 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 60: -#line 562 "perly.y" + case 62: +#line 571 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; - case 62: -#line 570 "perly.y" + case 64: +#line 579 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; - case 63: -#line 575 "perly.y" + case 65: +#line 584 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 64: -#line 579 "perly.y" + case 66: +#line 588 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 65: -#line 583 "perly.y" + case 67: +#line 592 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 66: -#line 588 "perly.y" + case 68: +#line 597 "perly.y" { #ifdef MAD YYSTYPE tmplval; @@ -589,36 +604,36 @@ case 2: ;} break; - case 68: -#line 600 "perly.y" + case 70: +#line 609 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 69: -#line 601 "perly.y" + case 71: +#line 610 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 70: -#line 605 "perly.y" + case 72: +#line 614 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; - case 71: -#line 611 "perly.y" + case 73: +#line 620 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; - case 72: -#line 616 "perly.y" + case 74: +#line 625 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; - case 73: -#line 621 "perly.y" + case 75: +#line 630 "perly.y" { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv); if (strEQ(name, "BEGIN") || strEQ(name, "END") || strEQ(name, "INIT") || strEQ(name, "CHECK") @@ -627,25 +642,25 @@ case 2: (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 74: -#line 631 "perly.y" + case 76: +#line 640 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 76: -#line 637 "perly.y" + case 78: +#line 646 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 77: -#line 639 "perly.y" + case 79: +#line 648 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 78: -#line 643 "perly.y" + case 80: +#line 652 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -654,15 +669,15 @@ case 2: ;} break; - case 79: -#line 653 "perly.y" + case 81: +#line 662 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 80: -#line 657 "perly.y" + case 82: +#line 666 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -671,13 +686,13 @@ case 2: ;} break; - case 81: -#line 666 "perly.y" + case 83: +#line 675 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 82: -#line 667 "perly.y" + case 84: +#line 676 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), (OP*)NULL @@ -687,29 +702,29 @@ case 2: ;} break; - case 83: -#line 678 "perly.y" + case 85: +#line 687 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 84: -#line 682 "perly.y" + case 86: +#line 691 "perly.y" { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 85: -#line 686 "perly.y" + case 87: +#line 695 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 87: -#line 694 "perly.y" + case 89: +#line 703 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -721,8 +736,8 @@ case 2: ;} break; - case 88: -#line 704 "perly.y" + case 90: +#line 713 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -733,16 +748,16 @@ case 2: ;} break; - case 90: -#line 717 "perly.y" + case 92: +#line 726 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 91: -#line 722 "perly.y" + case 93: +#line 731 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -751,8 +766,8 @@ case 2: ;} break; - case 92: -#line 729 "perly.y" + case 94: +#line 738 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)), @@ -763,8 +778,8 @@ case 2: ;} break; - case 93: -#line 738 "perly.y" + case 95: +#line 747 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); @@ -772,8 +787,8 @@ case 2: ;} break; - case 94: -#line 744 "perly.y" + case 96: +#line 753 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), @@ -781,8 +796,8 @@ case 2: ;} break; - case 95: -#line 750 "perly.y" + case 97: +#line 759 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)), @@ -792,15 +807,15 @@ case 2: ;} break; - case 96: -#line 758 "perly.y" + case 98: +#line 767 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 97: -#line 762 "perly.y" + case 99: +#line 771 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); @@ -808,22 +823,22 @@ case 2: ;} break; - case 98: -#line 768 "perly.y" + case 100: +#line 777 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;} break; - case 99: -#line 771 "perly.y" + case 101: +#line 780 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval))); ;} break; - case 102: -#line 786 "perly.y" + case 104: +#line 795 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -832,16 +847,16 @@ case 2: ;} break; - case 103: -#line 793 "perly.y" + case 105: +#line 802 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); ;} break; - case 104: -#line 798 "perly.y" + case 106: +#line 807 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -851,8 +866,8 @@ case 2: ;} break; - case 105: -#line 806 "perly.y" + case 107: +#line 815 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -861,8 +876,8 @@ case 2: ;} break; - case 106: -#line 813 "perly.y" + case 108: +#line 822 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -871,8 +886,8 @@ case 2: ;} break; - case 107: -#line 820 "perly.y" + case 109: +#line 829 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -884,8 +899,8 @@ case 2: ;} break; - case 108: -#line 830 "perly.y" + case 110: +#line 839 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -896,8 +911,8 @@ case 2: ;} break; - case 109: -#line 839 "perly.y" + case 111: +#line 848 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (4)].val.opval)))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a'); @@ -906,8 +921,8 @@ case 2: ;} break; - case 110: -#line 846 "perly.y" + case 112: +#line 855 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval), newCVREF(0, scalar((ps[(1) - (5)].val.opval))))); @@ -917,8 +932,8 @@ case 2: ;} break; - case 111: -#line 855 "perly.y" + case 113: +#line 864 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), newCVREF(0, scalar((ps[(1) - (4)].val.opval))))); @@ -927,8 +942,8 @@ case 2: ;} break; - case 112: -#line 862 "perly.y" + case 114: +#line 871 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (3)].val.opval)))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); @@ -936,8 +951,8 @@ case 2: ;} break; - case 113: -#line 868 "perly.y" + case 115: +#line 877 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval)); TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')'); @@ -946,16 +961,16 @@ case 2: ;} break; - case 114: -#line 875 "perly.y" + case 116: +#line 884 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); ;} break; - case 115: -#line 880 "perly.y" + case 117: +#line 889 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')'); @@ -964,22 +979,22 @@ case 2: ;} break; - case 116: -#line 890 "perly.y" + case 118: +#line 899 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 117: -#line 894 "perly.y" + case 119: +#line 903 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 118: -#line 898 "perly.y" + case 120: +#line 907 "perly.y" { if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT) scalar((ps[(1) - (3)].val.opval)); (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval))); @@ -987,50 +1002,50 @@ case 2: ;} break; - case 119: -#line 904 "perly.y" + case 121: +#line 913 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 120: -#line 908 "perly.y" + case 122: +#line 917 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 121: -#line 912 "perly.y" + case 123: +#line 921 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 122: -#line 916 "perly.y" + case 124: +#line 925 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 123: -#line 920 "perly.y" + case 125: +#line 929 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 124: -#line 924 "perly.y" + case 126: +#line 933 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 125: -#line 928 "perly.y" + case 127: +#line 937 "perly.y" { (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); DO_MAD({ @@ -1044,29 +1059,29 @@ case 2: ;} break; - case 126: -#line 940 "perly.y" + case 128: +#line 949 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 127: -#line 944 "perly.y" + case 129: +#line 953 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 128: -#line 948 "perly.y" + case 130: +#line 957 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 129: -#line 952 "perly.y" + case 131: +#line 961 "perly.y" { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval), ((yyval.opval)->op_type == OP_NOT @@ -1075,15 +1090,15 @@ case 2: ;} break; - case 130: -#line 962 "perly.y" + case 132: +#line 971 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 131: -#line 966 "perly.y" + case 133: +#line 975 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1092,70 +1107,70 @@ case 2: ;} break; - case 132: -#line 973 "perly.y" + case 134: +#line 982 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 133: -#line 977 "perly.y" + case 135: +#line 986 "perly.y" { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 134: -#line 981 "perly.y" + case 136: +#line 990 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 135: -#line 986 "perly.y" + case 137: +#line 995 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 136: -#line 991 "perly.y" + case 138: +#line 1000 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 137: -#line 996 "perly.y" + case 139: +#line 1005 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 138: -#line 1005 "perly.y" + case 140: +#line 1014 "perly.y" { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']'); ;} break; - case 139: -#line 1010 "perly.y" + case 141: +#line 1019 "perly.y" { (yyval.opval) = newANONLIST((OP*)NULL); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']'); ;} break; - case 140: -#line 1015 "perly.y" + case 142: +#line 1024 "perly.y" { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';'); @@ -1163,8 +1178,8 @@ case 2: ;} break; - case 141: -#line 1021 "perly.y" + case 143: +#line 1030 "perly.y" { (yyval.opval) = newANONHASH((OP*)NULL); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';'); @@ -1172,8 +1187,8 @@ case 2: ;} break; - case 142: -#line 1027 "perly.y" + case 144: +#line 1036 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -1182,22 +1197,22 @@ case 2: ;} break; - case 143: -#line 1038 "perly.y" + case 145: +#line 1047 "perly.y" { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 144: -#line 1042 "perly.y" + case 146: +#line 1051 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D'); ;} break; - case 145: -#line 1046 "perly.y" + case 147: +#line 1055 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, @@ -1211,8 +1226,8 @@ case 2: ;} break; - case 146: -#line 1058 "perly.y" + case 148: +#line 1067 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_append_elem(OP_LIST, @@ -1227,8 +1242,8 @@ case 2: ;} break; - case 147: -#line 1071 "perly.y" + case 149: +#line 1080 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep(); @@ -1238,8 +1253,8 @@ case 2: ;} break; - case 148: -#line 1079 "perly.y" + case 150: +#line 1088 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1250,86 +1265,86 @@ case 2: ;} break; - case 153: -#line 1095 "perly.y" + case 155: +#line 1104 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':'); ;} break; - case 154: -#line 1100 "perly.y" + case 156: +#line 1109 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 155: -#line 1104 "perly.y" + case 157: +#line 1113 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 156: -#line 1106 "perly.y" + case 158: +#line 1115 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k'); ;} break; - case 157: -#line 1110 "perly.y" + case 159: +#line 1119 "perly.y" { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval))); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); ;} break; - case 158: -#line 1115 "perly.y" + case 160: +#line 1124 "perly.y" { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;} break; - case 159: -#line 1117 "perly.y" + case 161: +#line 1126 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); **** PATCH TRUNCATED AT 2000 LINES -- 3651 NOT SHOWN **** -- Perl5 Master Repository
