From 894f226e51fd4f80c130447477b789cd25f37574 Mon Sep 17 00:00:00 2001 From: David Mitchell Date: Thu, 18 Jan 2018 09:44:10 +0000 Subject: [PATCH] move sub attributes before the signature RT #132141 Attributes such as :lvalue have to come *before* the signature to ensure that they're applied to any code block within the signature; e.g. sub f :lvalue ($a = do { $x = "abc"; return substr($x,0,1)}) { .... } So this commit moves sub attributes to come before the signature. This is how they were originally, but they were swapped with v5.21.7-394-gabcf453. This commit is essentially a revert of that commit (and its followups v5.21.7-395-g71917f6, v5.21.7-421-g63ccd0d), plus some extra work for Deparse, and an extra test. See: RT #123069 for why they were originally swapped RT #132141 for why that broke :lvalue http://nntp.perl.org/group/perl.perl5.porters/247999 for a general discussion about RT #132141 --- lib/B/Deparse.pm | 22 +- lib/B/Deparse.t | 6 +- perly.act | 816 +++++++++++++++---------------- perly.h | 2 +- perly.tab | 1410 ++++++++++++++++++++++++++--------------------------- perly.y | 77 +-- pod/perlsub.pod | 33 +- t/op/signatures.t | 37 +- 8 files changed, 1171 insertions(+), 1232 deletions(-) diff --git a/lib/B/Deparse.pm b/lib/B/Deparse.pm index ab691c2..d110c97 100644 --- a/lib/B/Deparse.pm +++ b/lib/B/Deparse.pm @@ -1184,7 +1184,7 @@ sub pad_subs { # # Normally a bunch of argelem ops will have been generated by the # signature parsing, but it's possible that ops have been added manually -# or altered. In this case we "return ()" and fall back to general +# or altered. In this case we return "()" and fall back to general # deparsing of the individual sigelems as 'my $x = $_[N]' etc. # # We're only called if the first two ops are nextstate and argcheck. @@ -1275,13 +1275,14 @@ sub deparse_argops { # Deparse a sub. Returns everything except the 'sub foo', # e.g. ($$) : method { ...; } -# or ($a, $b) : prototype($$) lvalue; +# or : prototype($$) lvalue ($a, $b) { ...; }; sub deparse_sub { my $self = shift; my $cv = shift; my @attrs; - my $protosig; # prototype or signature (what goes in the (....)) + my $proto; + my $sig; Carp::confess("NULL in deparse_sub") if !defined($cv) || $cv->isa("B::NULL"); Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL"); @@ -1289,12 +1290,12 @@ Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL"); my $has_sig = $self->{hinthash}{feature_signatures}; if ($cv->FLAGS & SVf_POK) { - my $proto = $cv->PV; + my $myproto = $cv->PV; if ($has_sig) { - push @attrs, "prototype($proto)"; + push @attrs, "prototype($myproto)"; } else { - $protosig = $proto; + $proto = $myproto; } } if ($cv->CvFLAGS & (CVf_METHOD|CVf_LOCKED|CVf_LVALUE|CVf_ANONCONST)) { @@ -1326,10 +1327,10 @@ Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL"); and $$o2) { if ($o2->name eq 'argcheck') { - my ($nexto, $sig) = $self->deparse_argops($firstop, $cv); + my ($nexto, $mysig) = $self->deparse_argops($firstop, $cv); if (defined $nexto) { $firstop = $nexto; - $protosig = $sig; + $sig = $mysig; } } } @@ -1365,10 +1366,11 @@ Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL"); $body = ';' } } - $protosig = defined $protosig ? "($protosig) " : ""; + $proto = defined $proto ? "($proto) " : ""; + $sig = defined $sig ? "($sig) " : ""; my $attrs = ''; $attrs = ': ' . join('', map "$_ ", @attrs) if @attrs; - return "$protosig$attrs$body\n"; + return "$proto$attrs$sig$body\n"; } sub deparse_format { diff --git a/lib/B/Deparse.t b/lib/B/Deparse.t index cbee542..3219e19 100644 --- a/lib/B/Deparse.t +++ b/lib/B/Deparse.t @@ -2586,7 +2586,7 @@ $x++; no warnings; use feature 'signatures'; my $x; -sub ($a, $b) : prototype($$) { +my $f = sub : prototype($$) ($a, $b) { $x++; } ; @@ -2596,7 +2596,7 @@ $x++; no warnings; use feature 'signatures'; my $x; -sub ($a, $b) : prototype($$) lvalue { +my $f = sub : prototype($$) lvalue ($a, $b) { $x++; } ; @@ -2606,7 +2606,7 @@ $x++; no warnings; use feature 'signatures'; my $x; -sub ($a, $b) : lvalue method { +my $f = sub : lvalue method ($a, $b) { $x++; } ; diff --git a/perly.act b/perly.act index 082e4e7..ce4d13d 100644 --- a/perly.act +++ b/perly.act @@ -289,53 +289,6 @@ case 2: case 31: #line 310 "perly.y" /* yacc.c:1646 */ { - if ((ps[-1].val.opval)->op_type == OP_CONST) { - const char *const name = - SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv); - if (strEQ(name, "BEGIN") || strEQ(name, "END") - || strEQ(name, "INIT") || strEQ(name, "CHECK") - || strEQ(name, "UNITCHECK")) - CvSPECIAL_on(PL_compcv); - } - else - /* State subs inside anonymous subs need to be - clonable themselves. */ - if (CvANON(CvOUTSIDE(PL_compcv)) - || CvCLONE(CvOUTSIDE(PL_compcv)) - || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST( - CvOUTSIDE(PL_compcv) - ))[(ps[-1].val.opval)->op_targ])) - CvCLONE_on(PL_compcv); - parser->in_my = 0; - parser->in_my_stash = NULL; - } - - break; - - case 32: -#line 332 "perly.y" /* yacc.c:1646 */ - { - OP *body; - if (parser->copline > (line_t)(ps[-2].val.ival)) - parser->copline = (line_t)(ps[-2].val.ival); - body = block_end((ps[-5].val.ival), - op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval))); - - SvREFCNT_inc_simple_void(PL_compcv); - (ps[-8].val.opval)->op_type == OP_CONST - ? newATTRSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body) - : newMYSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body) - ; - (yyval.opval) = NULL; - intro_my(); - parser->parsed_sub = 1; - } - - break; - - case 33: -#line 349 "perly.y" /* yacc.c:1646 */ - { package((ps[-1].val.opval)); if ((ps[-2].val.opval)) package_version((ps[-2].val.opval)); @@ -344,14 +297,14 @@ case 2: break; - case 34: -#line 356 "perly.y" /* yacc.c:1646 */ + case 32: +#line 317 "perly.y" /* yacc.c:1646 */ { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } break; - case 35: -#line 358 "perly.y" /* yacc.c:1646 */ + case 33: +#line 319 "perly.y" /* yacc.c:1646 */ { SvREFCNT_inc_simple_void(PL_compcv); utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval)); @@ -361,8 +314,8 @@ case 2: break; - case 36: -#line 365 "perly.y" /* yacc.c:1646 */ + case 34: +#line 326 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-4].val.ival), newCONDOP(0, (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval))); @@ -371,8 +324,8 @@ case 2: break; - case 37: -#line 371 "perly.y" /* yacc.c:1646 */ + case 35: +#line 332 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-4].val.ival), newCONDOP(0, (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval)))); @@ -381,8 +334,8 @@ case 2: break; - case 38: -#line 377 "perly.y" /* yacc.c:1646 */ + case 36: +#line 338 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0)); parser->copline = (line_t)(ps[-5].val.ival); @@ -390,20 +343,20 @@ case 2: break; - case 39: -#line 382 "perly.y" /* yacc.c:1646 */ + case 37: +#line 343 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); } break; - case 40: -#line 384 "perly.y" /* yacc.c:1646 */ + case 38: +#line 345 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); } break; - case 41: -#line 386 "perly.y" /* yacc.c:1646 */ + case 39: +#line 347 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-5].val.ival), newWHILEOP(0, 1, NULL, @@ -413,8 +366,8 @@ case 2: break; - case 42: -#line 393 "perly.y" /* yacc.c:1646 */ + case 40: +#line 354 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-5].val.ival), newWHILEOP(0, 1, NULL, @@ -424,20 +377,20 @@ case 2: break; - case 43: -#line 400 "perly.y" /* yacc.c:1646 */ + case 41: +#line 361 "perly.y" /* yacc.c:1646 */ { parser->expect = XTERM; } break; - case 44: -#line 402 "perly.y" /* yacc.c:1646 */ + case 42: +#line 363 "perly.y" /* yacc.c:1646 */ { parser->expect = XTERM; } break; - case 45: -#line 405 "perly.y" /* yacc.c:1646 */ + case 43: +#line 366 "perly.y" /* yacc.c:1646 */ { OP *initop = (ps[-9].val.opval); OP *forop = newWHILEOP(0, 1, NULL, @@ -455,8 +408,8 @@ case 2: break; - case 46: -#line 420 "perly.y" /* yacc.c:1646 */ + case 44: +#line 381 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); parser->copline = (line_t)(ps[-8].val.ival); @@ -464,8 +417,8 @@ case 2: break; - case 47: -#line 425 "perly.y" /* yacc.c:1646 */ + case 45: +#line 386 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0, op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); @@ -474,14 +427,14 @@ case 2: break; - case 48: -#line 431 "perly.y" /* yacc.c:1646 */ + case 46: +#line 392 "perly.y" /* yacc.c:1646 */ { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); } break; - case 49: -#line 433 "perly.y" /* yacc.c:1646 */ + case 47: +#line 394 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end( (ps[-7].val.ival), @@ -497,8 +450,8 @@ case 2: break; - case 50: -#line 446 "perly.y" /* yacc.c:1646 */ + case 48: +#line 407 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-4].val.ival), newFOROP( 0, op_lvalue(newUNOP(OP_REFGEN, 0, @@ -509,8 +462,8 @@ case 2: break; - case 51: -#line 454 "perly.y" /* yacc.c:1646 */ + case 49: +#line 415 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); @@ -519,8 +472,8 @@ case 2: break; - case 52: -#line 460 "perly.y" /* yacc.c:1646 */ + case 50: +#line 421 "perly.y" /* yacc.c:1646 */ { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, NULL, @@ -529,8 +482,8 @@ case 2: break; - case 53: -#line 466 "perly.y" /* yacc.c:1646 */ + case 51: +#line 427 "perly.y" /* yacc.c:1646 */ { package((ps[-2].val.opval)); if ((ps[-3].val.opval)) { @@ -540,8 +493,8 @@ case 2: break; - case 54: -#line 473 "perly.y" /* yacc.c:1646 */ + case 52: +#line 434 "perly.y" /* yacc.c:1646 */ { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, NULL, @@ -552,16 +505,16 @@ case 2: break; - case 55: -#line 481 "perly.y" /* yacc.c:1646 */ + case 53: +#line 442 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[-1].val.opval); } break; - case 56: -#line 485 "perly.y" /* yacc.c:1646 */ + case 54: +#line 446 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -569,8 +522,8 @@ case 2: break; - case 57: -#line 490 "perly.y" /* yacc.c:1646 */ + case 55: +#line 451 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; parser->copline = NOLINE; @@ -578,8 +531,8 @@ case 2: break; - case 58: -#line 498 "perly.y" /* yacc.c:1646 */ + case 56: +#line 459 "perly.y" /* yacc.c:1646 */ { OP *list; if ((ps[0].val.opval)) { OP *term = (ps[0].val.opval); @@ -597,75 +550,75 @@ case 2: break; - case 59: -#line 515 "perly.y" /* yacc.c:1646 */ + case 57: +#line 476 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 60: -#line 517 "perly.y" /* yacc.c:1646 */ + case 58: +#line 478 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_unscope((ps[-1].val.opval)); } break; - case 61: -#line 522 "perly.y" /* yacc.c:1646 */ + case 59: +#line 483 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 62: -#line 524 "perly.y" /* yacc.c:1646 */ + case 60: +#line 485 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 63: -#line 526 "perly.y" /* yacc.c:1646 */ + case 61: +#line 487 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 64: -#line 528 "perly.y" /* yacc.c:1646 */ + case 62: +#line 489 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 65: -#line 530 "perly.y" /* yacc.c:1646 */ + case 63: +#line 491 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); } break; - case 66: -#line 532 "perly.y" /* yacc.c:1646 */ + case 64: +#line 493 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 67: -#line 534 "perly.y" /* yacc.c:1646 */ + case 65: +#line 495 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL); parser->copline = (line_t)(ps[-1].val.ival); } break; - case 68: -#line 537 "perly.y" /* yacc.c:1646 */ + case 66: +#line 498 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); } break; - case 69: -#line 542 "perly.y" /* yacc.c:1646 */ + case 67: +#line 503 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 70: -#line 544 "perly.y" /* yacc.c:1646 */ + case 68: +#line 505 "perly.y" /* yacc.c:1646 */ { ((ps[0].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[0].val.opval)); @@ -673,8 +626,8 @@ case 2: break; - case 71: -#line 549 "perly.y" /* yacc.c:1646 */ + case 69: +#line 510 "perly.y" /* yacc.c:1646 */ { parser->copline = (line_t)(ps[-5].val.ival); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)), @@ -684,153 +637,153 @@ case 2: break; - case 72: -#line 559 "perly.y" /* yacc.c:1646 */ + case 70: +#line 520 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 73: -#line 561 "perly.y" /* yacc.c:1646 */ + case 71: +#line 522 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_scope((ps[0].val.opval)); } break; - case 74: -#line 566 "perly.y" /* yacc.c:1646 */ + case 72: +#line 527 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); } break; - case 75: -#line 572 "perly.y" /* yacc.c:1646 */ + case 73: +#line 533 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 77: -#line 578 "perly.y" /* yacc.c:1646 */ + case 75: +#line 539 "perly.y" /* yacc.c:1646 */ { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; } break; - case 79: -#line 586 "perly.y" /* yacc.c:1646 */ + case 77: +#line 547 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = invert(scalar((ps[0].val.opval))); } break; - case 80: -#line 591 "perly.y" /* yacc.c:1646 */ + case 78: +#line 552 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); intro_my(); } break; - case 81: -#line 595 "perly.y" /* yacc.c:1646 */ + case 79: +#line 556 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); intro_my(); } break; - case 82: -#line 598 "perly.y" /* yacc.c:1646 */ + case 80: +#line 559 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 83: -#line 599 "perly.y" /* yacc.c:1646 */ + case 81: +#line 560 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 84: -#line 603 "perly.y" /* yacc.c:1646 */ + case 82: +#line 564 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); } break; - case 85: -#line 609 "perly.y" /* yacc.c:1646 */ + case 83: +#line 570 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); } break; - case 86: -#line 614 "perly.y" /* yacc.c:1646 */ + case 84: +#line 575 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); } break; - case 89: -#line 625 "perly.y" /* yacc.c:1646 */ + case 87: +#line 586 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 91: -#line 631 "perly.y" /* yacc.c:1646 */ + case 89: +#line 592 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 92: -#line 633 "perly.y" /* yacc.c:1646 */ + case 90: +#line 594 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 93: -#line 635 "perly.y" /* yacc.c:1646 */ + case 91: +#line 596 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 94: -#line 640 "perly.y" /* yacc.c:1646 */ + case 92: +#line 601 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 95: -#line 642 "perly.y" /* yacc.c:1646 */ + case 93: +#line 603 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 96: -#line 653 "perly.y" /* yacc.c:1646 */ + case 94: +#line 614 "perly.y" /* yacc.c:1646 */ { parser->in_my = 0; (yyval.opval) = NULL; } break; - case 97: -#line 655 "perly.y" /* yacc.c:1646 */ + case 95: +#line 616 "perly.y" /* yacc.c:1646 */ { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); } break; - case 98: -#line 660 "perly.y" /* yacc.c:1646 */ + case 96: +#line 621 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = '@'; } break; - case 99: -#line 662 "perly.y" /* yacc.c:1646 */ + case 97: +#line 623 "perly.y" /* yacc.c:1646 */ { (yyval.ival) = '%'; } break; - case 100: -#line 666 "perly.y" /* yacc.c:1646 */ + case 98: +#line 627 "perly.y" /* yacc.c:1646 */ { I32 sigil = (ps[-2].val.ival); OP *var = (ps[-1].val.opval); @@ -849,26 +802,26 @@ case 2: break; - case 101: -#line 685 "perly.y" /* yacc.c:1646 */ + case 99: +#line 646 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 102: -#line 687 "perly.y" /* yacc.c:1646 */ + case 100: +#line 648 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP(OP_NULL, 0); } break; - case 103: -#line 689 "perly.y" /* yacc.c:1646 */ + case 101: +#line 650 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 104: -#line 695 "perly.y" /* yacc.c:1646 */ + case 102: +#line 656 "perly.y" /* yacc.c:1646 */ { OP *var = (ps[-1].val.opval); OP *defexpr = (ps[0].val.opval); @@ -932,52 +885,58 @@ case 2: break; - case 105: -#line 760 "perly.y" /* yacc.c:1646 */ + case 103: +#line 721 "perly.y" /* yacc.c:1646 */ { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; - case 106: -#line 762 "perly.y" /* yacc.c:1646 */ + case 104: +#line 723 "perly.y" /* yacc.c:1646 */ { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; - case 107: -#line 768 "perly.y" /* yacc.c:1646 */ + case 105: +#line 729 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[-1].val.opval); } break; - case 108: -#line 770 "perly.y" /* yacc.c:1646 */ + case 106: +#line 731 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 109: -#line 774 "perly.y" /* yacc.c:1646 */ + case 107: +#line 735 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 110: -#line 779 "perly.y" /* yacc.c:1646 */ + case 108: +#line 740 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 111: -#line 781 "perly.y" /* yacc.c:1646 */ + case 109: +#line 742 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 112: -#line 785 "perly.y" /* yacc.c:1646 */ + case 110: +#line 745 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = (OP*)NULL; } + + break; + + case 111: +#line 747 "perly.y" /* yacc.c:1646 */ { ENTER; SAVEIV(parser->sig_elems); @@ -991,16 +950,16 @@ case 2: break; - case 113: -#line 797 "perly.y" /* yacc.c:1646 */ + case 112: +#line 759 "perly.y" /* yacc.c:1646 */ { OP *sigops = (ps[-1].val.opval); UNOP_AUX_item *aux; OP *check; - if (!parser->error_count) { - assert(FEATURE_SIGNATURES_IS_ENABLED); - } + if (!FEATURE_SIGNATURES_IS_ENABLED) + Perl_croak(aTHX_ "Experimental " + "subroutine signatures not enabled"); /* We shouldn't get here otherwise */ Perl_ck_warner_d(aTHX_ @@ -1024,44 +983,61 @@ case 2: newSTATEOP(0, NULL, NULL)); parser->in_my = 0; - parser->expect = XATTRBLOCK; + parser->expect = XBLOCK; LEAVE; } break; + case 113: +#line 798 "perly.y" /* yacc.c:1646 */ + { + if (parser->copline > (line_t)(ps[-2].val.ival)) + parser->copline = (line_t)(ps[-2].val.ival); + (yyval.opval) = block_end((ps[-4].val.ival), + op_append_list(OP_LINESEQ, (ps[-3].val.opval), (ps[-1].val.opval))); + } + + break; + + case 114: +#line 808 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = (ps[0].val.opval); } + + break; + case 115: -#line 837 "perly.y" /* yacc.c:1646 */ +#line 809 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; case 116: -#line 842 "perly.y" /* yacc.c:1646 */ +#line 814 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 117: -#line 844 "perly.y" /* yacc.c:1646 */ +#line 816 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 118: -#line 846 "perly.y" /* yacc.c:1646 */ +#line 818 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 120: -#line 852 "perly.y" /* yacc.c:1646 */ +#line 824 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[-1].val.opval); } break; case 121: -#line 854 "perly.y" /* yacc.c:1646 */ +#line 826 "perly.y" /* yacc.c:1646 */ { OP* term = (ps[0].val.opval); (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term); @@ -1070,7 +1046,7 @@ case 2: break; case 123: -#line 863 "perly.y" /* yacc.c:1646 */ +#line 835 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) ); } @@ -1078,7 +1054,7 @@ case 2: break; case 124: -#line 867 "perly.y" /* yacc.c:1646 */ +#line 839 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) ); } @@ -1086,7 +1062,7 @@ case 2: break; case 125: -#line 871 "perly.y" /* yacc.c:1646 */ +#line 843 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)), @@ -1096,7 +1072,7 @@ case 2: break; case 126: -#line 877 "perly.y" /* yacc.c:1646 */ +#line 849 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[-2].val.opval)), newMETHOP(OP_METHOD, 0, (ps[0].val.opval)))); @@ -1105,7 +1081,7 @@ case 2: break; case 127: -#line 882 "perly.y" /* yacc.c:1646 */ +#line 854 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), @@ -1115,7 +1091,7 @@ case 2: break; case 128: -#line 888 "perly.y" /* yacc.c:1646 */ +#line 860 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)), @@ -1125,26 +1101,26 @@ case 2: break; case 129: -#line 894 "perly.y" /* yacc.c:1646 */ +#line 866 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; case 130: -#line 896 "perly.y" /* yacc.c:1646 */ +#line 868 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; case 131: -#line 898 "perly.y" /* yacc.c:1646 */ +#line 870 "perly.y" /* yacc.c:1646 */ { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); } break; case 132: -#line 901 "perly.y" /* yacc.c:1646 */ +#line 873 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval))); @@ -1153,20 +1129,20 @@ case 2: break; case 135: -#line 916 "perly.y" /* yacc.c:1646 */ +#line 888 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); } break; case 136: -#line 918 "perly.y" /* yacc.c:1646 */ +#line 890 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval))); } break; case 137: -#line 921 "perly.y" /* yacc.c:1646 */ +#line 893 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-4].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1175,7 +1151,7 @@ case 2: break; case 138: -#line 926 "perly.y" /* yacc.c:1646 */ +#line 898 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-3].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1184,14 +1160,14 @@ case 2: break; case 139: -#line 931 "perly.y" /* yacc.c:1646 */ +#line 903 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval))); } break; case 140: -#line 934 "perly.y" /* yacc.c:1646 */ +#line 906 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-5].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } @@ -1199,7 +1175,7 @@ case 2: break; case 141: -#line 938 "perly.y" /* yacc.c:1646 */ +#line 910 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-4].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } @@ -1207,7 +1183,7 @@ case 2: break; case 142: -#line 942 "perly.y" /* yacc.c:1646 */ +#line 914 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-3].val.opval)))); if (parser->expect == XBLOCK) @@ -1217,7 +1193,7 @@ case 2: break; case 143: -#line 948 "perly.y" /* yacc.c:1646 */ +#line 920 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), newCVREF(0, scalar((ps[-4].val.opval))))); @@ -1228,7 +1204,7 @@ case 2: break; case 144: -#line 956 "perly.y" /* yacc.c:1646 */ +#line 928 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), newCVREF(0, scalar((ps[-3].val.opval))))); @@ -1239,7 +1215,7 @@ case 2: break; case 145: -#line 963 "perly.y" /* yacc.c:1646 */ +#line 935 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-2].val.opval)))); if (parser->expect == XBLOCK) @@ -1249,37 +1225,37 @@ case 2: break; case 146: -#line 969 "perly.y" /* yacc.c:1646 */ +#line 941 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); } break; case 147: -#line 971 "perly.y" /* yacc.c:1646 */ +#line 943 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); } break; case 148: -#line 973 "perly.y" /* yacc.c:1646 */ +#line 945 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); } break; case 149: -#line 978 "perly.y" /* yacc.c:1646 */ +#line 950 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); } break; case 150: -#line 980 "perly.y" /* yacc.c:1646 */ +#line 952 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 151: -#line 982 "perly.y" /* yacc.c:1646 */ +#line 954 "perly.y" /* yacc.c:1646 */ { if ((ps[-1].val.ival) != OP_REPEAT) scalar((ps[-2].val.opval)); (yyval.opval) = newBINOP((ps[-1].val.ival), 0, (ps[-2].val.opval), scalar((ps[0].val.opval))); @@ -1288,111 +1264,111 @@ case 2: break; case 152: -#line 987 "perly.y" /* yacc.c:1646 */ +#line 959 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 153: -#line 989 "perly.y" /* yacc.c:1646 */ +#line 961 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 154: -#line 991 "perly.y" /* yacc.c:1646 */ +#line 963 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 155: -#line 993 "perly.y" /* yacc.c:1646 */ +#line 965 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 156: -#line 995 "perly.y" /* yacc.c:1646 */ +#line 967 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 157: -#line 997 "perly.y" /* yacc.c:1646 */ +#line 969 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 158: -#line 999 "perly.y" /* yacc.c:1646 */ +#line 971 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 159: -#line 1001 "perly.y" /* yacc.c:1646 */ +#line 973 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 160: -#line 1003 "perly.y" /* yacc.c:1646 */ +#line 975 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 161: -#line 1005 "perly.y" /* yacc.c:1646 */ +#line 977 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 162: -#line 1007 "perly.y" /* yacc.c:1646 */ +#line 979 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 163: -#line 1012 "perly.y" /* yacc.c:1646 */ +#line 984 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); } break; case 164: -#line 1014 "perly.y" /* yacc.c:1646 */ +#line 986 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; case 165: -#line 1017 "perly.y" /* yacc.c:1646 */ +#line 989 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; case 166: -#line 1019 "perly.y" /* yacc.c:1646 */ +#line 991 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); } break; case 167: -#line 1021 "perly.y" /* yacc.c:1646 */ +#line 993 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); } break; case 168: -#line 1024 "perly.y" /* yacc.c:1646 */ +#line 996 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));} break; case 169: -#line 1027 "perly.y" /* yacc.c:1646 */ +#line 999 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_convert_list(OP_JOIN, 0, op_append_elem( OP_LIST, @@ -1407,162 +1383,148 @@ case 2: break; case 170: -#line 1038 "perly.y" /* yacc.c:1646 */ +#line 1010 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); } break; case 171: -#line 1041 "perly.y" /* yacc.c:1646 */ +#line 1013 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); } break; case 172: -#line 1048 "perly.y" /* yacc.c:1646 */ +#line 1020 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newANONLIST((ps[-1].val.opval)); } break; case 173: -#line 1050 "perly.y" /* yacc.c:1646 */ +#line 1022 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newANONLIST(NULL);} break; case 174: -#line 1052 "perly.y" /* yacc.c:1646 */ +#line 1024 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newANONHASH((ps[-2].val.opval)); } break; case 175: -#line 1054 "perly.y" /* yacc.c:1646 */ +#line 1026 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newANONHASH(NULL); } break; case 176: -#line 1056 "perly.y" /* yacc.c:1646 */ +#line 1028 "perly.y" /* yacc.c:1646 */ { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); } break; case 177: -#line 1059 "perly.y" /* yacc.c:1646 */ - { - OP *body; - if (parser->copline > (line_t)(ps[-2].val.ival)) - parser->copline = (line_t)(ps[-2].val.ival); - body = block_end((ps[-5].val.ival), - op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval))); - SvREFCNT_inc_simple_void(PL_compcv); - (yyval.opval) = newANONATTRSUB((ps[-6].val.ival), NULL, (ps[-3].val.opval), body); - } +#line 1034 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));} break; case 178: -#line 1073 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));} +#line 1036 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));} break; - case 179: -#line 1075 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));} + case 183: +#line 1044 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 184: -#line 1083 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); } +#line 1046 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); } break; case 185: -#line 1085 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); } +#line 1048 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); } break; case 186: -#line 1087 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); } +#line 1050 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = (ps[0].val.opval); } break; case 187: -#line 1089 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = (ps[0].val.opval); } +#line 1052 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = localize((ps[0].val.opval),0); } break; case 188: -#line 1091 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = localize((ps[0].val.opval),0); } +#line 1054 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; case 189: -#line 1093 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = sawparens((ps[-1].val.opval)); } +#line 1056 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = (ps[0].val.opval); } break; case 190: -#line 1095 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = (ps[0].val.opval); } +#line 1058 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = sawparens(newNULLLIST()); } break; case 191: -#line 1097 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = sawparens(newNULLLIST()); } +#line 1060 "perly.y" /* yacc.c:1646 */ + { (yyval.opval) = (ps[0].val.opval); } break; case 192: -#line 1099 "perly.y" /* yacc.c:1646 */ +#line 1062 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; case 193: -#line 1101 "perly.y" /* yacc.c:1646 */ +#line 1064 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; case 194: -#line 1103 "perly.y" /* yacc.c:1646 */ +#line 1066 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; case 195: -#line 1105 "perly.y" /* yacc.c:1646 */ - { (yyval.opval) = (ps[0].val.opval); } - - break; - - case 196: -#line 1107 "perly.y" /* yacc.c:1646 */ +#line 1068 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));} break; - case 197: -#line 1109 "perly.y" /* yacc.c:1646 */ + case 196: +#line 1070 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 198: -#line 1111 "perly.y" /* yacc.c:1646 */ + case 197: +#line 1072 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1575,8 +1537,8 @@ case 2: break; - case 199: -#line 1121 "perly.y" /* yacc.c:1646 */ + case 198: +#line 1082 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_prepend_elem(OP_KVASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVASLICE, 0, @@ -1589,8 +1551,8 @@ case 2: break; - case 200: -#line 1131 "perly.y" /* yacc.c:1646 */ + case 199: +#line 1092 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1603,8 +1565,8 @@ case 2: break; - case 201: -#line 1141 "perly.y" /* yacc.c:1646 */ + case 200: +#line 1102 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_prepend_elem(OP_KVHSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVHSLICE, 0, @@ -1617,27 +1579,27 @@ case 2: break; - case 202: -#line 1151 "perly.y" /* yacc.c:1646 */ + case 201: +#line 1112 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 203: -#line 1153 "perly.y" /* yacc.c:1646 */ + case 202: +#line 1114 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); } break; - case 204: -#line 1155 "perly.y" /* yacc.c:1646 */ + case 203: +#line 1116 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval))); } break; - case 205: -#line 1158 "perly.y" /* yacc.c:1646 */ + case 204: +#line 1119 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval)))); @@ -1645,153 +1607,153 @@ case 2: break; - case 206: -#line 1163 "perly.y" /* yacc.c:1646 */ + case 205: +#line 1124 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); } break; - case 207: -#line 1167 "perly.y" /* yacc.c:1646 */ + case 206: +#line 1128 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newSVREF((ps[-3].val.opval)); } break; - case 208: -#line 1169 "perly.y" /* yacc.c:1646 */ + case 207: +#line 1130 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; - case 209: -#line 1171 "perly.y" /* yacc.c:1646 */ + case 208: +#line 1132 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newHVREF((ps[-3].val.opval)); } break; - case 210: -#line 1173 "perly.y" /* yacc.c:1646 */ + case 209: +#line 1134 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); } break; - case 211: -#line 1176 "perly.y" /* yacc.c:1646 */ + case 210: +#line 1137 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); } break; - case 212: -#line 1178 "perly.y" /* yacc.c:1646 */ + case 211: +#line 1139 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; } break; - case 213: -#line 1181 "perly.y" /* yacc.c:1646 */ + case 212: +#line 1142 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); } break; - case 214: -#line 1183 "perly.y" /* yacc.c:1646 */ + case 213: +#line 1144 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; - case 215: -#line 1185 "perly.y" /* yacc.c:1646 */ + case 214: +#line 1146 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; - case 216: -#line 1187 "perly.y" /* yacc.c:1646 */ + case 215: +#line 1148 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; - case 217: -#line 1189 "perly.y" /* yacc.c:1646 */ + case 216: +#line 1150 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; - case 218: -#line 1191 "perly.y" /* yacc.c:1646 */ + case 217: +#line 1152 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); } break; - case 219: -#line 1193 "perly.y" /* yacc.c:1646 */ + case 218: +#line 1154 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); } break; - case 220: -#line 1195 "perly.y" /* yacc.c:1646 */ + case 219: +#line 1156 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; - case 221: -#line 1197 "perly.y" /* yacc.c:1646 */ + case 220: +#line 1158 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); } break; - case 222: -#line 1200 "perly.y" /* yacc.c:1646 */ + case 221: +#line 1161 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; - case 223: -#line 1202 "perly.y" /* yacc.c:1646 */ + case 222: +#line 1163 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newOP((ps[-2].val.ival), 0);} break; - case 224: -#line 1204 "perly.y" /* yacc.c:1646 */ + case 223: +#line 1165 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 225: -#line 1206 "perly.y" /* yacc.c:1646 */ + case 224: +#line 1167 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[-2].val.opval); } break; - case 226: -#line 1208 "perly.y" /* yacc.c:1646 */ + case 225: +#line 1169 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; - case 227: -#line 1210 "perly.y" /* yacc.c:1646 */ + case 226: +#line 1171 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = ((ps[-2].val.ival) == OP_NOT) ? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0))) : newOP((ps[-2].val.ival), OPf_SPECIAL); } break; - case 228: -#line 1214 "perly.y" /* yacc.c:1646 */ + case 227: +#line 1175 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; - case 229: -#line 1216 "perly.y" /* yacc.c:1646 */ + case 228: +#line 1177 "perly.y" /* yacc.c:1646 */ { if ( (ps[0].val.opval)->op_type != OP_TRANS && (ps[0].val.opval)->op_type != OP_TRANSR @@ -1805,186 +1767,186 @@ case 2: break; - case 230: -#line 1227 "perly.y" /* yacc.c:1646 */ + case 229: +#line 1188 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); } break; - case 234: -#line 1235 "perly.y" /* yacc.c:1646 */ + case 233: +#line 1196 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); } break; - case 235: -#line 1237 "perly.y" /* yacc.c:1646 */ + case 234: +#line 1198 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = localize((ps[0].val.opval),1); } break; - case 236: -#line 1239 "perly.y" /* yacc.c:1646 */ + case 235: +#line 1200 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); } break; - case 237: -#line 1244 "perly.y" /* yacc.c:1646 */ + case 236: +#line 1205 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; - case 238: -#line 1246 "perly.y" /* yacc.c:1646 */ + case 237: +#line 1207 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = sawparens(newNULLLIST()); } break; - case 239: -#line 1249 "perly.y" /* yacc.c:1646 */ + case 238: +#line 1210 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 240: -#line 1251 "perly.y" /* yacc.c:1646 */ + case 239: +#line 1212 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 241: -#line 1253 "perly.y" /* yacc.c:1646 */ + case 240: +#line 1214 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 242: -#line 1258 "perly.y" /* yacc.c:1646 */ + case 241: +#line 1219 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 243: -#line 1260 "perly.y" /* yacc.c:1646 */ + case 242: +#line 1221 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 244: -#line 1264 "perly.y" /* yacc.c:1646 */ + case 243: +#line 1225 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 245: -#line 1266 "perly.y" /* yacc.c:1646 */ + case 244: +#line 1227 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 246: -#line 1270 "perly.y" /* yacc.c:1646 */ + case 245: +#line 1231 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = NULL; } break; - case 247: -#line 1272 "perly.y" /* yacc.c:1646 */ + case 246: +#line 1233 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; - case 248: -#line 1278 "perly.y" /* yacc.c:1646 */ + case 247: +#line 1239 "perly.y" /* yacc.c:1646 */ { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); } break; - case 256: -#line 1295 "perly.y" /* yacc.c:1646 */ + case 255: +#line 1256 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); } break; - case 257: -#line 1299 "perly.y" /* yacc.c:1646 */ + case 256: +#line 1260 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newSVREF((ps[0].val.opval)); } break; - case 258: -#line 1303 "perly.y" /* yacc.c:1646 */ + case 257: +#line 1264 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newAVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } break; - case 259: -#line 1309 "perly.y" /* yacc.c:1646 */ + case 258: +#line 1270 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newHVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } break; - case 260: -#line 1315 "perly.y" /* yacc.c:1646 */ + case 259: +#line 1276 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newAVREF((ps[0].val.opval)); } break; - case 261: -#line 1317 "perly.y" /* yacc.c:1646 */ + case 260: +#line 1278 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; - case 262: -#line 1321 "perly.y" /* yacc.c:1646 */ + case 261: +#line 1282 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); } break; - case 264: -#line 1326 "perly.y" /* yacc.c:1646 */ + case 263: +#line 1287 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newAVREF((ps[-2].val.opval)); } break; - case 266: -#line 1331 "perly.y" /* yacc.c:1646 */ + case 265: +#line 1292 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newHVREF((ps[-2].val.opval)); } break; - case 268: -#line 1336 "perly.y" /* yacc.c:1646 */ + case 267: +#line 1297 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); } break; - case 269: -#line 1341 "perly.y" /* yacc.c:1646 */ + case 268: +#line 1302 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = scalar((ps[0].val.opval)); } break; - case 270: -#line 1343 "perly.y" /* yacc.c:1646 */ + case 269: +#line 1304 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = scalar((ps[0].val.opval)); } break; - case 271: -#line 1345 "perly.y" /* yacc.c:1646 */ + case 270: +#line 1306 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = op_scope((ps[0].val.opval)); } break; - case 272: -#line 1348 "perly.y" /* yacc.c:1646 */ + case 271: +#line 1309 "perly.y" /* yacc.c:1646 */ { (yyval.opval) = (ps[0].val.opval); } break; @@ -1995,6 +1957,6 @@ case 2: /* Generated from: - * fca93dc4b6a371876339e9ad458685bd6fe71cfe326ff40ea9c78a9acf02da64 perly.y + * c85e1793baa49bfdf6f1329f04fd8b57a616cfc2f5dce01702d3d727f6511157 perly.y * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl * ex: set ro: */ diff --git a/perly.h b/perly.h index 7339a15..d5841af 100644 --- a/perly.h +++ b/perly.h @@ -181,6 +181,6 @@ int yyparse (void); /* Generated from: - * fca93dc4b6a371876339e9ad458685bd6fe71cfe326ff40ea9c78a9acf02da64 perly.y + * c85e1793baa49bfdf6f1329f04fd8b57a616cfc2f5dce01702d3d727f6511157 perly.y * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl * ex: set ro: */ diff --git a/perly.tab b/perly.tab index 696e4c4..521461f 100644 --- a/perly.tab +++ b/perly.tab @@ -6,16 +6,16 @@ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3096 +#define YYLAST 2985 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 105 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 86 /* YYNRULES -- Number of rules. */ -#define YYNRULES 272 +#define YYNRULES 271 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 540 +#define YYNSTATES 532 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -72,31 +72,31 @@ static const yytype_uint16 yyrline[] = 0, 118, 118, 117, 129, 128, 139, 138, 152, 151, 165, 164, 178, 177, 190, 198, 206, 210, 218, 224, 225, 235, 236, 245, 249, 253, 257, 264, 266, 277, - 276, 310, 309, 348, 356, 355, 364, 370, 376, 381, - 383, 385, 392, 400, 402, 399, 419, 424, 431, 430, - 445, 453, 459, 466, 465, 480, 484, 489, 497, 515, - 516, 521, 523, 525, 527, 529, 531, 533, 536, 542, - 543, 548, 559, 560, 566, 572, 573, 578, 581, 585, - 590, 594, 598, 599, 603, 609, 614, 619, 620, 625, - 626, 631, 632, 634, 639, 641, 653, 654, 659, 661, - 665, 685, 686, 688, 694, 759, 761, 767, 769, 773, - 779, 780, 785, 784, 836, 837, 841, 843, 845, 847, - 851, 853, 858, 862, 866, 870, 876, 881, 887, 893, - 895, 898, 897, 908, 909, 913, 917, 920, 925, 930, - 933, 937, 941, 947, 955, 962, 968, 970, 972, 977, - 979, 981, 986, 988, 990, 992, 994, 996, 998, 1000, - 1002, 1004, 1006, 1011, 1013, 1016, 1018, 1020, 1023, 1026, - 1037, 1040, 1047, 1049, 1051, 1053, 1055, 1058, 1072, 1074, - 1078, 1079, 1080, 1081, 1082, 1084, 1086, 1088, 1090, 1092, - 1094, 1096, 1098, 1100, 1102, 1104, 1106, 1108, 1110, 1120, - 1130, 1140, 1150, 1152, 1154, 1157, 1162, 1166, 1168, 1170, - 1172, 1175, 1177, 1180, 1182, 1184, 1186, 1188, 1190, 1192, - 1194, 1196, 1199, 1201, 1203, 1205, 1207, 1209, 1213, 1216, - 1215, 1228, 1229, 1230, 1234, 1236, 1238, 1243, 1245, 1248, - 1250, 1252, 1257, 1259, 1264, 1265, 1270, 1271, 1277, 1281, - 1282, 1283, 1286, 1287, 1290, 1291, 1294, 1298, 1302, 1308, - 1314, 1316, 1320, 1324, 1325, 1329, 1330, 1334, 1335, 1340, - 1342, 1344, 1347 + 276, 309, 317, 316, 325, 331, 337, 342, 344, 346, + 353, 361, 363, 360, 380, 385, 392, 391, 406, 414, + 420, 427, 426, 441, 445, 450, 458, 476, 477, 482, + 484, 486, 488, 490, 492, 494, 497, 503, 504, 509, + 520, 521, 527, 533, 534, 539, 542, 546, 551, 555, + 559, 560, 564, 570, 575, 580, 581, 586, 587, 592, + 593, 595, 600, 602, 614, 615, 620, 622, 626, 646, + 647, 649, 655, 720, 722, 728, 730, 734, 740, 741, + 745, 747, 746, 797, 808, 809, 813, 815, 817, 819, + 823, 825, 830, 834, 838, 842, 848, 853, 859, 865, + 867, 870, 869, 880, 881, 885, 889, 892, 897, 902, + 905, 909, 913, 919, 927, 934, 940, 942, 944, 949, + 951, 953, 958, 960, 962, 964, 966, 968, 970, 972, + 974, 976, 978, 983, 985, 988, 990, 992, 995, 998, + 1009, 1012, 1019, 1021, 1023, 1025, 1027, 1033, 1035, 1039, + 1040, 1041, 1042, 1043, 1045, 1047, 1049, 1051, 1053, 1055, + 1057, 1059, 1061, 1063, 1065, 1067, 1069, 1071, 1081, 1091, + 1101, 1111, 1113, 1115, 1118, 1123, 1127, 1129, 1131, 1133, + 1136, 1138, 1141, 1143, 1145, 1147, 1149, 1151, 1153, 1155, + 1157, 1160, 1162, 1164, 1166, 1168, 1170, 1174, 1177, 1176, + 1189, 1190, 1191, 1195, 1197, 1199, 1204, 1206, 1209, 1211, + 1213, 1218, 1220, 1225, 1226, 1231, 1232, 1238, 1242, 1243, + 1244, 1247, 1248, 1251, 1252, 1255, 1259, 1263, 1269, 1275, + 1277, 1281, 1285, 1286, 1290, 1291, 1295, 1296, 1301, 1303, + 1305, 1308 }; #endif @@ -122,18 +122,18 @@ static const char *const yytname[] = "ARROW", "')'", "'('", "';'", "'$'", "'*'", "'/'", "$accept", "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "block", "formblock", "remember", "mblock", "mremember", "stmtseq", "formstmtseq", "fullstmt", - "labfullstmt", "barestmt", "$@7", "$@8", "$@9", "$@10", "$@11", "@12", - "$@13", "formline", "formarg", "sideff", "else", "cont", "mintro", - "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "formname", "startsub", + "labfullstmt", "barestmt", "$@7", "$@8", "$@9", "$@10", "@11", "$@12", + "formline", "formarg", "sideff", "else", "cont", "mintro", "nexpr", + "texpr", "iexpr", "mexpr", "mnexpr", "formname", "startsub", "startanonsub", "startformsub", "subname", "proto", "subattrlist", "myattrlist", "sigvarname", "sigslurpsigil", "sigslurpelem", "sigdefault", "sigscalarelem", "sigelem", "siglist", "siglistornull", - "subsignature", "$@14", "optsubbody", "expr", "listexpr", "listop", - "@15", "method", "subscripted", "termbinop", "termunop", "anonymous", - "termdo", "term", "@16", "myattrterm", "myterm", "optlistexpr", - "optexpr", "optrepl", "my_scalar", "my_var", "refgen_topic", "my_refgen", - "amper", "scalar", "ary", "hsh", "arylen", "star", "sliceme", "kvslice", - "gelem", "indirob", YY_NULLPTR + "subsignature", "$@13", "realsubbody", "optsubbody", "expr", "listexpr", + "listop", "@14", "method", "subscripted", "termbinop", "termunop", + "anonymous", "termdo", "term", "@15", "myattrterm", "myterm", + "optlistexpr", "optexpr", "optrepl", "my_scalar", "my_var", + "refgen_topic", "my_refgen", "amper", "scalar", "ary", "hsh", "arylen", + "star", "sliceme", "kvslice", "gelem", "indirob", YY_NULLPTR }; #endif @@ -156,74 +156,74 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -455 +#define YYPACT_NINF -431 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-455))) + (!!((Yystate) == (-431))) -#define YYTABLE_NINF -268 +#define YYTABLE_NINF -267 #define yytable_value_is_error(Yytable_value) \ - (!!((Yytable_value) == (-268))) + (!!((Yytable_value) == (-267))) /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const yytype_int16 yypact[] = { - 805, -455, -455, -455, -455, -455, -455, 18, -455, 2795, - 19, 1487, 1392, -455, -455, -455, 1958, 2795, 2795, 32, - 32, 32, -455, 32, 32, -455, -455, 35, -47, -455, - 2795, -455, -455, -455, 2795, -42, -28, -7, 1865, 1770, - 32, 1865, 2051, 58, 2795, 133, 2795, 2795, 2795, 2795, - 2795, 2795, 2795, 2144, 32, 32, 394, 8, -455, 5, - -455, -455, -455, -455, 2956, -455, -455, -3, 45, 51, - 59, -455, 85, 126, 269, 108, -455, -455, -455, -455, - -455, 58, 98, -455, 26, 44, 50, 57, 337, 62, - 75, 19, 31, -455, 82, -455, 88, 2049, 1392, -455, - -455, -455, 632, 727, -455, 33, 412, 412, -455, -455, - -455, -455, -455, -455, -455, 2795, 90, 115, 2795, 46, - 500, 19, 16, 2956, 117, 2237, 1770, -455, 500, 530, - 8, -455, 454, 2795, -455, -455, 500, 213, 184, -455, - -455, 2795, 500, 2888, 2330, 162, -455, -455, -455, 500, - 8, 412, 412, 412, 504, 504, 223, 214, -455, -455, - 2795, 2795, 2795, 2795, 2795, 2795, 2423, 2795, 2795, 2795, - 2795, 2795, 2795, 2795, 2795, 2795, 2795, 2795, 2795, 2795, - 2795, 2795, -455, -455, -455, 312, 2516, 2795, 2795, 2795, - 2795, 2795, 2795, 2795, -455, 221, -455, 224, -455, -455, - -455, -455, -455, 158, 72, -455, -455, 168, -455, -455, - -455, -455, 19, -455, -455, 2795, 2795, 2795, 2795, 2795, - 2795, -455, -455, -455, -455, -455, 2795, 2795, 49, -455, - -455, -455, 174, 212, -455, -455, 424, 166, 2795, 8, - -455, 265, -455, 2609, 412, 162, 167, 208, 239, -455, - 445, 267, -455, 2795, 282, 220, 220, -455, 2956, 292, - 55, -455, 545, 1569, 487, 1848, 709, 290, 2956, 2914, - 389, 389, 1660, 1755, 1941, 311, 412, 412, 2795, 2795, - 194, 200, 204, -455, 215, 2702, 12, 227, 209, -455, - -455, 602, 356, 67, 369, 78, 378, 165, 416, 822, - -455, 308, 235, -2, 319, 2795, 2795, 2795, 2795, -455, - 229, -455, -455, 240, -455, -455, -455, -455, 1581, 7, - -455, 2795, 2795, -455, 394, -455, 394, 394, 394, 394, - 394, 245, -60, -455, 2795, -455, 212, 329, 19, -455, - -455, 617, -455, 15, 630, -455, -455, -455, 179, 2795, - 335, -455, -455, 2795, 492, 196, -455, -455, -455, -455, - -455, 638, -455, -455, 2795, -455, 344, -455, 345, -455, - 347, -455, 349, -455, -455, -455, 350, -455, -455, -455, - 340, 277, 394, 284, 285, 394, 293, 281, -455, -455, - -455, -455, 300, 288, 322, -455, 2795, 301, 303, -455, - 2795, 314, -455, 9, 402, -455, -455, -455, 27, -455, - 231, -455, 2998, 406, -455, -455, 318, -455, -455, -455, - -455, 321, 212, 174, -455, 2795, -455, -455, 410, 410, - 2795, 2795, 410, -455, 320, 324, 410, 410, 394, -455, - -455, -455, 407, 407, -455, -455, -455, 358, 328, -455, - -455, -455, -455, 362, 2, 212, -455, 339, 410, 410, - -455, 38, 38, 346, 357, 82, 2795, 2795, 410, -455, - -455, -455, 360, 360, 9, -455, 917, -455, -455, -455, - -455, 427, 1012, -455, 82, 82, -455, 410, 355, -455, - -455, 410, 410, -455, 361, 359, 82, 2795, -455, -455, - -455, -455, -10, -455, -455, -455, -455, 1107, -455, 2795, - 82, 82, -455, 410, -455, 2956, 376, 440, -455, 1202, - -455, 379, -455, -455, -455, 82, -455, -455, -455, -455, - 410, 1675, -455, 1297, 38, 381, -455, -455, 410, -455 + 737, -431, -431, -431, -431, -431, -431, 51, -431, 2726, + 58, 1418, 1323, -431, -431, -431, 1889, 2726, 2726, 1, + 1, 1, -431, 1, 1, -431, -431, 54, -82, -431, + 2726, -431, -431, -431, 2726, -24, -23, -9, 1796, 1701, + 1, 1796, 1982, 74, 2726, 171, 2726, 2726, 2726, 2726, + 2726, 2726, 2726, 2075, 1, 1, 267, 23, -431, 13, + -431, -431, -431, -431, 340, -431, -431, 8, 135, 140, + 248, -431, 110, 288, 291, 114, -431, -431, -431, -431, + -431, 74, 106, -431, 34, 43, 83, 88, 203, 97, + 98, 58, 103, -431, 160, -431, 141, 368, 1323, -431, + -431, -431, 658, 753, -431, 66, 493, 493, -431, -431, + -431, -431, -431, -431, -431, 2726, 131, 143, 2726, 154, + 526, 58, 242, 340, 173, 2168, 1701, -431, 526, 556, + 23, -431, 480, 2726, -431, -431, 526, 272, 116, -431, + -431, 2726, 526, 2819, 2261, 218, -431, -431, -431, 526, + 23, 493, 493, 493, 376, 376, 280, 56, -431, -431, + 2726, 2726, 2726, 2726, 2726, 2726, 2354, 2726, 2726, 2726, + 2726, 2726, 2726, 2726, 2726, 2726, 2726, 2726, 2726, 2726, + 2726, 2726, -431, -431, -431, 45, 2447, 2726, 2726, 2726, + 2726, 2726, 2726, 2726, -431, 286, -431, 287, -431, -431, + -431, -431, -431, 201, 70, -431, -431, 210, -431, -431, + -431, -431, 58, -431, -431, 2726, 2726, 2726, 2726, 2726, + 2726, -431, -431, -431, -431, -431, 2726, 2726, 121, -431, + -431, -431, 256, -431, -431, 383, 216, 2726, 23, -431, + 320, -431, 2540, 493, 218, 46, 73, 111, -431, 391, + 308, -431, 2726, 322, 263, 263, -431, 340, 126, 159, + -431, 395, 1500, 513, 1779, 298, 352, 340, 2845, 1592, + 1592, 401, 1686, 1872, 641, 493, 493, 2726, 2726, 247, + 258, 270, -431, 279, 2633, 33, 283, 251, -431, -431, + 434, 155, 166, 163, 243, 271, 246, 296, 848, -431, + 334, -431, -4, 337, 2726, 2726, 2726, 2726, -431, 273, + -431, -431, 277, -431, -431, -431, -431, 1512, 109, -431, + 2726, 2726, -431, 267, -431, 267, 267, 267, 267, 267, + 275, -52, -431, 2726, 360, -431, -431, -431, 443, -431, + 3, 450, -431, -431, -431, 249, 2726, 396, -431, -431, + 2726, 329, 254, -431, -431, -431, -431, -431, 470, -431, + -431, 2726, -431, 405, -431, 407, -431, 418, -431, 421, + -431, -431, -431, 242, -431, -431, 413, 312, 267, 335, + 341, 267, 347, 353, -431, -431, -431, -431, 364, 366, + 314, -431, 2726, 378, 379, -431, 2726, 380, -431, -431, + 375, -431, -431, 48, -431, 274, -431, 2887, 485, -431, + -431, 402, -431, -431, -431, -431, 399, 256, -431, 2726, + -431, -431, 495, 495, 2726, 2726, 495, -431, 412, 403, + 495, 495, 267, -431, -431, 496, -431, -431, -431, 442, + 426, -431, 428, 495, 495, -431, 130, 130, 415, 431, + 160, 2726, 2726, 495, -431, -431, 112, -431, -431, -431, + -431, -431, 943, -431, 160, 160, -431, 495, 432, -431, + -431, 495, 495, -431, 433, 436, 160, -431, -431, 511, + 511, -431, -431, -431, 460, 447, 1038, 9, -431, -431, + -431, 1133, -431, 2726, 160, 160, -431, 495, -431, -431, + 469, 469, 112, -431, -431, 478, 531, -431, -431, 452, + -431, -431, -431, 160, 2726, -431, -431, -431, -431, -431, + -431, 495, 1606, -431, 340, 1228, 130, 471, -431, -431, + 495, -431 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -231,87 +231,87 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 0, 2, 4, 6, 8, 10, 12, 0, 16, 244, + 0, 2, 4, 6, 8, 10, 12, 0, 16, 243, 0, 0, 0, 19, 1, 19, 0, 0, 0, 0, - 0, 0, 231, 0, 0, 202, 229, 190, 224, 226, - 220, 85, 233, 85, 212, 222, 0, 0, 215, 242, - 0, 0, 0, 0, 0, 0, 218, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 245, 119, 232, 197, - 180, 181, 182, 183, 122, 187, 5, 203, 192, 195, - 194, 196, 193, 0, 0, 0, 16, 7, 61, 27, - 86, 0, 0, 84, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 57, 72, 9, 0, 62, 0, 11, - 24, 23, 0, 0, 173, 0, 163, 164, 269, 272, - 271, 270, 258, 259, 256, 242, 0, 0, 0, 0, - 221, 0, 89, 213, 0, 0, 244, 216, 217, 269, - 243, 129, 270, 0, 260, 179, 178, 0, 0, 87, - 88, 242, 188, 0, 0, 235, 239, 241, 240, 219, - 214, 165, 166, 185, 170, 171, 191, 0, 257, 262, + 0, 0, 230, 0, 0, 201, 228, 189, 223, 225, + 219, 83, 232, 83, 211, 221, 0, 0, 214, 241, + 0, 0, 0, 0, 0, 0, 217, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 244, 119, 231, 196, + 179, 180, 181, 182, 122, 186, 5, 202, 191, 194, + 193, 195, 192, 0, 0, 0, 16, 7, 59, 27, + 84, 0, 0, 82, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 55, 70, 9, 0, 60, 0, 11, + 24, 23, 0, 0, 173, 0, 163, 164, 268, 271, + 270, 269, 257, 258, 255, 241, 0, 0, 0, 0, + 220, 0, 87, 212, 0, 0, 243, 215, 216, 268, + 242, 129, 269, 0, 259, 178, 177, 0, 0, 85, + 86, 241, 187, 0, 0, 234, 238, 240, 239, 218, + 213, 165, 166, 184, 170, 171, 190, 0, 256, 261, 0, 0, 0, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 167, 168, 169, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 83, 84, 0, 34, 16, + 0, 0, 0, 0, 19, 81, 82, 0, 32, 16, 16, 16, 16, 16, 0, 16, 16, 0, 16, 16, - 40, 56, 0, 52, 55, 0, 0, 0, 0, 0, - 0, 26, 25, 20, 172, 127, 244, 0, 0, 225, - 131, 90, 0, 91, 223, 227, 0, 0, 0, 123, - 175, 0, 206, 0, 186, 0, 192, 195, 194, 238, - 0, 95, 234, 0, 189, 117, 118, 116, 121, 0, - 0, 145, 0, 158, 154, 155, 151, 152, 149, 0, - 160, 161, 159, 157, 156, 153, 162, 150, 0, 0, - 264, 266, 0, 133, 0, 0, 0, 268, 126, 134, - 204, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 82, 0, 29, 0, 0, 77, 0, 0, 0, 254, - 0, 255, 252, 0, 253, 249, 250, 251, 0, 0, - 16, 0, 0, 73, 65, 66, 79, 63, 64, 67, - 68, 0, 246, 147, 242, 112, 91, 93, 0, 228, - 130, 0, 174, 191, 0, 236, 237, 94, 0, 0, - 0, 138, 144, 0, 0, 0, 208, 209, 210, 261, - 142, 0, 207, 211, 244, 205, 0, 136, 0, 198, - 0, 199, 0, 14, 16, 28, 89, 16, 16, 33, - 0, 0, 78, 0, 0, 80, 0, 0, 248, 16, - 76, 81, 0, 0, 62, 48, 0, 0, 0, 128, - 0, 0, 132, 110, 0, 92, 176, 124, 189, 148, - 0, 141, 184, 0, 137, 143, 0, 139, 200, 201, - 135, 0, 91, 0, 53, 242, 74, 74, 0, 0, - 0, 0, 0, 43, 0, 0, 0, 0, 247, 230, - 98, 99, 96, 96, 106, 105, 109, 111, 0, 19, - 146, 140, 125, 0, 0, 91, 19, 0, 0, 0, - 18, 69, 69, 0, 0, 72, 77, 0, 0, 38, - 39, 97, 101, 101, 107, 113, 0, 21, 115, 114, - 30, 0, 0, 35, 72, 72, 19, 0, 0, 36, - 37, 0, 0, 51, 0, 0, 72, 102, 104, 100, - 108, 177, 0, 19, 54, 41, 42, 0, 70, 0, - 72, 72, 44, 0, 47, 103, 59, 0, 22, 0, - 17, 0, 46, 50, 74, 72, 19, 58, 15, 32, - 0, 0, 49, 0, 69, 0, 60, 71, 0, 45 + 38, 54, 0, 50, 53, 0, 0, 0, 0, 0, + 0, 26, 25, 20, 172, 127, 243, 0, 0, 224, + 131, 88, 89, 222, 226, 0, 0, 0, 123, 175, + 0, 205, 0, 185, 0, 191, 194, 193, 237, 0, + 93, 233, 0, 188, 117, 118, 116, 121, 0, 0, + 145, 0, 158, 154, 155, 151, 152, 149, 0, 160, + 161, 159, 157, 156, 153, 162, 150, 0, 0, 263, + 265, 0, 133, 0, 0, 0, 267, 126, 134, 203, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, + 0, 29, 0, 0, 75, 0, 0, 0, 253, 0, + 254, 251, 0, 252, 248, 249, 250, 0, 0, 16, + 0, 0, 71, 63, 64, 77, 61, 62, 65, 66, + 0, 245, 147, 241, 91, 16, 227, 130, 0, 174, + 190, 0, 235, 236, 92, 0, 0, 0, 138, 144, + 0, 0, 0, 207, 208, 209, 260, 142, 0, 206, + 210, 243, 204, 0, 136, 0, 197, 0, 198, 0, + 14, 16, 28, 87, 16, 31, 0, 0, 76, 0, + 0, 78, 0, 0, 247, 16, 74, 79, 0, 0, + 60, 46, 0, 0, 0, 128, 0, 0, 132, 90, + 110, 176, 124, 188, 148, 0, 141, 183, 0, 137, + 143, 0, 139, 199, 200, 135, 0, 89, 51, 241, + 72, 72, 0, 0, 0, 0, 0, 41, 0, 0, + 0, 0, 246, 229, 111, 0, 146, 140, 125, 0, + 16, 19, 0, 0, 0, 18, 67, 67, 0, 0, + 70, 75, 0, 0, 36, 37, 108, 19, 21, 115, + 114, 30, 0, 33, 70, 70, 19, 0, 0, 34, + 35, 0, 0, 49, 0, 0, 70, 96, 97, 94, + 94, 104, 103, 107, 109, 0, 0, 0, 52, 39, + 40, 0, 68, 0, 70, 70, 42, 0, 45, 95, + 99, 99, 105, 112, 113, 57, 0, 22, 17, 0, + 44, 48, 72, 70, 100, 102, 98, 106, 19, 56, + 15, 0, 0, 47, 101, 0, 67, 0, 58, 69, + 0, 43 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -455, -455, -455, -455, -455, -455, -455, -455, 10, -455, - -36, -112, -455, -15, -455, 465, 384, 4, -455, -455, - -455, -455, -455, -455, -455, -455, -455, -313, -454, -174, - -426, -455, 17, 195, -175, -25, -455, 325, 491, -455, - 462, 150, -330, 309, 113, -455, -455, 84, -455, 89, - -455, -455, 136, -455, -455, -6, -20, -455, -455, -455, - -455, -455, -455, -455, -455, 25, -455, -455, 419, -106, - -122, -455, -455, 249, -455, -455, 371, 206, -43, -33, - -455, -455, -455, -455, -455, 243 + -431, -431, -431, -431, -431, -431, -431, -431, -10, -431, + 7, -163, -431, -12, -431, 568, 484, 18, -431, -431, + -431, -431, -431, -431, -431, -431, -304, -430, -181, -410, + -431, 132, 289, -271, 71, -431, 410, 559, -431, 520, + 230, 202, 381, 146, -431, -431, 119, -431, 125, -431, + -431, -431, -431, 188, -431, 59, -35, -431, -431, -431, + -431, -431, -431, -431, -431, -11, -431, -431, 489, -107, + -117, -431, -431, 326, -431, -431, 441, 50, -29, -25, + -431, -431, -431, -431, -431, 24 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 7, 8, 9, 10, 11, 12, 13, 94, 375, - 15, 461, 486, 102, 502, 223, 100, 101, 376, 377, - 304, 466, 524, 434, 456, 518, 527, 96, 489, 213, - 458, 391, 381, 325, 384, 393, 301, 198, 121, 195, - 141, 233, 338, 252, 472, 443, 444, 498, 445, 446, - 447, 448, 336, 403, 480, 97, 57, 58, 334, 288, + -1, 7, 8, 9, 10, 11, 12, 13, 110, 372, + 400, 446, 466, 102, 487, 223, 100, 101, 373, 303, + 451, 512, 428, 441, 507, 519, 96, 469, 213, 443, + 387, 377, 324, 380, 389, 300, 198, 121, 195, 141, + 232, 335, 251, 500, 480, 481, 515, 482, 483, 484, + 485, 435, 456, 401, 461, 97, 57, 58, 333, 287, 59, 60, 61, 62, 63, 64, 117, 65, 145, 131, - 66, 401, 387, 312, 313, 206, 67, 68, 69, 70, + 66, 397, 383, 311, 312, 206, 67, 68, 69, 70, 71, 72, 73, 74, 75, 158 }; @@ -320,222 +320,243 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 103, 459, 147, 56, 237, 390, 404, 378, 490, 225, - 105, 76, 148, 516, 164, 95, 165, 163, 14, 130, - 77, 76, 19, 20, 440, 441, 253, 150, 76, 110, - 110, 110, 108, 110, 110, 242, 138, 109, 349, 231, - 194, 76, 106, 107, 400, 224, 118, 157, 127, 110, - 110, 135, 108, 119, 187, 120, 188, 109, 124, 123, - -263, 333, -263, 128, 110, 110, 136, 351, -265, 142, - -265, 149, 125, 151, 152, 153, 154, 155, 139, 367, - 537, 487, 488, 140, -238, 163, 232, 19, 20, 21, - 369, 517, 454, 126, -267, 130, -237, 186, 531, 379, - 247, 210, 222, 478, 331, 166, 160, 161, 162, 54, - 248, 442, 228, 239, 54, 362, -16, 193, 197, 236, - 56, 130, 160, 161, 162, 481, 199, 212, 160, 161, - 162, 230, 211, 386, 54, 189, 110, 190, 250, 311, - 160, 161, 162, 392, 200, 229, 397, 398, 19, 20, - 201, 160, 161, 162, 255, 256, 257, 202, 259, 260, - 262, 316, 208, 305, 306, 307, 308, 310, 244, 318, - 319, 317, 321, 322, 54, 209, 187, 371, 188, 299, - 291, 292, 293, 294, 295, 296, 297, 298, 258, 214, - 226, 409, 263, 264, 265, 266, 267, 268, 269, 270, - 271, 272, 273, 274, 275, 276, 277, 332, 414, 324, - 326, 327, 328, 329, 330, 227, 234, -263, 390, -263, - 56, 435, 323, 240, 143, 111, 111, 111, 402, 111, - 111, 251, 341, 144, 253, 54, -239, 344, 160, 161, - 162, 300, 416, 450, 303, 132, 111, 348, -265, 309, - -265, 146, 160, 161, 162, 463, 464, 160, 161, 162, - 111, 111, 112, 113, 114, 340, 115, 116, 320, 160, - 161, 162, 354, 355, 335, 342, 316, -241, 191, 361, - 192, 337, 133, 134, 396, 241, 317, 160, 161, 162, - 347, 493, 495, 349, 207, 162, 110, 356, 159, 382, - 326, 385, 385, 357, 160, 161, 162, 358, -240, 364, - 505, 506, 394, 254, 130, 385, 385, 462, 359, 457, - 465, 278, 514, 279, 469, 470, 374, 280, 281, 282, - 363, 54, 132, 283, 521, -31, 522, 523, 421, 380, - 389, 423, 424, 410, 399, 411, 484, 485, 406, 246, - 170, 532, 405, 431, 417, 418, 496, 419, 56, 420, - 425, 215, 216, 217, 218, 160, 161, 162, 219, 238, - 220, 170, 171, 231, 284, 508, 426, 180, 412, 510, - 511, 430, 181, 427, 428, 182, 183, 184, 185, 433, - 385, 289, 429, 350, 438, 160, 161, 162, 180, 432, - 436, 525, 437, 181, 203, 130, 182, 183, 184, 185, - 315, 449, 285, 439, 286, 287, 451, 452, 534, 460, - 467, -80, 453, 468, 385, 385, 539, 475, 204, 160, - 161, 162, 471, 477, 476, 474, 503, 205, 497, 54, - 483, 482, 160, 161, 162, 491, 526, 168, 169, 170, - 171, 160, 161, 162, -192, 509, 492, 366, 513, 528, - 382, 385, 512, 187, 479, 188, -192, 160, 161, 162, - 368, 507, 176, 177, 178, 179, 180, 99, 530, 370, - 538, 181, 221, 494, 182, 183, 184, 185, 519, 160, - 161, 162, 111, -192, -192, -192, -192, 160, 161, 162, - -192, 383, -192, 385, 181, -192, 535, 182, 183, 184, - 185, 533, -192, -192, -192, -192, 388, 372, 160, 161, - 162, 302, 515, 339, 122, 315, 422, -192, -192, -192, - -231, -192, -192, -192, -192, -192, -192, -192, -192, -192, - -192, -192, -231, 196, 346, -268, -192, 170, 171, -192, - -192, -192, -192, -192, 345, -192, 473, 499, -192, 455, - 170, 171, 245, 500, 0, 160, 161, 162, 395, -231, - -231, -231, -231, 179, 180, 314, -231, 0, -231, 181, - 0, -231, 182, 183, 184, 185, 179, 180, -231, -231, - -231, -231, 181, 413, 0, 182, 183, 184, 185, -268, - -268, -268, 185, -231, -231, -231, 0, -231, -231, -231, - -231, -231, -231, -231, -231, -231, -231, -231, 160, 161, - 162, 0, -231, 0, 0, -231, -231, -231, -231, -231, - 0, -231, -13, 78, -231, 0, 0, 0, 0, 0, - 0, 76, 0, 16, 352, 17, 18, 19, 20, 21, - 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 79, 98, 80, 81, 33, 82, - 83, 84, 85, 86, 87, 160, 161, 162, 88, 89, - 90, 91, 34, 0, 92, 35, 36, 37, 38, 39, - 160, 161, 162, 0, 40, 41, 42, 43, 44, 45, - 46, 365, 0, 160, 161, 162, 0, 0, 47, 0, - 0, 160, 161, 162, 0, 0, 407, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, -3, 78, 408, - 0, 0, 53, 93, 54, 55, 76, 415, 16, 0, - 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, - 25, 26, 0, 27, 28, 29, 30, 31, 32, 79, - 98, 80, 81, 33, 82, 83, 84, 85, 86, 87, - 0, 0, 0, 88, 89, 90, 91, 34, 0, 92, - 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, - 41, 42, 43, 44, 45, 46, 180, 0, 0, 0, - 0, 181, 0, 47, 182, 183, 184, 185, 1, 2, - 3, 4, 5, 6, 0, 48, 49, 0, 50, 0, - 51, 52, 0, 78, 0, 0, 0, 53, 93, 54, - 55, 76, 373, 16, 0, 17, 18, 19, 20, 21, - 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 79, 98, 80, 81, 33, 82, - 83, 84, 85, 86, 87, 0, 0, 0, 88, 89, - 90, 91, 34, 0, 92, 35, 36, 37, 38, 39, - 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, - 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, + 77, 94, 94, 103, 130, 374, 106, 107, 225, 236, + 76, 444, 150, 386, 252, 15, 147, 470, 119, 120, + 148, 108, 164, 123, 165, 163, 109, 128, 127, 95, + 136, 135, 505, 142, 241, 149, 382, 151, 152, 153, + 154, 155, 76, 112, 113, 114, 388, 115, 116, 393, + 394, 14, 396, 108, 277, 187, 278, 188, 109, 346, + 279, 280, 281, 133, 134, 118, 282, 76, 56, 111, + 111, 111, -237, 111, 111, 105, 124, 125, 224, 159, + 130, 210, -262, 194, -262, 19, 20, 21, 94, 132, + 111, 126, 94, 94, 139, 146, 529, 375, 238, 140, + 163, 138, 522, 54, 111, 111, 130, 283, 186, 330, + 506, 230, 157, 166, 246, -238, 222, -236, 247, -266, + -264, 429, -264, 193, 19, 20, 197, 477, 478, 160, + 161, 162, 243, 332, 199, 54, 359, 310, 207, 160, + 161, 162, -240, 200, 187, 284, 188, 285, 286, -262, + 237, -262, 257, 448, 449, 253, 262, 263, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, + 276, 348, 54, 467, 468, 315, 132, 228, 364, 316, + -239, 475, 298, 201, 235, 56, 19, 20, 202, 160, + 161, 162, 331, 245, 160, 161, 162, 208, 209, 160, + 161, 162, 322, 249, 211, 212, 304, 305, 306, 307, + 309, 54, 317, 318, 479, 320, 321, 240, 386, 254, + 255, 256, 509, 258, 259, 261, 398, 347, 160, 161, + 162, 226, 160, 161, 162, 288, 160, 161, 162, 160, + 161, 162, 214, 227, 411, 290, 291, 292, 293, 294, + 295, 296, 297, 229, 314, 366, 363, -264, 368, -264, + 447, 404, 143, 450, 365, 231, 409, 454, 455, 473, + 203, 144, 233, 54, 323, 325, 326, 327, 328, 329, + 464, 465, 239, 489, 490, 56, 436, 250, 94, 315, + 476, 252, 308, 316, 204, 498, 338, 189, 130, 190, + 191, 341, 192, 205, 492, 54, 299, 302, 494, 495, + 319, 345, 442, 510, 511, 337, 160, 161, 162, 160, + 161, 162, 160, 161, 162, 334, 392, 160, 161, 162, + 339, 344, 523, 346, 513, 111, 351, 352, 162, 407, + 160, 161, 162, 358, 160, 161, 162, 160, 161, 162, + 353, 361, 371, 215, 216, 217, 218, 376, 526, 384, + 219, 354, 220, 378, 325, 381, 381, 531, 314, 160, + 161, 162, 367, 355, 395, 54, 390, 385, 416, 381, + 381, 418, 356, 399, 130, 180, 360, 160, 161, 162, + 181, 167, 425, 182, 183, 184, 185, 369, 168, 169, + 170, 171, 160, 161, 162, 405, 406, 215, 216, 217, + 218, 420, 170, -78, 219, 412, 220, 413, 172, 173, + 56, 174, 175, 176, 177, 178, 179, 180, 414, 462, + 408, 415, 181, 419, 421, 182, 183, 184, 185, 180, + 422, 160, 161, 162, 181, 486, 423, 182, 183, 184, + 185, 381, 94, 424, 491, 432, 160, 161, 162, 168, + 169, 170, 171, 426, 160, 161, 162, 427, 160, 161, + 162, -267, -267, -267, 185, 434, 94, 430, 431, 433, + -191, 94, 336, 381, 381, 177, 178, 179, 180, 187, + 343, 188, -191, 181, 349, 437, 182, 183, 184, 185, + 439, 438, 453, 524, 445, 457, 525, 160, 161, 162, + 378, 381, 452, 458, 471, 94, 160, 161, 162, -191, + -191, -191, -191, 160, 161, 162, -191, 459, -191, 463, + 472, -191, 493, 362, 496, 497, 499, 502, -191, -191, + -191, -191, 402, 160, 161, 162, 503, 514, 518, 403, + 520, 521, 381, -191, -191, -191, -230, -191, -191, -191, + -191, -191, -191, -191, -191, -191, -191, -191, -230, 410, + 530, -267, -191, 170, 171, -191, -191, -191, -191, -191, + 99, -191, 221, 474, -191, 181, 170, 171, 182, 183, + 184, 185, 122, 527, 379, -230, -230, -230, -230, 179, + 180, 196, -230, 417, -230, 181, 301, -230, 182, 183, + 184, 185, 179, 180, -230, -230, -230, -230, 181, 440, + 516, 182, 183, 184, 185, 342, 501, 517, 460, -230, + -230, -230, 244, -230, -230, -230, -230, -230, -230, -230, + -230, -230, -230, -230, 391, 313, 0, 0, -230, 0, + 0, -230, -230, -230, -230, -230, 0, -230, -13, 78, + -230, 0, 0, 0, 0, 0, 0, 76, 0, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, + 79, 98, 80, 81, 33, 82, 83, 84, 85, 86, + 87, 170, 171, 0, 88, 89, 90, 91, 34, 0, + 92, 35, 36, 37, 38, 39, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 0, 180, 0, + 0, 0, 0, 181, 47, 0, 182, 183, 184, 185, + 1, 2, 3, 4, 5, 6, 48, 49, 0, 50, + 0, 51, 52, -3, 78, 0, 0, 0, 53, 93, + 54, 55, 76, 0, 16, 0, 17, 18, 19, 20, + 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, + 28, 29, 30, 31, 32, 79, 98, 80, 81, 33, + 82, 83, 84, 85, 86, 87, 0, 0, 0, 88, + 89, 90, 91, 34, 0, 92, 35, 36, 37, 38, + 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, + 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, 0, 78, 0, - 0, 0, 53, 93, 54, 55, 76, 501, 16, 0, - 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, - 25, 26, 0, 27, 28, 29, 30, 31, 32, 79, - 98, 80, 81, 33, 82, 83, 84, 85, 86, 87, - 0, 0, 0, 88, 89, 90, 91, 34, 0, 92, - 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, - 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, - 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 52, 0, 78, 0, 0, 0, 53, 93, 54, - 55, 76, 504, 16, 0, 17, 18, 19, 20, 21, - 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 79, 98, 80, 81, 33, 82, - 83, 84, 85, 86, 87, 0, 0, 0, 88, 89, - 90, 91, 34, 0, 92, 35, 36, 37, 38, 39, - 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, - 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, + 0, 48, 49, 0, 50, 0, 51, 52, 0, 78, + 0, 0, 0, 53, 93, 54, 55, 76, 370, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, + 79, 98, 80, 81, 33, 82, 83, 84, 85, 86, + 87, 0, 0, 0, 88, 89, 90, 91, 34, 0, + 92, 35, 36, 37, 38, 39, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, + 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, + 0, 51, 52, 0, 78, 0, 0, 0, 53, 93, + 54, 55, 76, 488, 16, 0, 17, 18, 19, 20, + 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, + 28, 29, 30, 31, 32, 79, 98, 80, 81, 33, + 82, 83, 84, 85, 86, 87, 0, 0, 0, 88, + 89, 90, 91, 34, 0, 92, 35, 36, 37, 38, + 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, + 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, 0, 78, 0, - 0, 0, 53, 93, 54, 55, 76, 520, 16, 0, - 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, - 25, 26, 0, 27, 28, 29, 30, 31, 32, 79, - 98, 80, 81, 33, 82, 83, 84, 85, 86, 87, - 0, 0, 0, 88, 89, 90, 91, 34, 0, 92, - 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, - 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, - 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 52, 0, 78, 0, 0, 0, 53, 93, 54, - 55, 76, 529, 16, 0, 17, 18, 19, 20, 21, + 0, 48, 49, 0, 50, 0, 51, 52, 0, 78, + 0, 0, 0, 53, 93, 54, 55, 76, 504, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, + 79, 98, 80, 81, 33, 82, 83, 84, 85, 86, + 87, 0, 0, 0, 88, 89, 90, 91, 34, 0, + 92, 35, 36, 37, 38, 39, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, + 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, + 0, 51, 52, 0, 78, 0, 0, 0, 53, 93, + 54, 55, 76, 508, 16, 0, 17, 18, 19, 20, + 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, + 28, 29, 30, 31, 32, 79, 98, 80, 81, 33, + 82, 83, 84, 85, 86, 87, 0, 0, 0, 88, + 89, 90, 91, 34, 0, 92, 35, 36, 37, 38, + 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, + 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 49, 0, 50, 0, 51, 52, 0, 78, + 0, 0, 0, 53, 93, 54, 55, 76, 0, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, + 79, 98, 80, 81, 33, 82, 83, 84, 85, 86, + 87, 0, 0, 0, 88, 89, 90, 91, 34, 0, + 92, 35, 36, 37, 38, 39, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 528, + 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, + 0, 51, 52, 0, 78, 0, 0, 0, 53, 93, + 54, 55, 76, 0, 16, 0, 17, 18, 19, 20, + 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, + 28, 29, 30, 31, 32, 79, 98, 80, 81, 33, + 82, 83, 84, 85, 86, 87, 0, 0, 0, 88, + 89, 90, 91, 34, 0, 92, 35, 36, 37, 38, + 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, + 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 49, 0, 50, 0, 51, 52, 0, 78, + 0, 0, 0, 53, 93, 54, 55, 76, 0, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, + 79, 0, 80, 81, 33, 82, 83, 84, 85, 86, + 87, 0, 0, 0, 88, 89, 90, 91, 34, 0, + 92, 35, 36, 37, 38, 39, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, + 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, + 0, 51, 52, 78, 0, 0, 0, 0, 53, 93, + 54, 55, 0, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 79, 98, 80, 81, 33, 82, - 83, 84, 85, 86, 87, 0, 0, 0, 88, 89, - 90, 91, 34, 0, 92, 35, 36, 37, 38, 39, + 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, + 0, -267, 0, 0, 0, 0, 0, 0, 168, 169, + 170, 171, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, - 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, 0, 78, 0, - 0, 0, 53, 93, 54, 55, 76, 0, 16, 0, - 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, - 25, 26, 0, 27, 28, 29, 30, 31, 32, 79, - 98, 80, 81, 33, 82, 83, 84, 85, 86, 87, - 0, 0, 0, 88, 89, 90, 91, 34, 0, 92, - 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, - 41, 42, 43, 44, 45, 46, 0, 0, 536, 0, - 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 52, 0, 78, 0, 0, 0, 53, 93, 54, - 55, 76, 0, 16, 0, 17, 18, 19, 20, 21, + 46, 174, 175, 176, 177, 178, 179, 180, 47, 0, + 0, 0, 181, 0, 0, 182, 183, 184, 185, 0, + 48, 49, 0, 50, 0, 51, 52, 78, 0, 0, + 0, 0, 53, -73, 54, 55, 0, 16, 0, 17, + 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, + 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, + 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, + 168, 169, 170, 171, 0, 0, 34, 0, 0, 35, + 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, + 42, 43, 44, 45, 46, 176, 177, 178, 179, 180, + 0, 0, 47, 0, 181, 0, 0, 182, 183, 184, + 185, 0, 0, 0, 48, 49, 0, 50, 0, 51, + 52, 0, 0, 0, 0, -73, 53, 0, 54, 55, + 76, 0, 16, 0, 17, 18, 19, 20, 21, 0, + 0, 129, 23, 24, 25, 26, 109, 27, 28, 29, + 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, + 0, 0, 0, 0, 168, 169, 170, 171, 0, 0, + 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, + 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, + 0, 178, 179, 180, 0, 0, 0, 47, 181, 0, + 0, 182, 183, 184, 185, 0, 0, 0, 0, 48, + 49, 0, 50, 0, 51, 52, 0, 0, 0, 0, + 0, 53, 0, 54, 55, 76, 0, 16, 0, 17, + 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, + 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, + 0, 0, 33, 0, 0, 0, 0, 168, -267, 170, + 171, 0, 0, 0, 0, 0, 34, 0, 0, 35, + 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, + 42, 43, 44, 45, 46, 179, 180, 0, 0, 0, + 0, 181, 47, 0, 182, 183, 184, 185, 0, 0, + 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, + 52, 0, 0, 0, 0, 0, 53, 0, 54, 55, + 16, 104, 17, 18, 19, 20, 21, 0, 0, 22, + 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, + 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, + 168, 169, 170, 171, 0, 0, 0, 0, 0, 34, + 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, + 0, 40, 41, 42, 43, 44, 45, 46, 179, 180, + 0, 0, 0, 0, 181, 47, 0, 182, 183, 184, + 185, 0, 0, 0, 0, 0, 0, 48, 49, 0, + 50, 0, 51, 52, 0, 0, 0, 0, 0, 53, + 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 79, 98, 80, 81, 33, 82, - 83, 84, 85, 86, 87, 0, 0, 0, 88, 89, - 90, 91, 34, 0, 92, 35, 36, 37, 38, 39, + 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, 0, 78, 0, - 0, 0, 53, 93, 54, 55, 76, 0, 16, 0, - 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, - 25, 26, 0, 27, 28, 29, 30, 31, 32, 79, - 0, 80, 81, 33, 82, 83, 84, 85, 86, 87, - 0, 0, 0, 88, 89, 90, 91, 34, 0, 92, - 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, - 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, - 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 52, 78, 0, 0, 0, 0, 53, 93, 54, - 55, 0, 16, 0, 17, 18, 19, 20, 21, 0, - 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, - 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, - -268, 0, 0, 0, 0, 0, 0, 168, 169, 170, - 171, 34, 0, 0, 35, 36, 37, 38, 39, 0, - 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, - 174, 175, 176, 177, 178, 179, 180, 47, 0, 0, - 0, 181, 0, 0, 182, 183, 184, 185, 0, 48, - 49, 0, 50, 0, 51, 52, 78, 0, 0, 0, - 0, 53, -75, 54, 55, 0, 16, 0, 17, 18, - 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, - 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, - 0, 33, 0, 0, 0, 0, 0, 0, 168, 169, - 170, 171, 0, 0, 0, 34, 0, 0, 35, 36, - 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, - 43, 44, 45, 46, 177, 178, 179, 180, 0, 0, - 0, 47, 181, 0, 0, 182, 183, 184, 185, 0, - 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, - 0, 0, 0, 0, -75, 53, 0, 54, 55, 76, - 0, 16, 0, 17, 18, 19, 20, 21, 0, 0, - 129, 23, 24, 25, 26, 109, 27, 28, 29, 30, - 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, - 0, 0, 0, 168, 169, 170, 171, 0, 0, 0, - 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, - 0, 0, 40, 41, 42, 43, 44, 45, 46, 0, - 178, 179, 180, 0, 0, 0, 47, 181, 0, 0, - 182, 183, 184, 185, 0, 0, 0, 0, 48, 49, - 0, 50, 0, 51, 52, 0, 0, 0, 0, 0, - 53, 0, 54, 55, 76, 0, 16, 0, 17, 18, + 48, 49, 0, 50, 0, 51, 52, 0, 0, 0, + 0, 0, 53, 137, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, - 0, 33, 0, 0, 0, 0, 168, -268, 170, 171, + 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, - 43, 44, 45, 46, 179, 180, 0, 0, 0, 0, - 181, 47, 0, 182, 183, 184, 185, 0, 0, 0, + 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, + 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, - 0, 0, 0, 0, 0, 53, 0, 54, 55, 16, - 104, 17, 18, 19, 20, 21, 0, 0, 22, 23, + 0, 0, 0, 0, 156, 53, 0, 54, 55, 16, + 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, - 0, 0, 0, 0, 33, 0, 0, 0, 0, 168, - 169, 170, 171, 0, 0, 0, 0, 0, 34, 0, + 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, - 40, 41, 42, 43, 44, 45, 46, 179, 180, 0, - 0, 0, 0, 181, 47, 0, 182, 183, 184, 185, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, + 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, - 0, 51, 52, 0, 0, 0, 0, 0, 53, 0, + 0, 51, 52, 0, 0, 0, 0, 234, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, - 30, 31, 32, 0, 0, 0, 0, 33, 215, 216, - 217, 218, 0, 0, 0, 219, 0, 220, 0, 0, + 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, - 0, 0, 160, 161, 162, 0, 0, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, 0, 0, 0, 0, - 0, 53, 137, 54, 55, 16, 0, 17, 18, 19, + 248, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -544,7 +565,7 @@ static const yytype_int16 yytable[] = 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, 0, - 0, 0, 0, 156, 53, 0, 54, 55, 16, 0, + 0, 0, 0, 260, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, @@ -553,7 +574,7 @@ static const yytype_int16 yytable[] = 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, - 51, 52, 0, 0, 0, 0, 235, 53, 0, 54, + 51, 52, 0, 0, 0, 0, 289, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, @@ -562,7 +583,7 @@ static const yytype_int16 yytable[] = 0, 0, 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, - 0, 50, 0, 51, 52, 0, 0, 0, 0, 249, + 0, 50, 0, 51, 52, 0, 0, 0, 0, 340, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, @@ -572,7 +593,7 @@ static const yytype_int16 yytable[] = 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, 0, 0, - 0, 0, 261, 53, 0, 54, 55, 16, 0, 17, + 0, 0, 357, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, @@ -581,275 +602,264 @@ static const yytype_int16 yytable[] = 42, 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, 50, 0, 51, - 52, 0, 0, 0, 0, 290, 53, 0, 54, 55, + 52, 0, 0, 0, 0, 0, 53, 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, 0, 0, - 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 48, 49, 0, - 50, 0, 51, 52, 0, 0, 0, 0, 343, 53, - 0, 54, 55, 16, 0, 17, 18, 19, 20, 21, - 0, 0, 22, 23, 24, 25, 26, 0, 27, 28, - 29, 30, 31, 32, 0, 0, 0, 0, 33, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 34, 0, 0, 35, 36, 37, 38, 39, - 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, - 46, 0, 0, 0, 0, 0, 0, 0, 47, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 49, 0, 50, 0, 51, 52, 0, 0, 0, - 0, 360, 53, 0, 54, 55, 16, 0, 17, 18, - 19, 20, 21, 0, 0, 22, 23, 24, 25, 26, - 0, 27, 28, 29, 30, 31, 32, 0, 0, 0, - 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 34, 0, 0, 35, 36, - 37, 38, 39, 0, 0, 0, 0, 40, 41, 42, - 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, - 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 48, 49, 0, 50, 0, 51, 52, - 0, 0, 0, 0, 0, 53, 0, 54, 55, 16, - 0, 17, 18, 19, 20, 21, 0, 0, 22, 23, - 24, 25, 26, 0, 27, 28, 29, 30, 31, 32, - 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, - 0, 35, 36, 37, 38, 39, 0, 0, 0, 0, - 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, - 0, 0, 0, 0, 47, 167, 0, 0, 0, 0, - 0, 0, 168, 169, 170, 171, 48, 49, 0, 50, - 0, 51, 52, 0, 0, 0, 0, 0, 243, 0, - 54, 55, 172, 173, 353, 174, 175, 176, 177, 178, - 179, 180, 0, 0, 0, 0, 181, 167, 0, 182, - 183, 184, 185, 0, 168, 169, 170, 171, 0, 0, + 0, 0, 0, 0, 0, 47, 167, 0, 0, 0, + 0, 0, 0, 168, 169, 170, 171, 48, 49, 0, + 50, 0, 51, 52, 0, 0, 0, 0, 0, 242, + 0, 54, 55, 172, 173, 350, 174, 175, 176, 177, + 178, 179, 180, 0, 0, 0, 0, 181, 167, 0, + 182, 183, 184, 185, 0, 168, 169, 170, 171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 172, 173, 0, 174, 175, 176, - 177, 178, 179, 180, 0, 0, 0, 0, 181, 167, - 0, 182, 183, 184, 185, 0, 168, 169, 170, 171, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 173, 0, 174, - 175, 176, 177, 178, 179, 180, 0, 0, 0, 0, - 181, 0, 0, 182, 183, 184, 185 + 0, 0, 0, 0, 0, 0, 173, 0, 174, 175, + 176, 177, 178, 179, 180, 0, 0, 0, 0, 181, + 0, 0, 182, 183, 184, 185 }; static const yytype_int16 yycheck[] = { - 15, 427, 45, 9, 126, 318, 336, 9, 462, 115, - 16, 9, 45, 23, 9, 11, 11, 77, 0, 39, - 10, 9, 15, 16, 15, 16, 11, 47, 9, 19, - 20, 21, 20, 23, 24, 141, 42, 25, 11, 23, - 76, 9, 17, 18, 104, 12, 11, 53, 38, 39, - 40, 41, 20, 100, 9, 30, 11, 25, 100, 34, - 9, 12, 11, 38, 54, 55, 41, 12, 9, 44, - 11, 46, 100, 48, 49, 50, 51, 52, 20, 12, - 534, 43, 44, 25, 69, 77, 122, 15, 16, 17, - 12, 101, 422, 100, 9, 115, 69, 100, 524, 101, - 143, 91, 98, 101, 226, 100, 73, 74, 75, 102, - 143, 102, 118, 133, 102, 103, 100, 9, 20, 125, - 126, 141, 73, 74, 75, 455, 100, 45, 73, 74, - 75, 121, 101, 308, 102, 9, 126, 11, 144, 67, - 73, 74, 75, 318, 100, 99, 321, 322, 15, 16, - 100, 73, 74, 75, 160, 161, 162, 100, 164, 165, - 166, 204, 100, 199, 200, 201, 202, 203, 143, 205, - 206, 204, 208, 209, 102, 100, 9, 12, 11, 194, - 186, 187, 188, 189, 190, 191, 192, 193, 163, 101, - 100, 12, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 227, 12, 215, - 216, 217, 218, 219, 220, 100, 99, 9, 531, 11, - 226, 396, 212, 10, 91, 19, 20, 21, 334, 23, - 24, 69, 238, 100, 11, 102, 69, 243, 73, 74, - 75, 20, 364, 12, 20, 39, 40, 253, 9, 91, - 11, 45, 73, 74, 75, 430, 431, 73, 74, 75, - 54, 55, 19, 20, 21, 99, 23, 24, 100, 73, - 74, 75, 278, 279, 100, 10, 319, 69, 9, 285, - 11, 69, 39, 40, 320, 101, 319, 73, 74, 75, - 23, 465, 467, 11, 88, 75, 286, 103, 55, 305, - 306, 307, 308, 103, 73, 74, 75, 103, 69, 100, - 484, 485, 318, 99, 334, 321, 322, 429, 103, 425, - 432, 9, 496, 11, 436, 437, 18, 15, 16, 17, - 103, 102, 126, 21, 509, 100, 510, 511, 374, 20, - 100, 377, 378, 349, 99, 10, 458, 459, 338, 143, - 60, 525, 23, 389, 10, 10, 468, 10, 364, 10, - 20, 39, 40, 41, 42, 73, 74, 75, 46, 126, - 48, 60, 61, 23, 62, 487, 99, 87, 353, 491, - 492, 100, 92, 99, 99, 95, 96, 97, 98, 101, - 396, 185, 99, 101, 400, 73, 74, 75, 87, 99, - 99, 513, 99, 92, 67, 425, 95, 96, 97, 98, - 204, 9, 100, 99, 102, 103, 10, 99, 530, 9, - 100, 99, 101, 99, 430, 431, 538, 99, 91, 73, - 74, 75, 25, 71, 449, 77, 9, 100, 78, 102, - 101, 456, 73, 74, 75, 99, 70, 58, 59, 60, - 61, 73, 74, 75, 0, 100, 99, 101, 99, 19, - 466, 467, 101, 9, 454, 11, 12, 73, 74, 75, - 101, 486, 83, 84, 85, 86, 87, 12, 99, 101, - 99, 92, 98, 466, 95, 96, 97, 98, 503, 73, - 74, 75, 286, 39, 40, 41, 42, 73, 74, 75, - 46, 306, 48, 509, 92, 51, 531, 95, 96, 97, - 98, 526, 58, 59, 60, 61, 310, 101, 73, 74, - 75, 196, 497, 99, 33, 319, 376, 73, 74, 75, - 0, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 12, 81, 99, 58, 92, 60, 61, 95, - 96, 97, 98, 99, 245, 101, 443, 473, 104, 423, - 60, 61, 143, 474, -1, 73, 74, 75, 319, 39, - 40, 41, 42, 86, 87, 204, 46, -1, 48, 92, - -1, 51, 95, 96, 97, 98, 86, 87, 58, 59, - 60, 61, 92, 101, -1, 95, 96, 97, 98, 95, - 96, 97, 98, 73, 74, 75, -1, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 73, 74, - 75, -1, 92, -1, -1, 95, 96, 97, 98, 99, - -1, 101, 0, 1, 104, -1, -1, -1, -1, -1, - -1, 9, -1, 11, 99, 13, 14, 15, 16, 17, - -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 73, 74, 75, 46, 47, - 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, - 73, 74, 75, -1, 62, 63, 64, 65, 66, 67, - 68, 99, -1, 73, 74, 75, -1, -1, 76, -1, - -1, 73, 74, 75, -1, -1, 99, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, 0, 1, 99, - -1, -1, 100, 101, 102, 103, 9, 99, 11, -1, - 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, - 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, 87, -1, -1, -1, - -1, 92, -1, 76, 95, 96, 97, 98, 3, 4, - 5, 6, 7, 8, -1, 88, 89, -1, 91, -1, - 93, 94, -1, 1, -1, -1, -1, 100, 101, 102, - 103, 9, 10, 11, -1, 13, 14, 15, 16, 17, - -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, - 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, - -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, + 10, 11, 12, 15, 39, 9, 17, 18, 115, 126, + 9, 421, 47, 317, 11, 8, 45, 447, 100, 30, + 45, 20, 9, 34, 11, 77, 25, 38, 38, 11, + 41, 41, 23, 44, 141, 46, 307, 48, 49, 50, + 51, 52, 9, 19, 20, 21, 317, 23, 24, 320, + 321, 0, 104, 20, 9, 9, 11, 11, 25, 11, + 15, 16, 17, 39, 40, 11, 21, 9, 9, 19, + 20, 21, 69, 23, 24, 16, 100, 100, 12, 55, + 115, 91, 9, 76, 11, 15, 16, 17, 98, 39, + 40, 100, 102, 103, 20, 45, 526, 101, 133, 25, + 77, 42, 512, 102, 54, 55, 141, 62, 100, 226, + 101, 121, 53, 100, 143, 69, 98, 69, 143, 9, + 9, 392, 11, 9, 15, 16, 20, 15, 16, 73, + 74, 75, 143, 12, 100, 102, 103, 67, 88, 73, + 74, 75, 69, 100, 9, 100, 11, 102, 103, 9, + 126, 11, 163, 424, 425, 99, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 12, 102, 43, 44, 204, 126, 118, 12, 204, + 69, 452, 194, 100, 125, 126, 15, 16, 100, 73, + 74, 75, 227, 143, 73, 74, 75, 100, 100, 73, + 74, 75, 212, 144, 101, 45, 199, 200, 201, 202, + 203, 102, 205, 206, 102, 208, 209, 101, 522, 160, + 161, 162, 493, 164, 165, 166, 333, 101, 73, 74, + 75, 100, 73, 74, 75, 185, 73, 74, 75, 73, + 74, 75, 101, 100, 361, 186, 187, 188, 189, 190, + 191, 192, 193, 99, 204, 12, 101, 9, 12, 11, + 423, 12, 91, 426, 101, 23, 12, 430, 431, 450, + 67, 100, 99, 102, 215, 216, 217, 218, 219, 220, + 443, 444, 10, 464, 465, 226, 12, 69, 298, 318, + 453, 11, 91, 318, 91, 476, 237, 9, 333, 11, + 9, 242, 11, 100, 467, 102, 20, 20, 471, 472, + 100, 252, 419, 494, 495, 99, 73, 74, 75, 73, + 74, 75, 73, 74, 75, 69, 319, 73, 74, 75, + 10, 23, 513, 11, 497, 285, 277, 278, 75, 350, + 73, 74, 75, 284, 73, 74, 75, 73, 74, 75, + 103, 100, 18, 39, 40, 41, 42, 20, 521, 309, + 46, 103, 48, 304, 305, 306, 307, 530, 318, 73, + 74, 75, 101, 103, 99, 102, 317, 100, 371, 320, + 321, 374, 103, 23, 419, 87, 103, 73, 74, 75, + 92, 51, 385, 95, 96, 97, 98, 101, 58, 59, + 60, 61, 73, 74, 75, 346, 10, 39, 40, 41, + 42, 99, 60, 99, 46, 10, 48, 10, 78, 79, + 361, 81, 82, 83, 84, 85, 86, 87, 10, 441, + 101, 10, 92, 20, 99, 95, 96, 97, 98, 87, + 99, 73, 74, 75, 92, 457, 99, 95, 96, 97, + 98, 392, 462, 100, 466, 396, 73, 74, 75, 58, + 59, 60, 61, 99, 73, 74, 75, 101, 73, 74, + 75, 95, 96, 97, 98, 100, 486, 99, 99, 99, + 0, 491, 99, 424, 425, 84, 85, 86, 87, 9, + 99, 11, 12, 92, 99, 10, 95, 96, 97, 98, + 101, 99, 99, 514, 9, 9, 518, 73, 74, 75, + 451, 452, 100, 71, 99, 525, 73, 74, 75, 39, + 40, 41, 42, 73, 74, 75, 46, 101, 48, 101, + 99, 51, 100, 99, 101, 99, 25, 77, 58, 59, + 60, 61, 99, 73, 74, 75, 99, 78, 70, 99, + 19, 99, 493, 73, 74, 75, 0, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 12, 99, + 99, 58, 92, 60, 61, 95, 96, 97, 98, 99, + 12, 101, 98, 451, 104, 92, 60, 61, 95, 96, + 97, 98, 33, 522, 305, 39, 40, 41, 42, 86, + 87, 81, 46, 373, 48, 92, 196, 51, 95, 96, + 97, 98, 86, 87, 58, 59, 60, 61, 92, 417, + 501, 95, 96, 97, 98, 244, 480, 502, 440, 73, + 74, 75, 143, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 318, 204, -1, -1, 92, -1, + -1, 95, 96, 97, 98, 99, -1, 101, 0, 1, + 104, -1, -1, -1, -1, -1, -1, 9, -1, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, + 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 60, 61, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, + 62, 63, 64, 65, 66, 67, 68, -1, 87, -1, + -1, -1, -1, 92, 76, -1, 95, 96, 97, 98, + 3, 4, 5, 6, 7, 8, 88, 89, -1, 91, + -1, 93, 94, 0, 1, -1, -1, -1, 100, 101, + 102, 103, 9, -1, 11, -1, 13, 14, 15, 16, + 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, + 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, + 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, + 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, -1, 1, -1, - -1, -1, 100, 101, 102, 103, 9, 10, 11, -1, - 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, - 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, -1, -1, -1, -1, - -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, - 93, 94, -1, 1, -1, -1, -1, 100, 101, 102, - 103, 9, 10, 11, -1, 13, 14, 15, 16, 17, - -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, - 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, - -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, + -1, 88, 89, -1, 91, -1, 93, 94, -1, 1, + -1, -1, -1, 100, 101, 102, 103, 9, 10, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, + 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, + 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, + -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, + -1, 93, 94, -1, 1, -1, -1, -1, 100, 101, + 102, 103, 9, 10, 11, -1, 13, 14, 15, 16, + 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, + 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, + 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, + 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, -1, 1, -1, - -1, -1, 100, 101, 102, 103, 9, 10, 11, -1, - 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, - 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, -1, -1, -1, -1, - -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, - 93, 94, -1, 1, -1, -1, -1, 100, 101, 102, - 103, 9, 10, 11, -1, 13, 14, 15, 16, 17, + -1, 88, 89, -1, 91, -1, 93, 94, -1, 1, + -1, -1, -1, 100, 101, 102, 103, 9, 10, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, + 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, + 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, + -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, + -1, 93, 94, -1, 1, -1, -1, -1, 100, 101, + 102, 103, 9, 10, 11, -1, 13, 14, 15, 16, + 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, + 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, + 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, + 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 88, 89, -1, 91, -1, 93, 94, -1, 1, + -1, -1, -1, 100, 101, 102, 103, 9, -1, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, + 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, + 62, 63, 64, 65, 66, 67, 68, -1, -1, 71, + -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, + -1, 93, 94, -1, 1, -1, -1, -1, 100, 101, + 102, 103, 9, -1, 11, -1, 13, 14, 15, 16, + 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, + 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, + 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, + 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 88, 89, -1, 91, -1, 93, 94, -1, 1, + -1, -1, -1, 100, 101, 102, 103, 9, -1, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, + 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, + 32, -1, 34, 35, 36, 37, 38, 39, 40, 41, + 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, + 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, + -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, + -1, 93, 94, 1, -1, -1, -1, -1, 100, 101, + 102, 103, -1, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, - 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, + 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, + -1, 51, -1, -1, -1, -1, -1, -1, 58, 59, + 60, 61, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, -1, 1, -1, - -1, -1, 100, 101, 102, 103, 9, -1, 11, -1, - 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, - 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, -1, -1, 71, -1, - -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, - 93, 94, -1, 1, -1, -1, -1, 100, 101, 102, - 103, 9, -1, 11, -1, 13, 14, 15, 16, 17, + 68, 81, 82, 83, 84, 85, 86, 87, 76, -1, + -1, -1, 92, -1, -1, 95, 96, 97, 98, -1, + 88, 89, -1, 91, -1, 93, 94, 1, -1, -1, + -1, -1, 100, 101, 102, 103, -1, 11, -1, 13, + 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, + 24, -1, 26, 27, 28, 29, 30, 31, -1, -1, + -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, + 58, 59, 60, 61, -1, -1, 50, -1, -1, 53, + 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, + 64, 65, 66, 67, 68, 83, 84, 85, 86, 87, + -1, -1, 76, -1, 92, -1, -1, 95, 96, 97, + 98, -1, -1, -1, 88, 89, -1, 91, -1, 93, + 94, -1, -1, -1, -1, 99, 100, -1, 102, 103, + 9, -1, 11, -1, 13, 14, 15, 16, 17, -1, + -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, + -1, -1, -1, -1, 58, 59, 60, 61, -1, -1, + -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, + -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, + -1, 85, 86, 87, -1, -1, -1, 76, 92, -1, + -1, 95, 96, 97, 98, -1, -1, -1, -1, 88, + 89, -1, 91, -1, 93, 94, -1, -1, -1, -1, + -1, 100, -1, 102, 103, 9, -1, 11, -1, 13, + 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, + 24, -1, 26, 27, 28, 29, 30, 31, -1, -1, + -1, -1, 36, -1, -1, -1, -1, 58, 59, 60, + 61, -1, -1, -1, -1, -1, 50, -1, -1, 53, + 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, + 64, 65, 66, 67, 68, 86, 87, -1, -1, -1, + -1, 92, 76, -1, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, 88, 89, -1, 91, -1, 93, + 94, -1, -1, -1, -1, -1, 100, -1, 102, 103, + 11, 12, 13, 14, 15, 16, 17, -1, -1, 20, + 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, + 31, -1, -1, -1, -1, 36, -1, -1, -1, -1, + 58, 59, 60, 61, -1, -1, -1, -1, -1, 50, + -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, + -1, 62, 63, 64, 65, 66, 67, 68, 86, 87, + -1, -1, -1, -1, 92, 76, -1, 95, 96, 97, + 98, -1, -1, -1, -1, -1, -1, 88, 89, -1, + 91, -1, 93, 94, -1, -1, -1, -1, -1, 100, + -1, 102, 103, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, - 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, + 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, -1, 1, -1, - -1, -1, 100, 101, 102, 103, 9, -1, 11, -1, - 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, - 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, - -1, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, -1, -1, -1, -1, - -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, - 93, 94, 1, -1, -1, -1, -1, 100, 101, 102, - 103, -1, 11, -1, 13, 14, 15, 16, 17, -1, - -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, - 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, - 51, -1, -1, -1, -1, -1, -1, 58, 59, 60, - 61, 50, -1, -1, 53, 54, 55, 56, 57, -1, - -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, - 81, 82, 83, 84, 85, 86, 87, 76, -1, -1, - -1, 92, -1, -1, 95, 96, 97, 98, -1, 88, - 89, -1, 91, -1, 93, 94, 1, -1, -1, -1, - -1, 100, 101, 102, 103, -1, 11, -1, 13, 14, - 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, - -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, - -1, 36, -1, -1, -1, -1, -1, -1, 58, 59, - 60, 61, -1, -1, -1, 50, -1, -1, 53, 54, - 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, - 65, 66, 67, 68, 84, 85, 86, 87, -1, -1, - -1, 76, 92, -1, -1, 95, 96, 97, 98, -1, - -1, -1, -1, 88, 89, -1, 91, -1, 93, 94, - -1, -1, -1, -1, 99, 100, -1, 102, 103, 9, - -1, 11, -1, 13, 14, 15, 16, 17, -1, -1, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, - -1, -1, -1, 58, 59, 60, 61, -1, -1, -1, - 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, - -1, -1, 62, 63, 64, 65, 66, 67, 68, -1, - 85, 86, 87, -1, -1, -1, 76, 92, -1, -1, - 95, 96, 97, 98, -1, -1, -1, -1, 88, 89, - -1, 91, -1, 93, 94, -1, -1, -1, -1, -1, - 100, -1, 102, 103, 9, -1, 11, -1, 13, 14, + 88, 89, -1, 91, -1, 93, 94, -1, -1, -1, + -1, -1, 100, 101, 102, 103, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, - -1, 36, -1, -1, -1, -1, 58, 59, 60, 61, + -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, - 65, 66, 67, 68, 86, 87, -1, -1, -1, -1, - 92, 76, -1, 95, 96, 97, 98, -1, -1, -1, + 65, 66, 67, 68, -1, -1, -1, -1, -1, -1, + -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, 93, 94, - -1, -1, -1, -1, -1, 100, -1, 102, 103, 11, - 12, 13, 14, 15, 16, 17, -1, -1, 20, 21, + -1, -1, -1, -1, 99, 100, -1, 102, 103, 11, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, - -1, -1, -1, -1, 36, -1, -1, -1, -1, 58, - 59, 60, 61, -1, -1, -1, -1, -1, 50, -1, + -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, - 62, 63, 64, 65, 66, 67, 68, 86, 87, -1, - -1, -1, -1, 92, 76, -1, 95, 96, 97, 98, + 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, + -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, - -1, 93, 94, -1, -1, -1, -1, -1, 100, -1, + -1, 93, 94, -1, -1, -1, -1, 99, 100, -1, 102, 103, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, - 29, 30, 31, -1, -1, -1, -1, 36, 39, 40, - 41, 42, -1, -1, -1, 46, -1, 48, -1, -1, + 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, - -1, -1, 73, 74, 75, -1, -1, 76, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, 93, 94, -1, -1, -1, -1, - -1, 100, 101, 102, 103, 11, -1, 13, 14, 15, + 99, 100, -1, 102, 103, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -895,55 +905,23 @@ static const yytype_int16 yycheck[] = 64, 65, 66, 67, 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, 91, -1, 93, - 94, -1, -1, -1, -1, 99, 100, -1, 102, 103, + 94, -1, -1, -1, -1, -1, 100, -1, 102, 103, 11, -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, -1, -1, - -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, 89, -1, - 91, -1, 93, 94, -1, -1, -1, -1, 99, 100, - -1, 102, 103, 11, -1, 13, 14, 15, 16, 17, - -1, -1, 20, 21, 22, 23, 24, -1, 26, 27, - 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 50, -1, -1, 53, 54, 55, 56, 57, - -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - 68, -1, -1, -1, -1, -1, -1, -1, 76, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, -1, 91, -1, 93, 94, -1, -1, -1, - -1, 99, 100, -1, 102, 103, 11, -1, 13, 14, - 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, - -1, 26, 27, 28, 29, 30, 31, -1, -1, -1, - -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 50, -1, -1, 53, 54, - 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, - 65, 66, 67, 68, -1, -1, -1, -1, -1, -1, - -1, 76, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 88, 89, -1, 91, -1, 93, 94, - -1, -1, -1, -1, -1, 100, -1, 102, 103, 11, - -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, - 22, 23, 24, -1, 26, 27, 28, 29, 30, 31, - -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, - -1, 53, 54, 55, 56, 57, -1, -1, -1, -1, - 62, 63, 64, 65, 66, 67, 68, -1, -1, -1, - -1, -1, -1, -1, 76, 51, -1, -1, -1, -1, - -1, -1, 58, 59, 60, 61, 88, 89, -1, 91, - -1, 93, 94, -1, -1, -1, -1, -1, 100, -1, - 102, 103, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, -1, -1, -1, -1, 92, 51, -1, 95, - 96, 97, 98, -1, 58, 59, 60, 61, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 78, 79, -1, 81, 82, 83, - 84, 85, 86, 87, -1, -1, -1, -1, 92, 51, - -1, 95, 96, 97, 98, -1, 58, 59, 60, 61, + -1, -1, -1, -1, -1, 76, 51, -1, -1, -1, + -1, -1, -1, 58, 59, 60, 61, 88, 89, -1, + 91, -1, 93, 94, -1, -1, -1, -1, -1, 100, + -1, 102, 103, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, -1, -1, -1, -1, 92, 51, -1, + 95, 96, 97, 98, -1, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 79, -1, 81, - 82, 83, 84, 85, 86, 87, -1, -1, -1, -1, - 92, -1, -1, 95, 96, 97, 98 + -1, -1, -1, -1, -1, -1, 79, -1, 81, 82, + 83, 84, 85, 86, 87, -1, -1, -1, -1, 92, + -1, -1, 95, 96, 97, 98 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -959,51 +937,51 @@ static const yytype_uint8 yystos[] = 166, 167, 168, 169, 170, 172, 175, 181, 182, 183, 184, 185, 186, 187, 188, 189, 9, 113, 1, 32, 34, 35, 37, 38, 39, 40, 41, 42, 46, 47, - 48, 49, 52, 101, 113, 122, 132, 160, 33, 120, + 48, 49, 52, 101, 113, 122, 131, 160, 33, 120, 121, 122, 118, 118, 12, 160, 170, 170, 20, 25, 113, 182, 190, 190, 190, 190, 190, 171, 11, 100, - 170, 143, 143, 170, 100, 100, 100, 113, 170, 20, + 170, 142, 142, 170, 100, 100, 100, 113, 170, 20, 161, 174, 182, 190, 190, 113, 170, 101, 160, 20, - 25, 145, 170, 91, 100, 173, 182, 183, 184, 170, + 25, 144, 170, 91, 100, 173, 182, 183, 184, 170, 161, 170, 170, 170, 170, 170, 99, 160, 190, 190, 73, 74, 75, 77, 9, 11, 100, 51, 58, 59, 60, 61, 78, 79, 81, 82, 83, 84, 85, 86, 87, 92, 95, 96, 97, 98, 100, 9, 11, 9, - 11, 9, 11, 9, 115, 144, 145, 20, 142, 100, + 11, 9, 11, 9, 115, 143, 144, 20, 141, 100, 100, 100, 100, 67, 91, 100, 180, 182, 100, 100, - 113, 101, 45, 134, 101, 39, 40, 41, 42, 46, + 113, 101, 45, 133, 101, 39, 40, 41, 42, 46, 48, 121, 122, 120, 12, 174, 100, 100, 160, 99, - 113, 23, 115, 146, 99, 99, 160, 175, 190, 161, - 10, 101, 174, 100, 170, 173, 182, 183, 184, 99, - 160, 69, 148, 11, 99, 160, 160, 160, 170, 160, - 160, 99, 160, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 9, 11, - 15, 16, 17, 21, 62, 100, 102, 103, 164, 182, - 99, 160, 160, 160, 160, 160, 160, 160, 160, 118, - 20, 141, 142, 20, 125, 115, 115, 115, 115, 91, - 115, 67, 178, 179, 181, 182, 183, 184, 115, 115, - 100, 115, 115, 113, 160, 138, 160, 160, 160, 160, - 160, 175, 161, 12, 163, 100, 157, 69, 147, 99, - 99, 160, 10, 99, 160, 148, 99, 23, 160, 11, - 101, 12, 99, 80, 160, 160, 103, 103, 103, 103, - 99, 160, 103, 103, 100, 99, 101, 12, 101, 12, - 101, 12, 101, 10, 18, 114, 123, 124, 9, 101, - 20, 137, 160, 138, 139, 160, 139, 177, 182, 100, - 132, 136, 139, 140, 160, 178, 115, 139, 139, 99, - 104, 176, 174, 158, 147, 23, 113, 99, 99, 12, - 160, 10, 170, 101, 12, 99, 175, 10, 10, 10, - 10, 115, 146, 115, 115, 20, 99, 99, 99, 99, - 100, 115, 99, 101, 128, 139, 99, 99, 160, 99, - 15, 16, 102, 150, 151, 153, 154, 155, 156, 9, - 12, 10, 99, 101, 147, 157, 129, 174, 135, 135, - 9, 116, 116, 139, 139, 116, 126, 100, 99, 116, - 116, 25, 149, 149, 77, 99, 118, 71, 101, 113, - 159, 147, 118, 101, 116, 116, 117, 43, 44, 133, - 133, 99, 99, 134, 137, 139, 116, 78, 152, 152, - 154, 10, 119, 9, 10, 134, 134, 118, 116, 100, - 116, 116, 101, 99, 134, 170, 23, 101, 130, 118, - 10, 139, 134, 134, 127, 116, 70, 131, 19, 10, - 99, 135, 134, 118, 116, 140, 71, 133, 99, 116 + 113, 23, 145, 99, 99, 160, 175, 190, 161, 10, + 101, 174, 100, 170, 173, 182, 183, 184, 99, 160, + 69, 147, 11, 99, 160, 160, 160, 170, 160, 160, + 99, 160, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 9, 11, 15, + 16, 17, 21, 62, 100, 102, 103, 164, 182, 99, + 160, 160, 160, 160, 160, 160, 160, 160, 118, 20, + 140, 141, 20, 124, 115, 115, 115, 115, 91, 115, + 67, 178, 179, 181, 182, 183, 184, 115, 115, 100, + 115, 115, 113, 160, 137, 160, 160, 160, 160, 160, + 175, 161, 12, 163, 69, 146, 99, 99, 160, 10, + 99, 160, 147, 99, 23, 160, 11, 101, 12, 99, + 80, 160, 160, 103, 103, 103, 103, 99, 160, 103, + 103, 100, 99, 101, 12, 101, 12, 101, 12, 101, + 10, 18, 114, 123, 9, 101, 20, 136, 160, 137, + 138, 160, 138, 177, 182, 100, 131, 135, 138, 139, + 160, 178, 115, 138, 138, 99, 104, 176, 174, 23, + 115, 158, 99, 99, 12, 160, 10, 170, 101, 12, + 99, 175, 10, 10, 10, 10, 115, 145, 115, 20, + 99, 99, 99, 99, 100, 115, 99, 101, 127, 138, + 99, 99, 160, 99, 100, 156, 12, 10, 99, 101, + 146, 128, 174, 134, 134, 9, 116, 116, 138, 138, + 116, 125, 100, 99, 116, 116, 157, 9, 71, 101, + 158, 159, 118, 101, 116, 116, 117, 43, 44, 132, + 132, 99, 99, 133, 136, 138, 116, 15, 16, 102, + 149, 150, 152, 153, 154, 155, 118, 119, 10, 133, + 133, 118, 116, 100, 116, 116, 101, 99, 133, 25, + 148, 148, 77, 99, 10, 23, 101, 129, 10, 138, + 133, 133, 126, 116, 78, 151, 151, 153, 70, 130, + 19, 99, 134, 133, 170, 118, 116, 139, 71, 132, + 99, 116 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1012,31 +990,31 @@ static const yytype_uint8 yyr1[] = 0, 105, 107, 106, 108, 106, 109, 106, 110, 106, 111, 106, 112, 106, 113, 114, 115, 116, 117, 118, 118, 119, 119, 120, 120, 121, 121, 122, 122, 123, - 122, 124, 122, 122, 125, 122, 122, 122, 122, 122, - 122, 122, 122, 126, 127, 122, 122, 122, 128, 122, - 122, 122, 122, 129, 122, 122, 122, 122, 130, 131, - 131, 132, 132, 132, 132, 132, 132, 132, 132, 133, - 133, 133, 134, 134, 135, 136, 136, 137, 137, 138, - 139, 140, 141, 141, 142, 143, 144, 145, 145, 146, - 146, 147, 147, 147, 148, 148, 149, 149, 150, 150, - 151, 152, 152, 152, 153, 154, 154, 155, 155, 155, - 156, 156, 158, 157, 159, 159, 160, 160, 160, 160, + 122, 122, 124, 122, 122, 122, 122, 122, 122, 122, + 122, 125, 126, 122, 122, 122, 127, 122, 122, 122, + 122, 128, 122, 122, 122, 122, 129, 130, 130, 131, + 131, 131, 131, 131, 131, 131, 131, 132, 132, 132, + 133, 133, 134, 135, 135, 136, 136, 137, 138, 139, + 140, 140, 141, 142, 143, 144, 144, 145, 145, 146, + 146, 146, 147, 147, 148, 148, 149, 149, 150, 151, + 151, 151, 152, 153, 153, 154, 154, 154, 155, 155, + 156, 157, 156, 158, 159, 159, 160, 160, 160, 160, 161, 161, 161, 162, 162, 162, 162, 162, 162, 162, 162, 163, 162, 164, 164, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 168, 168, 168, 168, 168, 168, 169, 169, + 167, 167, 168, 168, 168, 168, 168, 169, 169, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 171, - 170, 170, 170, 170, 172, 172, 172, 173, 173, 173, - 173, 173, 174, 174, 175, 175, 176, 176, 177, 178, - 178, 178, 179, 179, 180, 180, 181, 182, 183, 184, - 185, 185, 186, 187, 187, 188, 188, 189, 189, 190, - 190, 190, 190 + 170, 170, 170, 170, 170, 170, 170, 170, 171, 170, + 170, 170, 170, 172, 172, 172, 173, 173, 173, 173, + 173, 174, 174, 175, 175, 176, 176, 177, 178, 178, + 178, 179, 179, 180, 180, 181, 182, 183, 184, 185, + 185, 186, 187, 187, 188, 188, 189, 189, 190, 190, + 190, 190 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1045,31 +1023,31 @@ static const yytype_uint8 yyr2[] = 0, 2, 0, 4, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 4, 7, 0, 4, 0, 0, 2, 0, 2, 1, 1, 2, 2, 1, 4, 0, - 7, 0, 10, 4, 0, 7, 7, 7, 6, 6, - 2, 8, 8, 0, 0, 13, 9, 8, 0, 10, - 9, 7, 2, 0, 8, 2, 2, 1, 2, 0, - 3, 1, 1, 3, 3, 3, 3, 3, 3, 0, - 2, 6, 0, 2, 0, 0, 1, 0, 1, 1, - 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, - 1, 0, 2, 1, 2, 1, 0, 1, 1, 1, - 3, 0, 1, 2, 3, 1, 1, 2, 3, 1, - 0, 1, 0, 4, 1, 1, 3, 3, 3, 1, + 7, 4, 0, 7, 7, 7, 6, 6, 2, 8, + 8, 0, 0, 13, 9, 8, 0, 10, 9, 7, + 2, 0, 8, 2, 2, 1, 2, 0, 3, 1, + 1, 3, 3, 3, 3, 3, 3, 0, 2, 6, + 0, 2, 0, 0, 1, 0, 1, 1, 1, 1, + 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, + 2, 1, 2, 1, 0, 1, 1, 1, 3, 0, + 1, 2, 3, 1, 1, 2, 3, 1, 0, 1, + 0, 0, 4, 5, 1, 1, 3, 3, 3, 1, 2, 3, 1, 3, 5, 6, 3, 3, 5, 2, 4, 0, 5, 1, 1, 5, 4, 5, 4, 5, 6, 5, 4, 5, 4, 3, 6, 4, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 4, 3, 5, 8, 2, 2, - 1, 1, 1, 1, 5, 2, 3, 1, 2, 3, - 1, 2, 1, 1, 1, 1, 1, 1, 4, 4, - 5, 5, 1, 1, 3, 4, 3, 4, 4, 4, - 4, 4, 1, 2, 2, 1, 2, 2, 1, 2, - 1, 2, 1, 3, 1, 3, 1, 3, 4, 0, - 6, 1, 1, 1, 3, 2, 4, 3, 2, 1, - 1, 1, 0, 1, 0, 1, 0, 2, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 4, 2, 1, 3, 1, 3, 1, 3, 1, - 1, 1, 1 + 2, 2, 3, 2, 4, 3, 5, 2, 2, 1, + 1, 1, 1, 5, 2, 3, 1, 2, 3, 1, + 2, 1, 1, 1, 1, 1, 1, 4, 4, 5, + 5, 1, 1, 3, 4, 3, 4, 4, 4, 4, + 4, 1, 2, 2, 1, 2, 2, 1, 2, 1, + 2, 1, 3, 1, 3, 1, 3, 4, 0, 6, + 1, 1, 1, 3, 2, 4, 3, 2, 1, 1, + 1, 0, 1, 0, 1, 0, 2, 1, 1, 1, + 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 4, 2, 1, 3, 1, 3, 1, 3, 1, 1, + 1, 1 }; typedef enum { @@ -1097,20 +1075,20 @@ static const toketypes yy_type_tab[] = toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval + toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval }; /* Generated from: - * fca93dc4b6a371876339e9ad458685bd6fe71cfe326ff40ea9c78a9acf02da64 perly.y + * c85e1793baa49bfdf6f1329f04fd8b57a616cfc2f5dce01702d3d727f6511157 perly.y * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl * ex: set ro: */ diff --git a/perly.y b/perly.y index 45536f2..30d8360 100644 --- a/perly.y +++ b/perly.y @@ -74,7 +74,7 @@ %type formname subname proto optsubbody cont my_scalar my_var %type refgen_topic formblock %type subattrlist myattrlist myattrterm myterm -%type termbinop termunop anonymous termdo +%type realsubbody termbinop termunop anonymous termdo %type sigslurpsigil %type sigvarname sigdefault sigscalarelem sigslurpelem %type sigelem siglist siglistornull subsignature @@ -306,45 +306,6 @@ barestmt: PLUGSTMT intro_my(); parser->parsed_sub = 1; } - | SUB subname startsub - { - if ($2->op_type == OP_CONST) { - const char *const name = - SvPV_nolen_const(((SVOP*)$2)->op_sv); - if (strEQ(name, "BEGIN") || strEQ(name, "END") - || strEQ(name, "INIT") || strEQ(name, "CHECK") - || strEQ(name, "UNITCHECK")) - CvSPECIAL_on(PL_compcv); - } - else - /* State subs inside anonymous subs need to be - clonable themselves. */ - if (CvANON(CvOUTSIDE(PL_compcv)) - || CvCLONE(CvOUTSIDE(PL_compcv)) - || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST( - CvOUTSIDE(PL_compcv) - ))[$2->op_targ])) - CvCLONE_on(PL_compcv); - parser->in_my = 0; - parser->in_my_stash = NULL; - } - remember subsignature subattrlist '{' stmtseq '}' - { - OP *body; - if (parser->copline > (line_t)$8) - parser->copline = (line_t)$8; - body = block_end($5, - op_append_list(OP_LINESEQ, $6, $9)); - - SvREFCNT_inc_simple_void(PL_compcv); - $2->op_type == OP_CONST - ? newATTRSUB($3, $2, NULL, $7, body) - : newMYSUB($3, $2, NULL, $7, body) - ; - $$ = NULL; - intro_my(); - parser->parsed_sub = 1; - } | PACKAGE BAREWORD BAREWORD ';' { package($3); @@ -781,7 +742,8 @@ siglistornull: /* NULL */ { $$ = $1; } /* Subroutine signature */ -subsignature: '(' +subsignature: /* NULL */ { $$ = (OP*)NULL; } + | '(' { ENTER; SAVEIV(parser->sig_elems); @@ -799,9 +761,9 @@ subsignature: '(' UNOP_AUX_item *aux; OP *check; - if (!parser->error_count) { - assert(FEATURE_SIGNATURES_IS_ENABLED); - } + if (!FEATURE_SIGNATURES_IS_ENABLED) + Perl_croak(aTHX_ "Experimental " + "subroutine signatures not enabled"); /* We shouldn't get here otherwise */ Perl_ck_warner_d(aTHX_ @@ -825,15 +787,25 @@ subsignature: '(' newSTATEOP(0, NULL, NULL)); parser->in_my = 0; - parser->expect = XATTRBLOCK; + parser->expect = XBLOCK; LEAVE; } ; +/* Subroutine body - block with optional signature */ +realsubbody: remember subsignature '{' stmtseq '}' + { + if (parser->copline > (line_t)$3) + parser->copline = (line_t)$3; + $$ = block_end($1, + op_append_list(OP_LINESEQ, $2, $4)); + } + ; + /* Optional subroutine body, for named subroutine declaration */ -optsubbody: block +optsubbody: realsubbody { $$ = $1; } | ';' { $$ = NULL; } ; @@ -1052,20 +1024,9 @@ anonymous: '[' expr ']' { $$ = newANONHASH($2); } | HASHBRACK ';' '}' %prec '(' /* { } (';' by tokener) */ { $$ = newANONHASH(NULL); } - | ANONSUB startanonsub proto subattrlist block %prec '(' + | ANONSUB startanonsub proto subattrlist realsubbody %prec '(' { SvREFCNT_inc_simple_void(PL_compcv); $$ = newANONATTRSUB($2, $3, $4, $5); } - | ANONSUB startanonsub remember subsignature subattrlist '{' stmtseq '}' %prec '(' - { - OP *body; - if (parser->copline > (line_t)$6) - parser->copline = (line_t)$6; - body = block_end($3, - op_append_list(OP_LINESEQ, $4, $7)); - SvREFCNT_inc_simple_void(PL_compcv); - $$ = newANONATTRSUB($2, NULL, $5, body); - } - ; /* Things called with "do" */ diff --git a/pod/perlsub.pod b/pod/perlsub.pod index 8490630..a761e3d 100644 --- a/pod/perlsub.pod +++ b/pod/perlsub.pod @@ -15,20 +15,25 @@ X X sub NAME BLOCK # A declaration and a definition. sub NAME(PROTO) BLOCK # ditto, but with prototypes - sub NAME(SIG) BLOCK # with a signature instead sub NAME : ATTRS BLOCK # with attributes sub NAME(PROTO) : ATTRS BLOCK # with prototypes and attributes - sub NAME(SIG) : ATTRS BLOCK # with a signature and attributes + + use feature 'signatures'; + sub NAME(SIG) BLOCK # with signature + sub NAME :ATTRS (SIG) BLOCK # with signature, attributes + sub NAME :prototype(PROTO) (SIG) BLOCK # with signature, prototype To define an anonymous subroutine at runtime: X $subref = sub BLOCK; # no proto $subref = sub (PROTO) BLOCK; # with proto - $subref = sub (SIG) BLOCK; # with signature $subref = sub : ATTRS BLOCK; # with attributes $subref = sub (PROTO) : ATTRS BLOCK; # with proto and attributes - $subref = sub (SIG) : ATTRS BLOCK; # with signature and attributes + + use feature 'signatures'; + $subref = sub (SIG) BLOCK; # with signature + $subref = sub : ATTRS(SIG) BLOCK; # with signature, attributes To import subroutines: X @@ -317,10 +322,15 @@ a warning unless the "experimental::signatures" warnings category is disabled. The signature is part of a subroutine's body. Normally the body of a -subroutine is simply a braced block of code. When using a signature, -the signature is a parenthesised list that goes immediately after -the subroutine name (or, for anonymous subroutines, immediately after -the C keyword). The signature declares lexical variables that are +subroutine is simply a braced block of code, but when using a signature, +the signature is a parenthesised list that goes immediately before the +block, after any name or attributes. + +For example, + + sub foo :lvalue ($a, $b = 1, @c) { .... } + +The signature declares lexical variables that are in scope for the block. When the subroutine is called, the signature takes control first. It populates the signature variables from the list of arguments that were passed. If the argument list doesn't meet @@ -490,12 +500,13 @@ a signature. They do different jobs: the prototype affects compilation of calls to the subroutine, and the signature puts argument values into lexical variables at runtime. You can therefore write - sub foo ($left, $right) : prototype($$) { + sub foo :prototype($$) ($left, $right) { return $left + $right; } -The prototype attribute, and any other attributes, come after -the signature. +The prototype attribute, and any other attributes, must come before +the signature. The signature always immediately precedes the block of +the subroutine's body. =head2 Private Variables via my() X X X X X diff --git a/t/op/signatures.t b/t/op/signatures.t index 8ab8db3..2bf01ce 100644 --- a/t/op/signatures.t +++ b/t/op/signatures.t @@ -20,6 +20,16 @@ our $z; is $a, 123; } +eval "#line 8 foo\nsub t004 :method (\$a) { }"; +is $@, "Experimental subroutine signatures not enabled at foo line 8\.\n", + "error when not enabled"; + +eval "#line 8 foo\nsub t005 (\$) (\$a) { }"; +is $@, "Experimental subroutine signatures not enabled at foo line 8\.\n", + "error when not enabled"; + + + no warnings "experimental::signatures"; use feature "signatures"; @@ -1136,7 +1146,7 @@ is eval("\$t103->(456, 789, 987)"), undef; like $@, qr/\AToo many arguments for subroutine 'main::__ANON__' at \(eval \d+\) line 1\.\n\z/; is $a, 123; -my $t118 = sub ($a) :prototype($) { $a || "z" }; +my $t118 = sub :prototype($) ($a) { $a || "z" }; is prototype($t118), "\$"; is eval("\$t118->()"), undef; like $@, qr/\AToo few arguments for subroutine 'main::__ANON__' at \(eval \d+\) line 1\.\n\z/; @@ -1202,7 +1212,7 @@ is eval("t132(sub { \"x\".(\$_[1] // sub{\$_[0]})->(\$_[0]).\"x\" }, 789)"), like $@, qr/\AToo many arguments for subroutine 'main::t132' at \(eval \d+\) line 1\.\n\z/; is $a, 123; -sub t104($a) :method { $a || "z" } +sub t104 :method ($a) { $a || "z" } is prototype(\&t104), undef; is eval("t104()"), undef; like $@, qr/\AToo few arguments for subroutine 'main::t104' at \(eval \d+\) line 1\.\n\z/; @@ -1214,7 +1224,7 @@ is eval("t104(456, 789, 987)"), undef; like $@, qr/\AToo many arguments for subroutine 'main::t104' at \(eval \d+\) line 1\.\n\z/; is $a, 123; -sub t105($a) :prototype($) { $a || "z" } +sub t105 :prototype($) ($a) { $a || "z" } is prototype(\&t105), "\$"; is eval("t105()"), undef; like $@, qr/\ANot enough arguments for main::t105 /; @@ -1226,7 +1236,7 @@ is eval("t105(456, 789, 987)"), undef; like $@, qr/\AToo many arguments for main::t105 at \(eval \d+\) line 1, near/; is $a, 123; -sub t106($a) :prototype(@) { $a || "z" } +sub t106 :prototype(@) ($a) { $a || "z" } is prototype(\&t106), "\@"; is eval("t106()"), undef; like $@, qr/\AToo few arguments for subroutine 'main::t106' at \(eval \d+\) line 1\.\n\z/; @@ -1238,10 +1248,10 @@ is eval("t106(456, 789, 987)"), undef; like $@, qr/\AToo many arguments for subroutine 'main::t106' at \(eval \d+\) line 1\.\n\z/; is $a, 123; -eval "#line 8 foo\nsub t107 :method (\$a) { }"; +eval "#line 8 foo\nsub t107(\$a) :method { }"; isnt $@, ""; -eval "#line 8 foo\nsub t108 :prototype(\$) (\$a) { }"; +eval "#line 8 foo\nsub t108 (\$a) :prototype(\$) { }"; isnt $@, ""; sub t109 { } @@ -1514,6 +1524,21 @@ while(<$kh>) { } } +# RT #132141 +# Attributes such as lvalue have to come *before* the signature to +# ensure that they're applied to any code block within the signature + +{ + my $x; + sub f :lvalue ($a = do { $x = "abc"; return substr($x,0,1)}) { + die; # notreached + } + + f() = "X"; + is $x, "Xbc", "RT #132141"; +} + + done_testing; 1; -- 1.8.3.1