X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5a5094bd2bc239cc8cbe175655a49a3401f3ed50..c002ae9ab5e2b176614fd95831af56e7b5945202:/perly.y diff --git a/perly.y b/perly.y index 5abfa5a..0f98f59 100644 --- a/perly.y +++ b/perly.y @@ -1,6 +1,7 @@ /* perly.y * * Copyright (c) 1991-2002, 2003, 2004, 2005, 2006 Larry Wall + * Copyright (c) 2007, 2008, 2009, 2010, 2011 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -9,8 +10,12 @@ /* * 'I see,' laughed Strider. 'I look foul and feel fair. Is that it? - * All that is gold does not glitter, not all those who wander are lost.' + * All that is gold does not glitter, not all those who wander are lost.' * + * [p.171 of _The Lord of the Rings_, I/x: "Strider"] + */ + +/* * This file holds the grammar for the Perl language. If edited, you need * to run regen_perly.pl, which re-creates the files perly.h, perly.tab * and perly.act which are derived from this. @@ -44,7 +49,7 @@ /* FIXME for MAD - is the new mintro on while and until important? */ -%start prog +%start grammar %union { I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; @@ -64,37 +69,37 @@ #endif } -%token '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';' +%token GRAMPROG GRAMEXPR GRAMBLOCK GRAMBARESTMT GRAMFULLSTMT GRAMSTMTSEQ -%token WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF -%token FUNC0SUB UNIOPSUB LSTOPSUB +%token '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';' '=' '.' + +%token WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF QWLIST +%token FUNC0OP FUNC0SUB UNIOPSUB LSTOPSUB +%token PLUGEXPR PLUGSTMT %token LABEL %token FORMAT SUB ANONSUB PACKAGE USE %token WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR %token GIVEN WHEN DEFAULT -%token LOOPEX DOTDOT +%token LOOPEX DOTDOT YADAYADA %token FUNC0 FUNC1 FUNC UNIOP LSTOP %token RELOP EQOP MULOP ADDOP %token DOLSHARP DO HASHBRACK NOAMP -%token LOCAL MY MYSUB REQUIRE -%token COLONATTR +%token LOCAL MY REQUIRE +%token COLONATTR FORMLBRACK FORMRBRACK -%type prog progstart remember mremember savescope +%type grammar remember mremember %type startsub startanonsub startformsub /* FIXME for MAD - are these two ival? */ -%type mydefsv mintro - -%type decl format subrout mysubrout package use peg +%type mintro -%type block mblock lineseq line loop cond else +%type stmtseq fullstmt labfullstmt barestmt block mblock else %type expr term subscripted scalar ary hsh arylen star amper sideff -%type argexpr nexpr texpr iexpr mexpr mnexpr miexpr -%type listexpr listexprcom indirob listop method -%type formname subname proto subbody cont my_scalar +%type listexpr nexpr texpr iexpr mexpr mnexpr miexpr +%type optlistexpr optexpr indirob listop method +%type formname subname proto subbody cont my_scalar formblock %type subattrlist myattrlist myattrterm myterm %type termbinop termunop anonymous termdo -%type switch case -%type label +%type formstmtseq formline formarg %nonassoc PREC_LOW %nonassoc LOOPEX @@ -106,7 +111,7 @@ %left ',' %right ASSIGNOP %right '?' ':' -%nonassoc DOTDOT +%nonassoc DOTDOT YADAYADA %left OROR DORDOR %left ANDAND %left BITOROP @@ -131,40 +136,99 @@ %% /* RULES */ -/* The whole program */ -prog : progstart - /*CONTINUED*/ lineseq - { $$ = $1; newPROG(block_end($1,$2)); } +/* Top-level choice of what kind of thing yyparse was called to parse */ +grammar : GRAMPROG + { + PL_parser->expect = XSTATE; + } + remember stmtseq + { + newPROG(block_end($3,$4)); + $$ = 0; + } + | GRAMEXPR + { + parser->expect = XTERM; + } + optexpr + { + PL_eval_root = $3; + $$ = 0; + } + | GRAMBLOCK + { + parser->expect = XBLOCK; + } + block + { + PL_pad_reset_pending = TRUE; + PL_eval_root = $3; + $$ = 0; + yyunlex(); + parser->yychar = YYEOF; + } + | GRAMBARESTMT + { + parser->expect = XSTATE; + } + barestmt + { + PL_pad_reset_pending = TRUE; + PL_eval_root = $3; + $$ = 0; + yyunlex(); + parser->yychar = YYEOF; + } + | GRAMFULLSTMT + { + parser->expect = XSTATE; + } + fullstmt + { + PL_pad_reset_pending = TRUE; + PL_eval_root = $3; + $$ = 0; + yyunlex(); + parser->yychar = YYEOF; + } + | GRAMSTMTSEQ + { + parser->expect = XSTATE; + } + stmtseq + { + PL_eval_root = $3; + $$ = 0; + } ; /* An ordinary block */ -block : '{' remember lineseq '}' - { if (PL_copline > (line_t)IVAL($1)) - PL_copline = (line_t)IVAL($1); +block : '{' remember stmtseq '}' + { if (PL_parser->copline > (line_t)IVAL($1)) + PL_parser->copline = (line_t)IVAL($1); $$ = block_end($2, $3); TOKEN_GETMAD($1,$$,'{'); TOKEN_GETMAD($4,$$,'}'); } ; -remember: /* NULL */ /* start a full lexical scope */ - { $$ = block_start(TRUE); } - ; - -mydefsv: /* NULL */ /* lexicalize $_ */ - { $$ = (I32) allocmy("$_"); } +/* format body */ +formblock: '=' remember ';' FORMRBRACK formstmtseq ';' '.' + { if (PL_parser->copline > (line_t)IVAL($1)) + PL_parser->copline = (line_t)IVAL($1); + $$ = block_end($2, $5); + TOKEN_GETMAD($1,$$,'{'); + TOKEN_GETMAD($7,$$,'}'); + } ; -progstart: - { - PL_expect = XSTATE; $$ = block_start(TRUE); - } +remember: /* NULL */ /* start a full lexical scope */ + { $$ = block_start(TRUE); } ; - -mblock : '{' mremember lineseq '}' - { if (PL_copline > (line_t)IVAL($1)) - PL_copline = (line_t)IVAL($1); +mblock : '{' mremember stmtseq '}' + { if (PL_parser->copline > (line_t)IVAL($1)) + PL_parser->copline = (line_t)IVAL($1); $$ = block_end($2, $3); TOKEN_GETMAD($1,$$,'{'); TOKEN_GETMAD($4,$$,'}'); @@ -175,74 +239,337 @@ mremember: /* NULL */ /* start a partial lexical scope */ { $$ = block_start(FALSE); } ; -savescope: /* NULL */ /* remember stack pos in case of error */ - { $$ = PL_savestack_ix; } +/* A sequence of statements in the program */ +stmtseq : /* NULL */ + { $$ = (OP*)NULL; } + | stmtseq fullstmt + { $$ = op_append_list(OP_LINESEQ, $1, $2); + PL_pad_reset_pending = TRUE; + if ($1 && $2) + PL_hints |= HINT_BLOCK_SCOPE; + } + ; -/* A collection of "lines" in the program */ -lineseq : /* NULL */ - { $$ = Nullop; } - | lineseq decl - { - $$ = IF_MAD( - append_list(OP_LINESEQ, - (LISTOP*)$1, (LISTOP*)$2), - $1); - } - | lineseq savescope line - { LEAVE_SCOPE($2); - $$ = append_list(OP_LINESEQ, - (LISTOP*)$1, (LISTOP*)$3); +/* A sequence of format lines */ +formstmtseq: /* NULL */ + { $$ = (OP*)NULL; } + | formstmtseq formline + { $$ = op_append_list(OP_LINESEQ, $1, $2); PL_pad_reset_pending = TRUE; - if ($1 && $3) PL_hints |= HINT_BLOCK_SCOPE; } + if ($1 && $2) + PL_hints |= HINT_BLOCK_SCOPE; + } ; -/* A "line" in the program */ -line : label cond - { $$ = newSTATEOP(0, PVAL($1), $2); - TOKEN_GETMAD($1,((LISTOP*)$$)->op_first,'L'); } - | loop /* loops add their own labels */ - | switch /* ... and so do switches */ +/* A statement in the program, including optional labels */ +fullstmt: barestmt + { + if($1) { + $$ = newSTATEOP(0, NULL, $1); + } else { + $$ = IF_MAD(newOP(OP_NULL, 0), NULL); + } + } + | labfullstmt { $$ = $1; } - | label case - { $$ = newSTATEOP(0, PVAL($1), $2); } - | label ';' + ; + +labfullstmt: LABEL barestmt + { + $$ = newSTATEOP(SVf_UTF8 + * PVAL($1)[strlen(PVAL($1))+1], + PVAL($1), $2); + TOKEN_GETMAD($1, + $2 ? cLISTOPx($$)->op_first : $$, 'L'); + } + | LABEL labfullstmt { - if (PVAL($1)) { - $$ = newSTATEOP(0, PVAL($1), newOP(OP_NULL, 0)); - TOKEN_GETMAD($1,$$,'L'); - TOKEN_GETMAD($2,((LISTOP*)$$)->op_first,';'); + $$ = newSTATEOP(SVf_UTF8 + * PVAL($1)[strlen(PVAL($1))+1], + PVAL($1), $2); + TOKEN_GETMAD($1, cLISTOPx($$)->op_first, 'L'); + } + ; + +/* A bare statement, lacking label and other aspects of state op */ +barestmt: PLUGSTMT + { $$ = $1; } + | PEG + { + $$ = newOP(OP_NULL,0); + TOKEN_GETMAD($1,$$,'p'); + } + | FORMAT startformsub formname formblock + { + CV *fmtcv = PL_compcv; +#ifdef MAD + $$ = newFORM($2, $3, $4); + prepend_madprops($1->tk_mad, $$, 'F'); + $1->tk_mad = 0; + token_free($1); +#else + newFORM($2, $3, $4); + $$ = (OP*)NULL; +#endif + if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { + SvREFCNT_inc_simple_void(fmtcv); + pad_add_anon(fmtcv, OP_NULL); } - else { - $$ = IF_MAD( - newOP(OP_NULL, 0), - Nullop); - PL_copline = NOLINE; - TOKEN_FREE($1); - TOKEN_GETMAD($2,$$,';'); + } + | 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); } - PL_expect = XSTATE; + 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); + PL_parser->in_my = 0; + PL_parser->in_my_stash = NULL; + } + proto subattrlist subbody + { + SvREFCNT_inc_simple_void(PL_compcv); +#ifdef MAD + { + OP* o = newSVOP(OP_ANONCODE, 0, + (SV*)( +#endif + $2->op_type == OP_CONST + ? newATTRSUB($3, $2, $5, $6, $7) + : newMYSUB($3, $2, $5, $6, $7) +#ifdef MAD + )); + $$ = newOP(OP_NULL,0); + op_getmad(o,$$,'&'); + op_getmad($2,$$,'n'); + op_getmad($5,$$,'s'); + op_getmad($6,$$,'a'); + token_getmad($1,$$,'d'); + append_madprops($7->op_madprop, $$, 0); + $7->op_madprop = 0; + } +#else + ; + $$ = (OP*)NULL; +#endif + intro_my(); } - | label sideff ';' + | PACKAGE WORD WORD ';' { - $$ = newSTATEOP(0, PVAL($1), $2); - PL_expect = XSTATE; - DO_MAD( - /* sideff might already have a nexstate */ - OP* op = ((LISTOP*)$$)->op_first; - if (op) { - while (op->op_sibling && - op->op_sibling->op_type == OP_NEXTSTATE) - op = op->op_sibling; - token_getmad($1,op,'L'); - token_getmad($3,op,';'); - } - ) +#ifdef MAD + $$ = package($3); + token_getmad($1,$$,'o'); + if ($2) + package_version($2); + token_getmad($4,$$,';'); +#else + package($3); + if ($2) + package_version($2); + $$ = (OP*)NULL; +#endif + } + | USE startsub + { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } + WORD WORD optlistexpr ';' + { + SvREFCNT_inc_simple_void(PL_compcv); +#ifdef MAD + $$ = utilize(IVAL($1), $2, $4, $5, $6); + token_getmad($1,$$,'o'); + token_getmad($7,$$,';'); + if (PL_parser->rsfp_filters && + AvFILLp(PL_parser->rsfp_filters) >= 0) + append_madprops(newMADPROP('!', MAD_NULL, NULL, 0), $$, 0); +#else + utilize(IVAL($1), $2, $4, $5, $6); + $$ = (OP*)NULL; +#endif + } + | IF '(' remember mexpr ')' mblock else + { + $$ = block_end($3, + newCONDOP(0, $4, op_scope($6), $7)); + TOKEN_GETMAD($1,$$,'I'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | UNLESS '(' remember miexpr ')' mblock else + { + $$ = block_end($3, + newCONDOP(0, $4, op_scope($6), $7)); + TOKEN_GETMAD($1,$$,'I'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | GIVEN '(' remember mexpr ')' mblock + { + const PADOFFSET offset = pad_findmy_pvs("$_", 0); + $$ = block_end($3, + newGIVENOP($4, op_scope($6), + offset == NOT_IN_PAD + || PAD_COMPNAME_FLAGS_isOUR(offset) + ? 0 + : offset)); + PL_parser->copline = (line_t)IVAL($1); + } + | WHEN '(' remember mexpr ')' mblock + { $$ = block_end($3, newWHENOP($4, op_scope($6))); } + | DEFAULT block + { $$ = newWHENOP(0, op_scope($2)); } + | WHILE '(' remember texpr ')' mintro mblock cont + { + $$ = block_end($3, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + $4, $7, $8, $6)); + TOKEN_GETMAD($1,$$,'W'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | UNTIL '(' remember iexpr ')' mintro mblock cont + { + $$ = block_end($3, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + $4, $7, $8, $6)); + TOKEN_GETMAD($1,$$,'W'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')' + mblock + { + OP *initop = IF_MAD($4 ? $4 : newOP(OP_NULL, 0), $4); + OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + scalar($6), $11, $9, $8); + if (initop) { + forop = op_prepend_elem(OP_LINESEQ, initop, + op_append_elem(OP_LINESEQ, + newOP(OP_UNSTACK, OPf_SPECIAL), + forop)); + } + DO_MAD({ forop = newUNOP(OP_NULL, 0, forop); }) + $$ = block_end($3, forop); + TOKEN_GETMAD($1,$$,'3'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,'1'); + TOKEN_GETMAD($7,$$,'2'); + TOKEN_GETMAD($10,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | FOR MY remember my_scalar '(' mexpr ')' mblock cont + { + $$ = block_end($3, newFOROP(0, $4, $6, $8, $9)); + TOKEN_GETMAD($1,$$,'W'); + TOKEN_GETMAD($2,$$,'d'); + TOKEN_GETMAD($5,$$,'('); + TOKEN_GETMAD($7,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | FOR scalar '(' remember mexpr ')' mblock cont + { + $$ = block_end($4, newFOROP(0, + op_lvalue($2, OP_ENTERLOOP), $5, $7, $8)); + TOKEN_GETMAD($1,$$,'W'); + TOKEN_GETMAD($3,$$,'('); + TOKEN_GETMAD($6,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | FOR '(' remember mexpr ')' mblock cont + { + $$ = block_end($3, + newFOROP(0, (OP*)NULL, $4, $6, $7)); + TOKEN_GETMAD($1,$$,'W'); + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($5,$$,')'); + PL_parser->copline = (line_t)IVAL($1); + } + | block cont + { + /* a block is a loop that happens once */ + $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + (OP*)NULL, $1, $2, 0); + } + | PACKAGE WORD WORD '{' remember + { + package($3); + if ($2) { + package_version($2); + } + } + stmtseq '}' + { + /* a block is a loop that happens once */ + $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + (OP*)NULL, block_end($5, $7), (OP*)NULL, 0); + TOKEN_GETMAD($4,$$,'{'); + TOKEN_GETMAD($8,$$,'}'); + if (PL_parser->copline > (line_t)IVAL($4)) + PL_parser->copline = (line_t)IVAL($4); + } + | sideff ';' + { + PL_parser->expect = XSTATE; + $$ = $1; + TOKEN_GETMAD($2,$$,';'); } + | ';' + { + PL_parser->expect = XSTATE; + $$ = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL); + TOKEN_GETMAD($1,$$,';'); + PL_parser->copline = NOLINE; + } + ; + +/* Format line */ +formline: THING formarg + { OP *list; + if ($2) { + OP *term = $2; + DO_MAD(term = newUNOP(OP_NULL, 0, term)); + list = op_append_elem(OP_LIST, $1, term); + } + else { +#ifdef MAD + OP *op = newNULLLIST(); + list = op_append_elem(OP_LIST, $1, op); +#else + list = $1; +#endif + } + if (PL_parser->copline == NOLINE) + PL_parser->copline = CopLINE(PL_curcop)-1; + else PL_parser->copline--; + $$ = newSTATEOP(0, NULL, + convert(OP_FORMLINE, 0, list)); + } + ; + +formarg : /* NULL */ + { $$ = NULL; } + | FORMLBRACK stmtseq FORMRBRACK + { $$ = op_unscope($2); } ; /* An expression which may have a side-effect */ sideff : error - { $$ = Nullop; } + { $$ = (OP*)NULL; } | expr { $$ = $1; } | expr IF expr @@ -262,170 +589,45 @@ sideff : error TOKEN_GETMAD($2,$$,'w'); } | expr FOR expr - { $$ = newFOROP(0, Nullch, (line_t)IVAL($2), - Nullop, $3, $1, Nullop); - TOKEN_GETMAD($2,((LISTOP*)$$)->op_first->op_sibling,'w'); + { $$ = newFOROP(0, (OP*)NULL, $3, $1, (OP*)NULL); + TOKEN_GETMAD($2,$$,'w'); + PL_parser->copline = (line_t)IVAL($2); } + | expr WHEN expr + { $$ = newWHENOP($3, op_scope($1)); } ; /* else and elsif blocks */ else : /* NULL */ - { $$ = Nullop; } + { $$ = (OP*)NULL; } | ELSE mblock - { ($2)->op_flags |= OPf_PARENS; $$ = scope($2); + { + ($2)->op_flags |= OPf_PARENS; + $$ = op_scope($2); TOKEN_GETMAD($1,$$,'o'); } | ELSIF '(' mexpr ')' mblock else - { PL_copline = (line_t)IVAL($1); - $$ = newCONDOP(0, $3, scope($5), $6); - PL_hints |= HINT_BLOCK_SCOPE; + { PL_parser->copline = (line_t)IVAL($1); + $$ = newCONDOP(0, + newSTATEOP(OPf_SPECIAL,NULL,$3), + op_scope($5), $6); + PL_hints |= HINT_BLOCK_SCOPE; TOKEN_GETMAD($1,$$,'I'); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($4,$$,')'); } ; -/* Real conditional expressions */ -cond : IF '(' remember mexpr ')' mblock else - { PL_copline = (line_t)IVAL($1); - $$ = block_end($3, - newCONDOP(0, $4, scope($6), $7)); - TOKEN_GETMAD($1,$$,'I'); - TOKEN_GETMAD($2,$$,'('); - TOKEN_GETMAD($5,$$,')'); - } - | UNLESS '(' remember miexpr ')' mblock else - { PL_copline = (line_t)IVAL($1); - $$ = block_end($3, - newCONDOP(0, $4, scope($6), $7)); - TOKEN_GETMAD($1,$$,'I'); - TOKEN_GETMAD($2,$$,'('); - TOKEN_GETMAD($5,$$,')'); - } - ; - -/* Cases for a switch statement */ -case : WHEN '(' remember mexpr ')' mblock - { $$ = block_end($3, - newWHENOP($4, scope($6))); } - | DEFAULT block - { $$ = newWHENOP(0, scope($2)); } - ; - /* Continue blocks */ cont : /* NULL */ - { $$ = Nullop; } + { $$ = (OP*)NULL; } | CONTINUE block - { $$ = scope($2); + { + $$ = op_scope($2); TOKEN_GETMAD($1,$$,'o'); } ; -/* Loops: while, until, for, and a bare block */ -loop : label WHILE '(' remember texpr ')' mintro mblock cont - { OP *innerop; - PL_copline = (line_t)$2; - $$ = block_end($4, - newSTATEOP(0, PVAL($1), - innerop = newWHILEOP(0, 1, (LOOP*)Nullop, - IVAL($2), $5, $8, $9, $7))); - TOKEN_GETMAD($1,innerop,'L'); - TOKEN_GETMAD($2,innerop,'W'); - TOKEN_GETMAD($3,innerop,'('); - TOKEN_GETMAD($6,innerop,')'); - } - - | label UNTIL '(' remember iexpr ')' mintro mblock cont - { OP *innerop; - PL_copline = (line_t)$2; - $$ = block_end($4, - newSTATEOP(0, PVAL($1), - innerop = newWHILEOP(0, 1, (LOOP*)Nullop, - IVAL($2), $5, $8, $9, $7))); - TOKEN_GETMAD($1,innerop,'L'); - TOKEN_GETMAD($2,innerop,'W'); - TOKEN_GETMAD($3,innerop,'('); - TOKEN_GETMAD($6,innerop,')'); - } - | label FOR MY remember my_scalar '(' mexpr ')' mblock cont - { OP *innerop; - $$ = block_end($4, - innerop = newFOROP(0, PVAL($1), (line_t)IVAL($2), - $5, $7, $9, $10)); - TOKEN_GETMAD($1,((LISTOP*)innerop)->op_first,'L'); - TOKEN_GETMAD($2,((LISTOP*)innerop)->op_first->op_sibling,'W'); - TOKEN_GETMAD($3,((LISTOP*)innerop)->op_first->op_sibling,'d'); - TOKEN_GETMAD($6,((LISTOP*)innerop)->op_first->op_sibling,'('); - TOKEN_GETMAD($8,((LISTOP*)innerop)->op_first->op_sibling,')'); - } - | label FOR scalar '(' remember mexpr ')' mblock cont - { OP *innerop; - $$ = block_end($5, - innerop = newFOROP(0, PVAL($1), (line_t)IVAL($2), - mod($3, OP_ENTERLOOP), $6, $8, $9)); - TOKEN_GETMAD($1,((LISTOP*)innerop)->op_first,'L'); - TOKEN_GETMAD($2,((LISTOP*)innerop)->op_first->op_sibling,'W'); - TOKEN_GETMAD($4,((LISTOP*)innerop)->op_first->op_sibling,'('); - TOKEN_GETMAD($7,((LISTOP*)innerop)->op_first->op_sibling,')'); - } - | label FOR '(' remember mexpr ')' mblock cont - { OP *innerop; - $$ = block_end($4, - innerop = newFOROP(0, PVAL($1), (line_t)IVAL($2), - Nullop, $5, $7, $8)); - TOKEN_GETMAD($1,((LISTOP*)innerop)->op_first,'L'); - TOKEN_GETMAD($2,((LISTOP*)innerop)->op_first->op_sibling,'W'); - TOKEN_GETMAD($3,((LISTOP*)innerop)->op_first->op_sibling,'('); - TOKEN_GETMAD($6,((LISTOP*)innerop)->op_first->op_sibling,')'); - } - | label FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')' - mblock - /* basically fake up an initialize-while lineseq */ - { OP *forop; - PL_copline = (line_t)IVAL($2); - forop = newSTATEOP(0, PVAL($1), - newWHILEOP(0, 1, (LOOP*)Nullop, - IVAL($2), scalar($7), - $12, $10, $9)); -#ifdef MAD - forop = newUNOP(OP_NULL, 0, append_elem(OP_LINESEQ, - newSTATEOP(0, - CopLABEL_alloc(($1)->tk_lval.pval), - ($5 ? $5 : newOP(OP_NULL, 0)) ), - forop)); - - token_getmad($2,forop,'3'); - token_getmad($3,forop,'('); - token_getmad($6,forop,'1'); - token_getmad($8,forop,'2'); - token_getmad($11,forop,')'); - token_getmad($1,forop,'L'); -#else - if ($5) { - forop = append_elem(OP_LINESEQ, - newSTATEOP(0, CopLABEL_alloc($1), $5), - forop); - } - - -#endif - $$ = block_end($4, forop); } - | label block cont /* a block is a loop that happens once */ - { $$ = newSTATEOP(0, PVAL($1), - newWHILEOP(0, 1, (LOOP*)Nullop, - NOLINE, Nullop, $2, $3, 0)); - TOKEN_GETMAD($1,((LISTOP*)$$)->op_first,'L'); } - ; - -/* Switch blocks */ -switch : label GIVEN '(' remember mydefsv mexpr ')' mblock - { PL_copline = (line_t) $2; - $$ = block_end($4, - newSTATEOP(0, PVAL($1), - newGIVENOP($6, scope($8), - (PADOFFSET) $5) )); } - ; - /* determine whether there are any new my declarations */ mintro : /* NULL */ { $$ = (PL_min_intro_pending && @@ -434,7 +636,7 @@ mintro : /* NULL */ /* Normal expression */ nexpr : /* NULL */ - { $$ = Nullop; } + { $$ = (OP*)NULL; } | sideff ; @@ -464,94 +666,8 @@ miexpr : iexpr { $$ = $1; intro_my(); } ; -/* Optional "MAIN:"-style loop labels */ -label : /* empty */ - { -#ifdef MAD - YYSTYPE tmplval; - tmplval.pval = Nullch; - $$ = newTOKEN(OP_NULL, tmplval, 0); -#else - $$ = Nullch; -#endif - } - | LABEL - ; - -/* Some kind of declaration - just hang on peg in the parse tree */ -decl : format - { $$ = $1; } - | subrout - { $$ = $1; } - | mysubrout - { $$ = $1; } - | package - { $$ = $1; } - | use - { $$ = $1; } - - /* these two are only used by MAD */ - - | peg - { $$ = $1; } - ; - -peg : PEG - { $$ = newOP(OP_NULL,0); - TOKEN_GETMAD($1,$$,'p'); - } - ; - -format : FORMAT startformsub formname block - { SvREFCNT_inc_simple_void(PL_compcv); -#ifdef MAD - $$ = newFORM($2, $3, $4); - prepend_madprops($1->tk_mad, $$, 'F'); - $1->tk_mad = 0; - token_free($1); -#else - newFORM($2, $3, $4); - $$ = Nullop; -#endif - } - ; - formname: WORD { $$ = $1; } - | /* NULL */ { $$ = Nullop; } - ; - -/* Unimplemented "my sub foo { }" */ -mysubrout: MYSUB startsub subname proto subattrlist subbody - { SvREFCNT_inc_simple_void(PL_compcv); -#ifdef MAD - $$ = newMYSUB($2, $3, $4, $5, $6); - token_getmad($1,$$,'d'); -#else - newMYSUB($2, $3, $4, $5, $6); - $$ = Nullop; -#endif - } - ; - -/* Subroutine definition */ -subrout : SUB startsub subname proto subattrlist subbody - { SvREFCNT_inc_simple_void(PL_compcv); -#ifdef MAD - OP* o = newSVOP(OP_ANONCODE, 0, - (SV*)newATTRSUB($2, $3, $4, $5, $6)); - $$ = newOP(OP_NULL,0); - op_getmad(o,$$,'&'); - op_getmad($3,$$,'n'); - op_getmad($4,$$,'s'); - op_getmad($5,$$,'a'); - token_getmad($1,$$,'d'); - append_madprops($6->op_madprop, $$, 0); - $6->op_madprop = 0; -#else - newATTRSUB($2, $3, $4, $5, $6); - $$ = Nullop; -#endif - } + | /* NULL */ { $$ = (OP*)NULL; } ; startsub: /* NULL */ /* start a regular subroutine scope */ @@ -571,23 +687,19 @@ startformsub: /* NULL */ /* start a format subroutine scope */ ; /* Name of a subroutine - must be a bareword, could be special */ -subname : WORD { const char *const name = SvPV_nolen_const(((SVOP*)$1)->op_sv); - if (strEQ(name, "BEGIN") || strEQ(name, "END") - || strEQ(name, "INIT") || strEQ(name, "CHECK") - || strEQ(name, "UNITCHECK")) - CvSPECIAL_on(PL_compcv); - $$ = $1; } +subname : WORD + | PRIVATEREF ; /* Subroutine prototype */ proto : /* NULL */ - { $$ = Nullop; } + { $$ = (OP*)NULL; } | THING ; /* Optional list of subroutine attributes */ subattrlist: /* NULL */ - { $$ = Nullop; } + { $$ = (OP*)NULL; } | COLONATTR THING { $$ = $2; TOKEN_GETMAD($1,$$,':'); @@ -595,7 +707,7 @@ subattrlist: /* NULL */ | COLONATTR { $$ = IF_MAD( newOP(OP_NULL, 0), - Nullop + (OP*)NULL ); TOKEN_GETMAD($1,$$,':'); } @@ -609,7 +721,7 @@ myattrlist: COLONATTR THING | COLONATTR { $$ = IF_MAD( newOP(OP_NULL, 0), - Nullop + (OP*)NULL ); TOKEN_GETMAD($1,$$,':'); } @@ -619,43 +731,13 @@ myattrlist: COLONATTR THING subbody : block { $$ = $1; } | ';' { $$ = IF_MAD( newOP(OP_NULL,0), - Nullop + (OP*)NULL ); - PL_expect = XSTATE; + PL_parser->expect = XSTATE; TOKEN_GETMAD($1,$$,';'); } ; -package : PACKAGE WORD ';' - { -#ifdef MAD - $$ = package($2); - token_getmad($1,$$,'o'); - token_getmad($3,$$,';'); -#else - package($2); - $$ = Nullop; -#endif - } - ; - -use : USE startsub - { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } - WORD WORD listexpr ';' - { SvREFCNT_inc_simple_void(PL_compcv); -#ifdef MAD - $$ = utilize(IVAL($1), $2, $4, $5, $6); - token_getmad($1,$$,'o'); - token_getmad($7,$$,';'); - if (PL_rsfp_filters && AvFILLp(PL_rsfp_filters) >= 0) - append_madprops(newMADPROP('!', MAD_PV, "", 0), $$, 0); -#else - utilize(IVAL($1), $2, $4, $5, $6); - $$ = Nullop; -#endif - } - ; - /* Ordinary expressions; logical combinations */ expr : expr ANDOP expr { $$ = newLOGOP(OP_AND, 0, $1, $3); @@ -669,49 +751,49 @@ expr : expr ANDOP expr { $$ = newLOGOP(OP_DOR, 0, $1, $3); TOKEN_GETMAD($2,$$,'o'); } - | argexpr %prec PREC_LOW + | listexpr %prec PREC_LOW ; /* Expressions are a list of terms joined by commas */ -argexpr : argexpr ',' +listexpr: listexpr ',' { #ifdef MAD OP* op = newNULLLIST(); token_getmad($2,op,','); - $$ = append_elem(OP_LIST, $1, op); + $$ = op_append_elem(OP_LIST, $1, op); #else $$ = $1; #endif } - | argexpr ',' term + | listexpr ',' term { OP* term = $3; DO_MAD( term = newUNOP(OP_NULL, 0, term); token_getmad($2,term,','); ) - $$ = append_elem(OP_LIST, $1, term); + $$ = op_append_elem(OP_LIST, $1, term); } | term %prec PREC_LOW ; /* List operators */ -listop : LSTOP indirob argexpr /* map {...} @args or print $fh @args */ +listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */ { $$ = convert(IVAL($1), OPf_STACKED, - prepend_elem(OP_LIST, newGVREF(IVAL($1),$2), $3) ); + op_prepend_elem(OP_LIST, newGVREF(IVAL($1),$2), $3) ); TOKEN_GETMAD($1,$$,'o'); } | FUNC '(' indirob expr ')' /* print ($fh @args */ { $$ = convert(IVAL($1), OPf_STACKED, - prepend_elem(OP_LIST, newGVREF(IVAL($1),$3), $4) ); + op_prepend_elem(OP_LIST, newGVREF(IVAL($1),$3), $4) ); TOKEN_GETMAD($1,$$,'o'); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($5,$$,')'); } - | term ARROW method '(' listexprcom ')' /* $foo->bar(list) */ + | term ARROW method '(' optexpr ')' /* $foo->bar(list) */ { $$ = convert(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, - prepend_elem(OP_LIST, scalar($1), $5), + op_append_elem(OP_LIST, + op_prepend_elem(OP_LIST, scalar($1), $5), newUNOP(OP_METHOD, 0, $3))); TOKEN_GETMAD($2,$$,'A'); TOKEN_GETMAD($4,$$,'('); @@ -719,29 +801,29 @@ listop : LSTOP indirob argexpr /* map {...} @args or print $fh @args */ } | term ARROW method /* $foo->bar */ { $$ = convert(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, scalar($1), + op_append_elem(OP_LIST, scalar($1), newUNOP(OP_METHOD, 0, $3))); TOKEN_GETMAD($2,$$,'A'); } - | METHOD indirob listexpr /* new Class @args */ + | METHOD indirob optlistexpr /* new Class @args */ { $$ = convert(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, - prepend_elem(OP_LIST, $2, $3), + op_append_elem(OP_LIST, + op_prepend_elem(OP_LIST, $2, $3), newUNOP(OP_METHOD, 0, $1))); } - | FUNCMETH indirob '(' listexprcom ')' /* method $object (@args) */ + | FUNCMETH indirob '(' optexpr ')' /* method $object (@args) */ { $$ = convert(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, - prepend_elem(OP_LIST, $2, $4), + op_append_elem(OP_LIST, + op_prepend_elem(OP_LIST, $2, $4), newUNOP(OP_METHOD, 0, $1))); TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($5,$$,')'); } - | LSTOP listexpr /* print @args */ + | LSTOP optlistexpr /* print @args */ { $$ = convert(IVAL($1), 0, $2); TOKEN_GETMAD($1,$$,'o'); } - | FUNC '(' listexprcom ')' /* print (@args) */ + | FUNC '(' optexpr ')' /* print (@args) */ { $$ = convert(IVAL($1), 0, $3); TOKEN_GETMAD($1,$$,'o'); TOKEN_GETMAD($2,$$,'('); @@ -749,11 +831,11 @@ listop : LSTOP indirob argexpr /* map {...} @args or print $fh @args */ } | LSTOPSUB startanonsub block /* sub f(&@); f { foo } ... */ { SvREFCNT_inc_simple_void(PL_compcv); - $$ = newANONATTRSUB($2, 0, Nullop, $3); } - listexpr %prec LSTOP /* ... @bar */ + $$ = newANONATTRSUB($2, 0, (OP*)NULL, $3); } + optlistexpr %prec LSTOP /* ... @bar */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, - prepend_elem(OP_LIST, $4, $5), $1)); + op_append_elem(OP_LIST, + op_prepend_elem(OP_LIST, $4, $5), $1)); } ; @@ -767,7 +849,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ /* In this and all the hash accessors, ';' is * provided by the tokeniser */ { $$ = newBINOP(OP_GELEM, 0, $1, scalar($3)); - PL_expect = XOPERATOR; + PL_parser->expect = XOPERATOR; TOKEN_GETMAD($2,$$,'{'); TOKEN_GETMAD($4,$$,';'); TOKEN_GETMAD($5,$$,'}'); @@ -792,9 +874,9 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ TOKEN_GETMAD($2,$$,'['); TOKEN_GETMAD($4,$$,']'); } - | scalar '{' expr ';' '}' /* $foo->{bar();} */ + | scalar '{' expr ';' '}' /* $foo{bar();} */ { $$ = newBINOP(OP_HELEM, 0, oopsHV($1), jmaybe($3)); - PL_expect = XOPERATOR; + PL_parser->expect = XOPERATOR; TOKEN_GETMAD($2,$$,'{'); TOKEN_GETMAD($4,$$,';'); TOKEN_GETMAD($5,$$,'}'); @@ -803,7 +885,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ { $$ = newBINOP(OP_HELEM, 0, ref(newHVREF($1),OP_RV2HV), jmaybe($4)); - PL_expect = XOPERATOR; + PL_parser->expect = XOPERATOR; TOKEN_GETMAD($2,$$,'a'); TOKEN_GETMAD($3,$$,'{'); TOKEN_GETMAD($5,$$,';'); @@ -813,7 +895,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ { $$ = newBINOP(OP_HELEM, 0, ref(newHVREF($1),OP_RV2HV), jmaybe($3)); - PL_expect = XOPERATOR; + PL_parser->expect = XOPERATOR; TOKEN_GETMAD($2,$$,'{'); TOKEN_GETMAD($4,$$,';'); TOKEN_GETMAD($5,$$,'}'); @@ -827,7 +909,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ } | term ARROW '(' expr ')' /* $subref->(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, $4, + op_append_elem(OP_LIST, $4, newCVREF(0, scalar($1)))); TOKEN_GETMAD($2,$$,'a'); TOKEN_GETMAD($3,$$,'('); @@ -836,7 +918,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ | subscripted '(' expr ')' /* $foo->{bar}->(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, $3, + op_append_elem(OP_LIST, $3, newCVREF(0, scalar($1)))); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($4,$$,')'); @@ -854,8 +936,13 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ TOKEN_GETMAD($4,$$,'['); TOKEN_GETMAD($6,$$,']'); } + | QWLIST '[' expr ']' /* list literal slice */ + { $$ = newSLICEOP(0, $3, $1); + TOKEN_GETMAD($2,$$,'['); + TOKEN_GETMAD($4,$$,']'); + } | '(' ')' '[' expr ']' /* empty list slice! */ - { $$ = newSLICEOP(0, $4, Nullop); + { $$ = newSLICEOP(0, $4, (OP*)NULL); TOKEN_GETMAD($1,$$,'('); TOKEN_GETMAD($2,$$,')'); TOKEN_GETMAD($3,$$,'['); @@ -905,14 +992,14 @@ termbinop: term ASSIGNOP term /* $x = $y */ | term DOTDOT term /* $x..$y, $x...$y */ { $$ = newRANGE(IVAL($2), scalar($1), scalar($3)); - DO_MAD( + DO_MAD({ UNOP *op; op = (UNOP*)$$; op = (UNOP*)op->op_first; /* get to flop */ op = (UNOP*)op->op_first; /* get to flip */ op = (UNOP*)op->op_first; /* get to range */ token_getmad($2,(OP*)op,'o'); - ) + }); } | term ANDAND term /* $x && $y */ { $$ = newLOGOP(OP_AND, 0, $1, $3); @@ -957,22 +1044,22 @@ termunop : '-' term %prec UMINUS /* -$x */ } | term POSTINC /* $x++ */ { $$ = newUNOP(OP_POSTINC, 0, - mod(scalar($1), OP_POSTINC)); + op_lvalue(scalar($1), OP_POSTINC)); TOKEN_GETMAD($2,$$,'o'); } | term POSTDEC /* $x-- */ { $$ = newUNOP(OP_POSTDEC, 0, - mod(scalar($1), OP_POSTDEC)); + op_lvalue(scalar($1), OP_POSTDEC)); TOKEN_GETMAD($2,$$,'o'); } | PREINC term /* ++$x */ { $$ = newUNOP(OP_PREINC, 0, - mod(scalar($2), OP_PREINC)); + op_lvalue(scalar($2), OP_PREINC)); TOKEN_GETMAD($1,$$,'o'); } | PREDEC term /* --$x */ { $$ = newUNOP(OP_PREDEC, 0, - mod(scalar($2), OP_PREDEC)); + op_lvalue(scalar($2), OP_PREDEC)); TOKEN_GETMAD($1,$$,'o'); } @@ -985,7 +1072,7 @@ anonymous: '[' expr ']' TOKEN_GETMAD($3,$$,']'); } | '[' ']' - { $$ = newANONLIST(Nullop); + { $$ = newANONLIST((OP*)NULL); TOKEN_GETMAD($1,$$,'['); TOKEN_GETMAD($2,$$,']'); } @@ -996,7 +1083,7 @@ anonymous: '[' expr ']' TOKEN_GETMAD($4,$$,'}'); } | HASHBRACK ';' '}' %prec '(' /* { } (';' by tokener) */ - { $$ = newANONHASH(Nullop); + { $$ = newANONHASH((OP*)NULL); TOKEN_GETMAD($1,$$,'{'); TOKEN_GETMAD($2,$$,';'); TOKEN_GETMAD($3,$$,'}'); @@ -1017,25 +1104,25 @@ termdo : DO term %prec UNIOP /* do $filename */ TOKEN_GETMAD($1,$$,'o'); } | DO block %prec '(' /* do { code */ - { $$ = newUNOP(OP_NULL, OPf_SPECIAL, scope($2)); + { $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2)); TOKEN_GETMAD($1,$$,'D'); } - | DO WORD '(' ')' /* do somesub() */ + | DO subname '(' ')' /* do somesub() */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, - prepend_elem(OP_LIST, + op_prepend_elem(OP_LIST, scalar(newCVREF( (OPpENTERSUB_AMPER<<8), scalar($2) - )),Nullop)); dep(); + )),(OP*)NULL)); dep(); TOKEN_GETMAD($1,$$,'o'); TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | DO WORD '(' expr ')' /* do somesub(@args) */ + | DO subname '(' expr ')' /* do somesub(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, - append_elem(OP_LIST, + op_append_elem(OP_LIST, $4, scalar(newCVREF( (OPpENTERSUB_AMPER<<8), @@ -1045,17 +1132,17 @@ termdo : DO term %prec UNIOP /* do $filename */ TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($5,$$,')'); } - | DO scalar '(' ')' /* do $subref () */ + | DO scalar '(' ')' /* do $subref () */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, - prepend_elem(OP_LIST, - scalar(newCVREF(0,scalar($2))), Nullop)); dep(); + op_prepend_elem(OP_LIST, + scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep(); TOKEN_GETMAD($1,$$,'o'); TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | DO scalar '(' expr ')' /* do $subref (@args) */ + | DO scalar '(' expr ')' /* do $subref (@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, - prepend_elem(OP_LIST, + op_prepend_elem(OP_LIST, $4, scalar(newCVREF(0,scalar($2))))); dep(); TOKEN_GETMAD($1,$$,'o'); @@ -1075,20 +1162,22 @@ term : termbinop TOKEN_GETMAD($4,$$,':'); } | REFGEN term /* \$x, \@y, \%z */ - { $$ = newUNOP(OP_REFGEN, 0, mod($2,OP_REFGEN)); + { $$ = newUNOP(OP_REFGEN, 0, op_lvalue($2,OP_REFGEN)); TOKEN_GETMAD($1,$$,'o'); } | myattrterm %prec UNIOP { $$ = $1; } | LOCAL term %prec UNIOP { $$ = localize($2,IVAL($1)); - TOKEN_GETMAD($1,$$,'d'); + TOKEN_GETMAD($1,$$,'k'); } | '(' expr ')' { $$ = sawparens(IF_MAD(newUNOP(OP_NULL,0,$2), $2)); TOKEN_GETMAD($1,$$,'('); TOKEN_GETMAD($3,$$,')'); } + | QWLIST + { $$ = IF_MAD(newUNOP(OP_NULL,0,$1), $1); } | '(' ')' { $$ = sawparens(newNULLLIST()); TOKEN_GETMAD($1,$$,'('); @@ -1107,7 +1196,7 @@ term : termbinop | subscripted { $$ = $1; } | ary '[' expr ']' /* array slice */ - { $$ = prepend_elem(OP_ASLICE, + { $$ = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, list($3), @@ -1116,12 +1205,12 @@ term : termbinop TOKEN_GETMAD($4,$$,']'); } | ary '{' expr ';' '}' /* @hash{@keys} */ - { $$ = prepend_elem(OP_HSLICE, + { $$ = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, list($3), ref(oopsHV($1), OP_HSLICE))); - PL_expect = XOPERATOR; + PL_parser->expect = XOPERATOR; TOKEN_GETMAD($2,$$,'{'); TOKEN_GETMAD($4,$$,';'); TOKEN_GETMAD($5,$$,'}'); @@ -1130,27 +1219,27 @@ term : termbinop { $$ = $1; } | amper /* &foo; */ { $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); } - | amper '(' ')' /* &foo() */ + | amper '(' ')' /* &foo() or foo() */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($3,$$,')'); } - | amper '(' expr ')' /* &foo(@args) */ + | amper '(' expr ')' /* &foo(@args) or foo(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, $3, scalar($1))); - DO_MAD( + op_append_elem(OP_LIST, $3, scalar($1))); + DO_MAD({ OP* op = $$; if (op->op_type == OP_CONST) { /* defeat const fold */ op = (OP*)op->op_madprop->mad_val; } token_getmad($2,op,'('); token_getmad($4,op,')'); - ) + }); } - | NOAMP WORD listexpr /* foo(@args) */ + | NOAMP subname optlistexpr /* foo @args (no parens) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, $3, scalar($2))); + op_append_elem(OP_LIST, $3, scalar($2))); TOKEN_GETMAD($1,$$,'o'); } | LOOPEX /* loop exiting command (goto, last, dump, etc) */ @@ -1162,7 +1251,7 @@ term : termbinop { $$ = newLOOPEX(IVAL($1),$2); TOKEN_GETMAD($1,$$,'o'); } - | NOTOP argexpr /* not $foo */ + | NOTOP listexpr /* not $foo */ { $$ = newUNOP(OP_NOT, 0, scalar($2)); TOKEN_GETMAD($1,$$,'o'); } @@ -1190,7 +1279,7 @@ term : termbinop { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); } | UNIOPSUB term /* Sub treated as unop */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, - append_elem(OP_LIST, $2, scalar($1))); } + op_append_elem(OP_LIST, $2, scalar($1))); } | FUNC0 /* Nullary operator */ { $$ = newOP(IVAL($1), 0); TOKEN_GETMAD($1,$$,'o'); @@ -1201,6 +1290,13 @@ term : termbinop TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($3,$$,')'); } + | FUNC0OP /* Same as above, but op created in toke.c */ + { $$ = $1; } + | FUNC0OP '(' ')' + { $$ = $1; + TOKEN_GETMAD($2,$$,'('); + TOKEN_GETMAD($3,$$,')'); + } | FUNC0SUB /* Sub treated as nullop */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); } @@ -1219,13 +1315,31 @@ term : termbinop TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | PMFUNC '(' argexpr ')' /* m//, s///, tr/// */ - { $$ = pmruntime($1, $3, 1); - TOKEN_GETMAD($2,$$,'('); - TOKEN_GETMAD($4,$$,')'); + | PMFUNC /* m//, s///, qr//, tr/// */ + { + if ( $1->op_type != OP_TRANS + && $1->op_type != OP_TRANSR + && (((PMOP*)$1)->op_pmflags & PMf_HAS_CV)) + { + $$ = start_subparse(FALSE, CVf_ANON); + SAVEFREESV(PL_compcv); + } else + $$ = 0; + } + '(' listexpr ')' + { $$ = pmruntime($1, $4, 1, $2); + TOKEN_GETMAD($3,$$,'('); + TOKEN_GETMAD($5,$$,')'); } | WORD | listop + | YADAYADA + { + $$ = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), + newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); + TOKEN_GETMAD($1,$$,'X'); + } + | PLUGEXPR ; /* "my" declarations, with optional attributes */ @@ -1235,7 +1349,7 @@ myattrterm: MY myterm myattrlist token_getmad($1,$$,'d'); append_madprops($3->op_madprop, $$, 'a'); $3->op_madprop = 0; - ) + ); } | MY myterm { $$ = localize($2,IVAL($1)); @@ -1263,33 +1377,22 @@ myterm : '(' expr ')' ; /* Basic list expressions */ -listexpr: /* NULL */ %prec PREC_LOW - { $$ = Nullop; } - | argexpr %prec PREC_LOW +optlistexpr: /* NULL */ %prec PREC_LOW + { $$ = (OP*)NULL; } + | listexpr %prec PREC_LOW { $$ = $1; } ; -listexprcom: /* NULL */ - { $$ = Nullop; } +optexpr: /* NULL */ + { $$ = (OP*)NULL; } | expr { $$ = $1; } - | expr ',' - { -#ifdef MAD - OP* op = newNULLLIST(); - token_getmad($2,op,','); - $$ = append_elem(OP_LIST, $1, op); -#else - $$ = $1; -#endif - - } ; /* A little bit of trickery to make "for my $foo (@bar)" actually be lexical */ my_scalar: scalar - { PL_in_my = 0; $$ = my($1); } + { PL_parser->in_my = 0; $$ = my($1); } ; amper : '&' indirob @@ -1334,7 +1437,7 @@ indirob : WORD | scalar %prec PREC_LOW { $$ = scalar($1); } | block - { $$ = scope($1); } + { $$ = op_scope($1); } | PRIVATEREF { $$ = $1; }