Describe __PACKAGE__ in perldelta

[p5sagit/p5-mst-13.2.git] / perly.y

diff --git a/perly.y b/perly.y
index 7da1be3..3bf1fda 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -1,6 +1,6 @@
 /*    perly.y
  *
- *    Copyright (c) 1991-1994, 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.
@@ -9,7 +9,7 @@
 
 /*
  * 'I see,' laughed Strider.  'I look foul and feel fair.  Is that it?
- * All that is gold does not glitter, not all those that wander are lost.'
+ * All that is gold does not glitter, not all those who wander are lost.'
  */
 
 %{
@@ -208,8 +208,8 @@ loop        :       label WHILE '(' remember mtexpr ')' mblock cont
                        /* basically fake up an initialize-while lineseq */
                        { copline = $2;
                            $$ = block_end($4,
-                                  append_elem(OP_LINESEQ, scalar($5),
-                                    newSTATEOP(0, $1,
+                                  newSTATEOP(0, $1,
+                                    append_elem(OP_LINESEQ, scalar($5),
                                       newWHILEOP(0, 1, (LOOP*)Nullop,
                                                  scalar($7),
                                                  $11, scalar($9))))); }
@@ -276,18 +276,16 @@ subrout   :       SUB startsub subname proto subbody
                        { newSUB($2, $3, $4, $5); }
        ;
 
-startsub:      /* NULL */      /* start a subroutine scope */
-                       { $$ = start_subparse(); }
+startsub:      /* NULL */      /* start a regular subroutine scope */
+                       { $$ = start_subparse(FALSE, 0); }
        ;
 
 startanonsub:  /* NULL */      /* start an anonymous subroutine scope */
-                       { $$ = start_subparse();
-                         CvANON_on(compcv); }
+                       { $$ = start_subparse(FALSE, CVf_ANON); }
        ;
 
 startformsub:  /* NULL */      /* start a format subroutine scope */
-                       { $$ = start_subparse();
-                         CvFORMAT_on(compcv); }
+                       { $$ = start_subparse(TRUE, 0); }
        ;
 
 subname        :       WORD    { char *name = SvPVx(((SVOP*)$1)->op_sv, na);