This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
change#4327 was inefficient
[perl5.git] / perly.y
diff --git a/perly.y b/perly.y
index 4112343..93e5f77 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -1,52 +1,69 @@
-/* $RCSfile: perly.y,v $$Revision: 4.1 $$Date: 92/08/07 18:26:16 $
+/*    perly.y
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $Log:       perly.y,v $
- * Revision 4.1  92/08/07  18:26:16  lwall
- * 
- * Revision 4.0.1.5  92/06/11  21:12:50  lwall
- * patch34: expectterm incorrectly set to indicate start of program or block
- * 
- * Revision 4.0.1.4  92/06/08  17:33:25  lwall
- * patch20: one of the backdoors to expectterm was on the wrong reduction
- * 
- * Revision 4.0.1.3  92/06/08  15:18:16  lwall
- * patch20: an expression may now start with a bareword
- * patch20: relaxed requirement for semicolon at the end of a block
- * patch20: added ... as variant on ..
- * patch20: fixed double debug break in foreach with implicit array assignment
- * patch20: if {block} {block} didn't work any more
- * patch20: deleted some minor memory leaks
- * 
- * Revision 4.0.1.2  91/11/05  18:17:38  lwall
- * patch11: extra comma at end of list is now allowed in more places (Hi, Felix!)
- * patch11: once-thru blocks didn't display right in the debugger
- * patch11: debugger got confused over nested subroutine definitions
- * 
- * Revision 4.0.1.1  91/06/07  11:42:34  lwall
- * patch4: new copyright notice
- * 
- * Revision 4.0  91/03/20  01:38:40  lwall
- * 4.0 baseline.
- * 
+ */
+
+/*
+ * '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.'
  */
 
 %{
 #include "EXTERN.h"
+#define PERL_IN_PERLY_C
 #include "perl.h"
 
-/*SUPPRESS 530*/
-/*SUPPRESS 593*/
-/*SUPPRESS 595*/
+#define dep() deprecate("\"do\" to call subroutines")
+
+/* stuff included here to make perly_c.diff apply better */
+
+#define yydebug            PL_yydebug
+#define yynerrs            PL_yynerrs
+#define yyerrflag   PL_yyerrflag
+#define yychar     PL_yychar
+#define yyval      PL_yyval
+#define yylval     PL_yylval
+
+struct ysv {
+    short* yyss;
+    YYSTYPE* yyvs;
+    int oldyydebug;
+    int oldyynerrs;
+    int oldyyerrflag;
+    int oldyychar;
+    YYSTYPE oldyyval;
+    YYSTYPE oldyylval;
+};
+
+static void yydestruct(void *ptr);
+
+static void
+yydestruct(void *ptr)
+{
+    struct ysv* ysave = (struct ysv*)ptr;
+    if (ysave->yyss) Safefree(ysave->yyss);
+    if (ysave->yyvs) Safefree(ysave->yyvs);
+    yydebug    = ysave->oldyydebug;
+    yynerrs    = ysave->oldyynerrs;
+    yyerrflag  = ysave->oldyyerrflag;
+    yychar     = ysave->oldyychar;
+    yyval      = ysave->oldyyval;
+    yylval     = ysave->oldyylval;
+    Safefree(ysave);
+}
 
 %}
 
 %start prog
 
+%{
+#if 0 /* get this from perly.h instead */
+%}
+
 %union {
     I32        ival;
     char *pval;
     GV *gvval;
 }
 
-%token <ival> '{' ')'
+%{
+#endif /* 0 */
+
+#ifdef USE_PURE_BISON
+#define YYLEX_PARAM (&yychar)
+#endif
+
+%}
+
+%token <ival> '{'
 
-%token <opval> WORD METHOD THING PMFUNC
+%token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF
+%token <opval> FUNC0SUB UNIOPSUB LSTOPSUB
 %token <pval> LABEL
-%token <ival> FORMAT SUB PACKAGE
+%token <ival> FORMAT SUB ANONSUB PACKAGE USE
 %token <ival> WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR
 %token <ival> LOOPEX DOTDOT
-%token <ival> FUNC0 FUNC1 FUNC
+%token <ival> FUNC0 FUNC1 FUNC UNIOP LSTOP
 %token <ival> RELOP EQOP MULOP ADDOP
-%token <ival> DOLSHARP DO LOCAL DELETE HASHBRACK
-
-%type <ival> prog decl format remember crp crb crhb
-%type <opval> block lineseq line loop cond nexpr else
-%type <opval> expr sexpr term scalar ary hsh arylen star amper sideff
-%type <opval> listexpr indirob
-%type <opval> texpr listop
+%token <ival> DOLSHARP DO HASHBRACK NOAMP
+%token <ival> LOCAL MY MYSUB
+%token COLONATTR
+
+%type <ival> prog decl format startsub startanonsub startformsub
+%type <ival> remember mremember '&'
+%type <opval> block mblock lineseq line loop cond else
+%type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
+%type <opval> argexpr nexpr texpr iexpr mexpr mnexpr mtexpr miexpr
+%type <opval> listexpr listexprcom indirob listop method
+%type <opval> formname subname proto subbody cont my_scalar
+%type <opval> subattrlist myattrlist mysubrout myattrterm myterm
 %type <pval> label
-%type <opval> cont
 
-%nonassoc <ival> LSTOP
+%nonassoc PREC_LOW
+%nonassoc LOOPEX
+
+%left <ival> OROP
+%left ANDOP
+%right NOTOP
+%nonassoc LSTOP LSTOPSUB
 %left ','
-%right '='
+%right <ival> ASSIGNOP
 %right '?' ':'
 %nonassoc DOTDOT
 %left OROR
 %left <ival> BITANDOP
 %nonassoc EQOP
 %nonassoc RELOP
-%nonassoc <ival> UNIOP
+%nonassoc UNIOP UNIOPSUB
 %left <ival> SHIFTOP
 %left ADDOP
 %left MULOP
-%left <ival> MATCHOP ARROW
+%left <ival> MATCHOP
 %right '!' '~' UMINUS REFGEN
 %right <ival> POWOP
 %nonassoc PREINC PREDEC POSTINC POSTDEC
+%left ARROW
+%nonassoc <ival> ')'
 %left '('
+%left '[' '{'
 
 %% /* RULES */
 
 prog   :       /* NULL */
                {
 #if defined(YYDEBUG) && defined(DEBUGGING)
-                   yydebug = (debug & 1);
+                   yydebug = (PL_debug & 1);
 #endif
-                   expect = XBLOCK;
+                   PL_expect = XSTATE;
                }
        /*CONTINUED*/   lineseq
-                       {   if (in_eval) {
-                               eval_root = newUNOP(OP_LEAVEEVAL, 0, $2);
-                               eval_start = linklist(eval_root);
-                               eval_root->op_next = 0;
-                               peep(eval_start);
-                           }
-                           else
-                               main_root = block_head(scalar($2), &main_start);
-                       }
+                       { newPROG($2); }
        ;
 
 block  :       '{' remember lineseq '}'
-                       { $$ = scalarseq($3);
-                         if (copline > (line_t)$1)
-                             copline = $1;
-                         if (savestack_ix > $2)
-                           leave_scope($2);
-                         expect = XBLOCK; }
+                       { if (PL_copline > (line_t)$1)
+                             PL_copline = $1;
+                         $$ = block_end($2, $3); }
        ;
 
-remember:      /* NULL */      /* in case they push a package name */
-                       { $$ = savestack_ix; }
+remember:      /* NULL */      /* start a full lexical scope */
+                       { $$ = block_start(TRUE); }
+       ;
+
+mblock :       '{' mremember lineseq '}'
+                       { if (PL_copline > (line_t)$1)
+                             PL_copline = $1;
+                         $$ = block_end($2, $3); }
+       ;
+
+mremember:     /* NULL */      /* start a partial lexical scope */
+                       { $$ = block_start(FALSE); }
        ;
 
 lineseq        :       /* NULL */
@@ -133,7 +172,10 @@ lineseq    :       /* NULL */
        |       lineseq decl
                        { $$ = $1; }
        |       lineseq line
-                       { $$ = append_list(OP_LINESEQ, $1, $2); pad_reset(); }
+                       {   $$ = append_list(OP_LINESEQ,
+                               (LISTOP*)$1, (LISTOP*)$2);
+                           PL_pad_reset_pending = TRUE;
+                           if ($1 && $2) PL_hints |= HINT_BLOCK_SCOPE; }
        ;
 
 line   :       label cond
@@ -145,12 +187,12 @@ line      :       label cond
                            }
                            else {
                              $$ = Nullop;
-                             copline = NOLINE;
+                             PL_copline = NOLINE;
                            }
-                           expect = XBLOCK; }
+                           PL_expect = XSTATE; }
        |       label sideff ';'
                        { $$ = newSTATEOP(0, $1, $2);
-                         expect = XBLOCK; }
+                         PL_expect = XSTATE; }
        ;
 
 sideff :       error
@@ -162,34 +204,32 @@ sideff    :       error
        |       expr UNLESS expr
                        { $$ = newLOGOP(OP_OR, 0, $3, $1); }
        |       expr WHILE expr
-                       { $$ = newLOOPOP(0, 1, scalar($3), $1, Nullop); }
-       |       expr UNTIL expr
-                       { $$ = newLOOPOP(0, 1, invert(scalar($3)), $1, Nullop);}
+                       { $$ = newLOOPOP(OPf_PARENS, 1, scalar($3), $1); }
+       |       expr UNTIL iexpr
+                       { $$ = newLOOPOP(OPf_PARENS, 1, $3, $1);}
+       |       expr FOR expr
+                       { $$ = newFOROP(0, Nullch, $2,
+                                       Nullop, $3, $1, Nullop); }
        ;
 
 else   :       /* NULL */
                        { $$ = Nullop; }
-       |       ELSE block
-                       { $$ = scope($2); }
-       |       ELSIF '(' expr ')' block else
-                       { copline = $1;
-                           $$ = newCONDOP(0, $3, scope($5), $6); }
-       ;
-
-cond   :       IF '(' expr ')' block else
-                       { copline = $1;
-                           $$ = newCONDOP(0, $3, scope($5), $6); }
-       |       UNLESS '(' expr ')' block else
-                       { copline = $1;
-                           $$ = newCONDOP(0,
-                               invert(scalar($3)), scope($5), $6); }
-       |       IF block block else
-                       { copline = $1;
-                           $$ = newCONDOP(0, scope($2), scope($3), $4); }
-       |       UNLESS block block else
-                       { copline = $1;
-                           $$ = newCONDOP(0, invert(scalar(scope($2))),
-                                               scope($3), $4); }
+       |       ELSE mblock
+                       { ($2)->op_flags |= OPf_PARENS; $$ = scope($2); }
+       |       ELSIF '(' mexpr ')' mblock else
+                       { PL_copline = $1;
+                           $$ = newCONDOP(0, $3, scope($5), $6);
+                           PL_hints |= HINT_BLOCK_SCOPE; }
+       ;
+
+cond   :       IF '(' remember mexpr ')' mblock else
+                       { PL_copline = $1;
+                           $$ = block_end($3,
+                                  newCONDOP(0, $4, scope($6), $7)); }
+       |       UNLESS '(' remember miexpr ')' mblock else
+                       { PL_copline = $1;
+                           $$ = block_end($3,
+                                  newCONDOP(0, $4, scope($6), $7)); }
        ;
 
 cont   :       /* NULL */
@@ -198,41 +238,41 @@ cont      :       /* NULL */
                        { $$ = scope($2); }
        ;
 
-loop   :       label WHILE '(' texpr ')' block cont
-                       { copline = $2;
-                           $$ = newSTATEOP(0, $1,
-                                   newWHILEOP(0, 1, Nullop, $4, $6, $7) ); }
-       |       label UNTIL '(' expr ')' block cont
-                       { copline = $2;
-                           $$ = newSTATEOP(0, $1,
-                                   newWHILEOP(0, 1, Nullop,
-                                       invert(scalar($4)), $6, $7) ); }
-       |       label WHILE block block cont
-                       { copline = $2;
-                           $$ = newSTATEOP(0, $1,
-                                   newWHILEOP(0, 1, Nullop,
-                                       scope($3), $4, $5) ); }
-       |       label UNTIL block block cont
-                       { copline = $2;
-                           $$ = newSTATEOP(0, $1,
-                                   newWHILEOP(0, 1, Nullop,
-                                       invert(scalar(scope($3))), $4, $5)); }
-       |       label FOR scalar '(' expr crp block cont
-                       { $$ = newFOROP(0, $1, $2, ref($3, OP_ENTERLOOP),
-                               $5, $7, $8); }
-       |       label FOR '(' expr crp block cont
-                       { $$ = newFOROP(0, $1, $2, Nullop, $4, $6, $7); }
-       |       label FOR '(' nexpr ';' texpr ';' nexpr ')' block
+loop   :       label WHILE '(' remember mtexpr ')' mblock cont
+                       { PL_copline = $2;
+                           $$ = block_end($4,
+                                  newSTATEOP(0, $1,
+                                    newWHILEOP(0, 1, (LOOP*)Nullop,
+                                               $2, $5, $7, $8))); }
+       |       label UNTIL '(' remember miexpr ')' mblock cont
+                       { PL_copline = $2;
+                           $$ = block_end($4,
+                                  newSTATEOP(0, $1,
+                                    newWHILEOP(0, 1, (LOOP*)Nullop,
+                                               $2, $5, $7, $8))); }
+       |       label FOR MY remember my_scalar '(' mexpr ')' mblock cont
+                       { $$ = block_end($4,
+                                newFOROP(0, $1, $2, $5, $7, $9, $10)); }
+       |       label FOR scalar '(' remember mexpr ')' mblock cont
+                       { $$ = block_end($5,
+                                newFOROP(0, $1, $2, mod($3, OP_ENTERLOOP),
+                                         $6, $8, $9)); }
+       |       label FOR '(' remember mexpr ')' mblock cont
+                       { $$ = block_end($4,
+                                newFOROP(0, $1, $2, Nullop, $5, $7, $8)); }
+       |       label FOR '(' remember mnexpr ';' mtexpr ';' mnexpr ')' mblock
                        /* basically fake up an initialize-while lineseq */
-                       {  copline = $2;
-                           $$ = append_elem(OP_LINESEQ,
-                                   newSTATEOP(0, $1, scalar($4)),
-                                   newSTATEOP(0, $1,
-                                       newWHILEOP(0, 1, Nullop,
-                                           scalar($6), $10, scalar($8)) )); }
+                       { OP *forop = append_elem(OP_LINESEQ,
+                                       scalar($5),
+                                       newWHILEOP(0, 1, (LOOP*)Nullop,
+                                                  $2, scalar($7),
+                                                  $11, scalar($9)));
+                         PL_copline = $2;
+                         $$ = block_end($4, newSTATEOP(0, $1, forop)); }
        |       label block cont  /* a block is a loop that happens once */
-                       { $$ = newSTATEOP(0,
-                               $1, newWHILEOP(0, 1, Nullop, Nullop, $2, $3)); }
+                       { $$ = newSTATEOP(0, $1,
+                                newWHILEOP(0, 1, (LOOP*)Nullop,
+                                           NOLINE, Nullop, $2, $3)); }
        ;
 
 nexpr  :       /* NULL */
@@ -245,6 +285,26 @@ texpr      :       /* NULL means true */
        |       expr
        ;
 
+iexpr  :       expr
+                       { $$ = invert(scalar($1)); }
+       ;
+
+mexpr  :       expr
+                       { $$ = $1; intro_my(); }
+       ;
+
+mnexpr :       nexpr
+                       { $$ = $1; intro_my(); }
+       ;
+
+mtexpr :       texpr
+                       { $$ = $1; intro_my(); }
+       ;
+
+miexpr :       iexpr
+                       { $$ = $1; intro_my(); }
+       ;
+
 label  :       /* empty */
                        { $$ = Nullch; }
        |       LABEL
@@ -254,116 +314,214 @@ decl    :       format
                        { $$ = 0; }
        |       subrout
                        { $$ = 0; }
+       |       mysubrout
+                       { $$ = 0; }
        |       package
                        { $$ = 0; }
+       |       use
+                       { $$ = 0; }
+       ;
+
+format :       FORMAT startformsub formname block
+                       { newFORM($2, $3, $4); }
+       ;
+
+formname:      WORD            { $$ = $1; }
+       |       /* NULL */      { $$ = Nullop; }
+       ;
+
+mysubrout:     MYSUB startsub subname proto subattrlist subbody
+                       { newMYSUB($2, $3, $4, $5, $6); }
+       ;
+
+subrout        :       SUB startsub subname proto subattrlist subbody
+                       { newATTRSUB($2, $3, $4, $5, $6); }
+       ;
+
+startsub:      /* NULL */      /* start a regular subroutine scope */
+                       { $$ = start_subparse(FALSE, 0); }
+       ;
+
+startanonsub:  /* NULL */      /* start an anonymous subroutine scope */
+                       { $$ = start_subparse(FALSE, CVf_ANON); }
        ;
 
-format :       FORMAT WORD block
-                       { newFORM($1, $2, $3); }
-       |       FORMAT block
-                       { newFORM($1, Nullop, $2); }
+startformsub:  /* NULL */      /* start a format subroutine scope */
+                       { $$ = start_subparse(TRUE, 0); }
        ;
 
-subrout        :       SUB WORD block
-                       { newSUB($1, $2, $3); }
+subname        :       WORD    { STRLEN n_a; char *name = SvPV(((SVOP*)$1)->op_sv,n_a);
+                         if (strEQ(name, "BEGIN") || strEQ(name, "END")
+                             || strEQ(name, "INIT"))
+                             CvSPECIAL_on(PL_compcv);
+                         $$ = $1; }
+       ;
+
+proto  :       /* NULL */
+                       { $$ = Nullop; }
+       |       THING
+       ;
+
+subattrlist:   /* NULL */
+                       { $$ = Nullop; }
+       |       COLONATTR THING
+                       { $$ = $2; }
+       |       COLONATTR
+                       { $$ = Nullop; }
+       ;
+
+myattrlist:    COLONATTR THING
+                       { $$ = $2; }
+       |       COLONATTR
+                       { $$ = Nullop; }
+       ;
+
+subbody        :       block   { $$ = $1; }
+       |       ';'     { $$ = Nullop; PL_expect = XSTATE; }
        ;
 
 package :      PACKAGE WORD ';'
                        { package($2); }
+       |       PACKAGE ';'
+                       { package(Nullop); }
+       ;
+
+use    :       USE startsub
+                       { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
+                   WORD WORD listexpr ';'
+                       { utilize($1, $2, $4, $5, $6); }
        ;
 
-expr   :       expr ',' sexpr
+expr   :       expr ANDOP expr
+                       { $$ = newLOGOP(OP_AND, 0, $1, $3); }
+       |       expr OROP expr
+                       { $$ = newLOGOP($2, 0, $1, $3); }
+       |       argexpr %prec PREC_LOW
+       ;
+
+argexpr        :       argexpr ','
+                       { $$ = $1; }
+       |       argexpr ',' term
                        { $$ = append_elem(OP_LIST, $1, $3); }
-       |       sexpr
+       |       term %prec PREC_LOW
        ;
 
-listop :       LSTOP indirob listexpr
+listop :       LSTOP indirob argexpr
                        { $$ = convert($1, OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF($2), $3) ); }
-       |       FUNC '(' indirob listexpr ')'
+                               prepend_elem(OP_LIST, newGVREF($1,$2), $3) ); }
+       |       FUNC '(' indirob expr ')'
                        { $$ = convert($1, OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF($3), $4) ); }
-       |       indirob ARROW LSTOP listexpr
-                       { $$ = convert($3, OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF($1), $4) ); }
-       |       indirob ARROW FUNC '(' listexpr ')'
-                       { $$ = convert($3, OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF($1), $5) ); }
-       |       term ARROW METHOD '(' listexpr ')'
-                       { $$ = convert(OP_ENTERSUBR, OPf_STACKED|OPf_SPECIAL,
-                               prepend_elem(OP_LIST, newMETHOD($1,$3), $5)); }
+                               prepend_elem(OP_LIST, newGVREF($1,$3), $4) ); }
+       |       term ARROW method '(' listexprcom ')'
+                       { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+                               append_elem(OP_LIST,
+                                   prepend_elem(OP_LIST, scalar($1), $5),
+                                   newUNOP(OP_METHOD, 0, $3))); }
+       |       term ARROW method
+                       { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+                               append_elem(OP_LIST, scalar($1),
+                                   newUNOP(OP_METHOD, 0, $3))); }
        |       METHOD indirob listexpr
-                       { $$ = convert(OP_ENTERSUBR, OPf_STACKED|OPf_SPECIAL,
-                               prepend_elem(OP_LIST, newMETHOD($2,$1), $3)); }
+                       { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+                               append_elem(OP_LIST,
+                                   prepend_elem(OP_LIST, $2, $3),
+                                   newUNOP(OP_METHOD, 0, $1))); }
+       |       FUNCMETH indirob '(' listexprcom ')'
+                       { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+                               append_elem(OP_LIST,
+                                   prepend_elem(OP_LIST, $2, $4),
+                                   newUNOP(OP_METHOD, 0, $1))); }
        |       LSTOP listexpr
                        { $$ = convert($1, 0, $2); }
-       |       FUNC '(' listexpr ')'
+       |       FUNC '(' listexprcom ')'
                        { $$ = convert($1, 0, $3); }
+       |       LSTOPSUB startanonsub block
+                       { $3 = newANONATTRSUB($2, 0, Nullop, $3); }
+                   listexpr            %prec LSTOP
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                append_elem(OP_LIST,
+                                  prepend_elem(OP_LIST, $3, $5), $1)); }
        ;
 
-sexpr  :       sexpr '=' sexpr
-                       { $$ = newASSIGNOP(OPf_STACKED, $1, $3); }
-       |       sexpr POWOP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4)); }
-       |       sexpr MULOP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4)); }
-       |       sexpr ADDOP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4));}
-       |       sexpr SHIFTOP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4)); }
-       |       sexpr BITANDOP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4)); }
-       |       sexpr BITOROP '=' sexpr
-                       { $$ = newBINOP($2, OPf_STACKED,
-                               ref(scalar($1), $2), scalar($4)); }
-       |       sexpr ANDAND '=' sexpr
-                       { $$ = newLOGOP(OP_ANDASSIGN, 0,
-                               ref(scalar($1), OP_ANDASSIGN),
-                               newUNOP(OP_SASSIGN, 0, scalar($4))); }
-       |       sexpr OROR '=' sexpr
-                       { $$ = newLOGOP(OP_ORASSIGN, 0,
-                               ref(scalar($1), OP_ORASSIGN),
-                               newUNOP(OP_SASSIGN, 0, scalar($4))); }
-
-
-       |       sexpr POWOP sexpr
+method :       METHOD
+       |       scalar
+       ;
+
+subscripted:    star '{' expr ';' '}'
+                       { $$ = newBINOP(OP_GELEM, 0, $1, scalar($3)); }
+       |       scalar '[' expr ']'
+                       { $$ = newBINOP(OP_AELEM, 0, oopsAV($1), scalar($3)); }
+       |       term ARROW '[' expr ']'
+                       { $$ = newBINOP(OP_AELEM, 0,
+                                       ref(newAVREF($1),OP_RV2AV),
+                                       scalar($4));}
+       |       subscripted '[' expr ']'
+                       { $$ = newBINOP(OP_AELEM, 0,
+                                       ref(newAVREF($1),OP_RV2AV),
+                                       scalar($3));}
+       |       scalar '{' expr ';' '}'
+                       { $$ = newBINOP(OP_HELEM, 0, oopsHV($1), jmaybe($3));
+                           PL_expect = XOPERATOR; }
+       |       term ARROW '{' expr ';' '}'
+                       { $$ = newBINOP(OP_HELEM, 0,
+                                       ref(newHVREF($1),OP_RV2HV),
+                                       jmaybe($4));
+                           PL_expect = XOPERATOR; }
+       |       subscripted '{' expr ';' '}'
+                       { $$ = newBINOP(OP_HELEM, 0,
+                                       ref(newHVREF($1),OP_RV2HV),
+                                       jmaybe($3));
+                           PL_expect = XOPERATOR; }
+       |       term ARROW '(' ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  newCVREF(0, scalar($1))); }
+       |       term ARROW '(' expr ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  append_elem(OP_LIST, $4,
+                                      newCVREF(0, scalar($1)))); }
+
+       |       subscripted '(' expr ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  append_elem(OP_LIST, $3,
+                                              newCVREF(0, scalar($1)))); }
+       |       subscripted '(' ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  newCVREF(0, scalar($1))); }
+
+
+
+term   :       term ASSIGNOP term
+                       { $$ = newASSIGNOP(OPf_STACKED, $1, $2, $3); }
+       |       term POWOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr MULOP sexpr
+       |       term MULOP term
                        {   if ($2 != OP_REPEAT)
                                scalar($1);
                            $$ = newBINOP($2, 0, $1, scalar($3)); }
-       |       sexpr ADDOP sexpr
+       |       term ADDOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr SHIFTOP sexpr
+       |       term SHIFTOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr RELOP sexpr
+       |       term RELOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr EQOP sexpr
+       |       term EQOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr BITANDOP sexpr
+       |       term BITANDOP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr BITOROP sexpr
+       |       term BITOROP term
                        { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       sexpr DOTDOT sexpr
+       |       term DOTDOT term
                        { $$ = newRANGE($2, scalar($1), scalar($3));}
-       |       sexpr ANDAND sexpr
+       |       term ANDAND term
                        { $$ = newLOGOP(OP_AND, 0, $1, $3); }
-       |       sexpr OROR sexpr
+       |       term OROR term
                        { $$ = newLOGOP(OP_OR, 0, $1, $3); }
-       |       sexpr '?' sexpr ':' sexpr
+       |       term '?' term ':' term
                        { $$ = newCONDOP(0, $1, $3, $5); }
-       |       sexpr MATCHOP sexpr
+       |       term MATCHOP term
                        { $$ = bind_match($2, $1, $3); }
-       |       term
-                       { $$ = $1; }
-       ;
 
-term   :       '-' term %prec UMINUS
+       |       '-' term %prec UMINUS
                        { $$ = newUNOP(OP_NEGATE, 0, scalar($2)); }
        |       '+' term %prec UMINUS
                        { $$ = $2; }
@@ -372,151 +530,181 @@ term    :       '-' term %prec UMINUS
        |       '~' term
                        { $$ = newUNOP(OP_COMPLEMENT, 0, scalar($2));}
        |       REFGEN term
-                       { $$ = newUNOP(OP_REFGEN, 0, ref($2, OP_REFGEN)); }
+                       { $$ = newUNOP(OP_REFGEN, 0, mod($2,OP_REFGEN)); }
        |       term POSTINC
                        { $$ = newUNOP(OP_POSTINC, 0,
-                                       ref(scalar($1), OP_POSTINC)); }
+                                       mod(scalar($1), OP_POSTINC)); }
        |       term POSTDEC
                        { $$ = newUNOP(OP_POSTDEC, 0,
-                                       ref(scalar($1), OP_POSTDEC)); }
+                                       mod(scalar($1), OP_POSTDEC)); }
        |       PREINC term
                        { $$ = newUNOP(OP_PREINC, 0,
-                                       ref(scalar($2), OP_PREINC)); }
+                                       mod(scalar($2), OP_PREINC)); }
        |       PREDEC term
                        { $$ = newUNOP(OP_PREDEC, 0,
-                                       ref(scalar($2), OP_PREDEC)); }
-       |       LOCAL sexpr     %prec UNIOP
-                       { $$ = localize($2); }
-       |       '(' expr crp
+                                       mod(scalar($2), OP_PREDEC)); }
+       |       myattrterm      %prec UNIOP
+                       { $$ = $1; }
+       |       LOCAL term      %prec UNIOP
+                       { $$ = localize($2,$1); }
+       |       '(' expr ')'
                        { $$ = sawparens($2); }
        |       '(' ')'
-                       { $$ = newNULLLIST(); }
-       |       '[' expr crb                            %prec '('
+                       { $$ = sawparens(newNULLLIST()); }
+       |       '[' expr ']'
                        { $$ = newANONLIST($2); }
-       |       '[' ']'                                 %prec '('
+       |       '[' ']'
                        { $$ = newANONLIST(Nullop); }
-       |       HASHBRACK expr crhb                     %prec '('
+       |       HASHBRACK expr ';' '}'                  %prec '('
                        { $$ = newANONHASH($2); }
        |       HASHBRACK ';' '}'                               %prec '('
                        { $$ = newANONHASH(Nullop); }
+       |       ANONSUB startanonsub proto subattrlist block    %prec '('
+                       { $$ = newANONATTRSUB($2, $3, $4, $5); }
        |       scalar  %prec '('
                        { $$ = $1; }
        |       star    %prec '('
                        { $$ = $1; }
-       |       scalar '[' expr ']'     %prec '('
-                       { $$ = newBINOP(OP_AELEM, 0, oopsAV($1), scalar($3)); }
-       |       term ARROW '[' expr ']' %prec '('
-                       { $$ = newBINOP(OP_AELEM, 0,
-                                       scalar(ref(newAVREF($1),OP_RV2AV)),
-                                       scalar($4));}
        |       hsh     %prec '('
                        { $$ = $1; }
        |       ary     %prec '('
                        { $$ = $1; }
        |       arylen  %prec '('
                        { $$ = newUNOP(OP_AV2ARYLEN, 0, ref($1, OP_AV2ARYLEN));}
-       |       scalar '{' expr ';' '}' %prec '('
-                       { $$ = newBINOP(OP_HELEM, 0, oopsHV($1), jmaybe($3));
-                           expect = XOPERATOR; }
-       |       term ARROW '{' expr ';' '}'     %prec '('
-                       { $$ = newBINOP(OP_HELEM, 0,
-                                       scalar(ref(newHVREF($1),OP_RV2HV)),
-                                       jmaybe($4));
-                           expect = XOPERATOR; }
-       |       '(' expr crp '[' expr ']'       %prec '('
+       |       subscripted
+                       { $$ = $1; }
+       |       '(' expr ')' '[' expr ']'
                        { $$ = newSLICEOP(0, $5, $2); }
-       |       '(' ')' '[' expr ']'    %prec '('
+       |       '(' ')' '[' expr ']'
                        { $$ = newSLICEOP(0, $4, Nullop); }
-       |       ary '[' expr ']'        %prec '('
+       |       ary '[' expr ']'
                        { $$ = prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
-                               list(
                                    newLISTOP(OP_ASLICE, 0,
                                        list($3),
-                                       ref($1, OP_ASLICE)))); }
-       |       ary '{' expr ';' '}'    %prec '('
+                                       ref($1, OP_ASLICE))); }
+       |       ary '{' expr ';' '}'
                        { $$ = prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
-                               list(
                                    newLISTOP(OP_HSLICE, 0,
                                        list($3),
-                                       ref(oopsHV($1), OP_HSLICE))));
-                           expect = XOPERATOR; }
-       |       DELETE scalar '{' expr ';' '}'  %prec '('
-                       { $$ = newBINOP(OP_DELETE, 0, oopsHV($2), jmaybe($4));
-                           expect = XOPERATOR; }
-       |       DELETE '(' scalar '{' expr ';' '}' ')'  %prec '('
-                       { $$ = newBINOP(OP_DELETE, 0, oopsHV($3), jmaybe($5));
-                           expect = XOPERATOR; }
+                                       ref(oopsHV($1), OP_HSLICE)));
+                           PL_expect = XOPERATOR; }
        |       THING   %prec '('
                        { $$ = $1; }
        |       amper
-                       { $$ = newUNOP(OP_ENTERSUBR, 0,
-                               scalar($1)); }
+                       { $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); }
        |       amper '(' ')'
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_STACKED, scalar($1)); }
-       |       amper '(' expr crp
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_STACKED,
-                           list(prepend_elem(OP_LIST, scalar($1), $3))); }
-       |       DO sexpr        %prec UNIOP
-                       { $$ = newUNOP(OP_DOFILE, 0, scalar($2));
-                         allgvs = TRUE;}
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); }
+       |       amper '(' expr ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, $3, scalar($1))); }
+       |       NOAMP WORD listexpr
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, $3, scalar($2))); }
+       |       DO term %prec UNIOP
+                       { $$ = dofile($2); }
        |       DO block        %prec '('
                        { $$ = newUNOP(OP_NULL, OPf_SPECIAL, scope($2)); }
        |       DO WORD '(' ')'
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_SPECIAL|OPf_STACKED,
-                           list(prepend_elem(OP_LIST,
-                               scalar(newCVREF(scalar($2))), newNULLLIST()))); }
-       |       DO WORD '(' expr crp
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_SPECIAL|OPf_STACKED,
-                           list(prepend_elem(OP_LIST,
-                               scalar(newCVREF(scalar($2))),
-                               $4))); }
+                       { $$ = newUNOP(OP_ENTERSUB,
+                           OPf_SPECIAL|OPf_STACKED,
+                           prepend_elem(OP_LIST,
+                               scalar(newCVREF(
+                                   (OPpENTERSUB_AMPER<<8),
+                                   scalar($2)
+                               )),Nullop)); dep();}
+       |       DO WORD '(' expr ')'
+                       { $$ = newUNOP(OP_ENTERSUB,
+                           OPf_SPECIAL|OPf_STACKED,
+                           append_elem(OP_LIST,
+                               $4,
+                               scalar(newCVREF(
+                                   (OPpENTERSUB_AMPER<<8),
+                                   scalar($2)
+                               )))); dep();}
        |       DO scalar '(' ')'
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_SPECIAL|OPf_STACKED,
-                           list(prepend_elem(OP_LIST,
-                               scalar(newCVREF(scalar($2))), newNULLLIST())));}
-       |       DO scalar '(' expr crp
-                       { $$ = newUNOP(OP_ENTERSUBR, OPf_SPECIAL|OPf_STACKED,
-                           list(prepend_elem(OP_LIST,
-                               scalar(newCVREF(scalar($2))),
-                               $4))); }
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+                           prepend_elem(OP_LIST,
+                               scalar(newCVREF(0,scalar($2))), Nullop)); dep();}
+       |       DO scalar '(' expr ')'
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+                           prepend_elem(OP_LIST,
+                               $4,
+                               scalar(newCVREF(0,scalar($2))))); dep();}
        |       LOOPEX
-                       { $$ = newOP($1, OPf_SPECIAL); }
-       |       LOOPEX WORD
-                       { $$ = newPVOP($1, 0,
-                               savestr(SvPVnx(((SVOP*)$2)->op_sv)));
-                           op_free($2); }
+                       { $$ = newOP($1, OPf_SPECIAL);
+                           PL_hints |= HINT_BLOCK_SCOPE; }
+       |       LOOPEX term
+                       { $$ = newLOOPEX($1,$2); }
+       |       NOTOP argexpr
+                       { $$ = newUNOP(OP_NOT, 0, scalar($2)); }
        |       UNIOP
                        { $$ = newOP($1, 0); }
        |       UNIOP block
                        { $$ = newUNOP($1, 0, $2); }
-       |       UNIOP sexpr
+       |       UNIOP term
                        { $$ = newUNOP($1, 0, $2); }
+       |       UNIOPSUB term
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, $2, scalar($1))); }
        |       FUNC0
                        { $$ = newOP($1, 0); }
        |       FUNC0 '(' ')'
                        { $$ = newOP($1, 0); }
+       |       FUNC0SUB
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                               scalar($1)); }
        |       FUNC1 '(' ')'
                        { $$ = newOP($1, OPf_SPECIAL); }
        |       FUNC1 '(' expr ')'
                        { $$ = newUNOP($1, 0, $3); }
-       |       PMFUNC '(' sexpr ')'
+       |       PMFUNC '(' term ')'
                        { $$ = pmruntime($1, $3, Nullop); }
-       |       PMFUNC '(' sexpr ',' sexpr ')'
+       |       PMFUNC '(' term ',' term ')'
                        { $$ = pmruntime($1, $3, $5); }
        |       WORD
        |       listop
        ;
 
-listexpr:      /* NULL */
-                       { $$ = newNULLLIST(); }
+myattrterm:    MY myterm myattrlist
+                       { $$ = my_attrs($2,$3); }
+       |       MY myterm
+                       { $$ = localize($2,$1); }
+       ;
+
+myterm :       '(' expr ')'
+                       { $$ = sawparens($2); }
+       |       '(' ')'
+                       { $$ = sawparens(newNULLLIST()); }
+       |       scalar  %prec '('
+                       { $$ = $1; }
+       |       hsh     %prec '('
+                       { $$ = $1; }
+       |       ary     %prec '('
+                       { $$ = $1; }
+       ;
+
+listexpr:      /* NULL */ %prec PREC_LOW
+                       { $$ = Nullop; }
+       |       argexpr    %prec PREC_LOW
+                       { $$ = $1; }
+       ;
+
+listexprcom:   /* NULL */
+                       { $$ = Nullop; }
        |       expr
                        { $$ = $1; }
+       |       expr ','
+                       { $$ = $1; }
+       ;
+
+my_scalar:     scalar
+                       { PL_in_my = 0; $$ = my($1); }
        ;
 
 amper  :       '&' indirob
-                       { $$ = newCVREF($2); }
+                       { $$ = newCVREF($1,$2); }
        ;
 
 scalar :       '$' indirob
@@ -536,34 +724,26 @@ arylen    :       DOLSHARP indirob
        ;
 
 star   :       '*' indirob
-                       { $$ = newGVREF($2); }
+                       { $$ = newGVREF(0,$2); }
        ;
 
 indirob        :       WORD
                        { $$ = scalar($1); }
-       |       scalar
-                       { $$ = scalar($1); }
+       |       scalar %prec PREC_LOW
+                       { $$ = scalar($1);  }
        |       block
-                       { $$ = scalar(scope($1)); }
+                       { $$ = scope($1); }
 
+       |       PRIVATEREF
+                       { $$ = $1; }
        ;
 
-crp    :       ',' ')'
-                       { $$ = 1; }
-       |       ')'
-                       { $$ = 0; }
-       ;
+%% /* PROGRAM */
 
-crb    :       ',' ']'
-                       { $$ = 1; }
-       |       ']'
-                       { $$ = 0; }
-       ;
+/* more stuff added to make perly_c.diff easier to apply */
 
-crhb   :       ',' ';' '}'
-                       { $$ = 1; }
-       |       ';' '}'
-                       { $$ = 0; }
-       ;
+#ifdef yyparse
+#undef yyparse
+#endif
+#define yyparse() Perl_yyparse(pTHX)
 
-%% /* PROGRAM */