toke.c: Un-special case something

[perl5.git] / perly.y

diff --git a/perly.y b/perly.y
index ff14780..7d57dea 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -143,7 +143,7 @@ grammar     :       GRAMPROG
                          PL_eval_root = $3;
                          $$ = 0;
                          yyunlex();
-                         parser->yychar = YYEOF;
+                         parser->yychar = yytoken = YYEOF;
                        }
        |       GRAMBARESTMT
                        {
@@ -155,7 +155,7 @@ grammar     :       GRAMPROG
                          PL_eval_root = $3;
                          $$ = 0;
                          yyunlex();
-                         parser->yychar = YYEOF;
+                         parser->yychar = yytoken = YYEOF;
                        }
        |       GRAMFULLSTMT
                        {
@@ -167,7 +167,7 @@ grammar     :       GRAMPROG
                          PL_eval_root = $3;
                          $$ = 0;
                          yyunlex();
-                         parser->yychar = YYEOF;
+                         parser->yychar = yytoken = YYEOF;
                        }
        |       GRAMSTMTSEQ
                        {
@@ -215,7 +215,7 @@ mremember:  /* NULL */      /* start a partial lexical scope */
 
 /* A sequence of statements in the program */
 stmtseq        :       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       stmtseq fullstmt
                        {   $$ = op_append_list(OP_LINESEQ, $1, $2);
                            PL_pad_reset_pending = TRUE;
@@ -226,7 +226,7 @@ stmtseq     :       /* NULL */
 
 /* A sequence of format lines */
 formstmtseq:   /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       formstmtseq formline
                        {   $$ = op_append_list(OP_LINESEQ, $1, $2);
                            PL_pad_reset_pending = TRUE;
@@ -261,7 +261,7 @@ barestmt:   PLUGSTMT
                        {
                          CV *fmtcv = PL_compcv;
                          newFORM($2, $3, $4);
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                          if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
                              pad_add_weakref(fmtcv);
                          }
@@ -296,7 +296,7 @@ barestmt:   PLUGSTMT
                              ? newATTRSUB($3, $2, $5, $6, $7)
                              : newMYSUB($3, $2, $5, $6, $7)
                          ;
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                          intro_my();
                          parser->parsed_sub = 1;
                        }
@@ -335,7 +335,7 @@ barestmt:   PLUGSTMT
                              ? newATTRSUB($3, $2, NULL, $7, body)
                              : newMYSUB($3, $2, NULL, $7, body)
                          ;
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                          intro_my();
                          parser->parsed_sub = 1;
                        }
@@ -344,7 +344,7 @@ barestmt:   PLUGSTMT
                          package($3);
                          if ($2)
                              package_version($2);
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                        }
        |       USE startsub
                        { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
@@ -353,7 +353,7 @@ barestmt:   PLUGSTMT
                          SvREFCNT_inc_simple_void(PL_compcv);
                          utilize($1, $2, $4, $5, $6);
                          parser->parsed_sub = 1;
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                        }
        |       IF '(' remember mexpr ')' mblock else
                        {
@@ -379,14 +379,14 @@ barestmt: PLUGSTMT
        |       WHILE '(' remember texpr ')' mintro mblock cont
                        {
                          $$ = block_end($3,
-                                 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+                                 newWHILEOP(0, 1, NULL,
                                      $4, $7, $8, $6));
                          parser->copline = (line_t)$1;
                        }
        |       UNTIL '(' remember iexpr ')' mintro mblock cont
                        {
                          $$ = block_end($3,
-                                 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+                                 newWHILEOP(0, 1, NULL,
                                      $4, $7, $8, $6));
                          parser->copline = (line_t)$1;
                        }
@@ -398,7 +398,7 @@ barestmt:   PLUGSTMT
                mblock
                        {
                          OP *initop = $4;
-                         OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+                         OP *forop = newWHILEOP(0, 1, NULL,
                                      scalar($7), $13, $11, $10);
                          if (initop) {
                              forop = op_prepend_elem(OP_LINESEQ, initop,
@@ -447,14 +447,14 @@ barestmt: PLUGSTMT
        |       FOR '(' remember mexpr ')' mblock cont
                        {
                          $$ = block_end($3,
-                                 newFOROP(0, (OP*)NULL, $4, $6, $7));
+                                 newFOROP(0, NULL, $4, $6, $7));
                          parser->copline = (line_t)$1;
                        }
        |       block cont
                        {
                          /* a block is a loop that happens once */
-                         $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                 (OP*)NULL, $1, $2, 0);
+                         $$ = newWHILEOP(0, 1, NULL,
+                                 NULL, $1, $2, 0);
                        }
        |       PACKAGE BAREWORD BAREWORD '{' remember
                        {
@@ -466,8 +466,8 @@ barestmt:   PLUGSTMT
                stmtseq '}'
                        {
                          /* a block is a loop that happens once */
-                         $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                 (OP*)NULL, block_end($5, $7), (OP*)NULL, 0);
+                         $$ = newWHILEOP(0, 1, NULL,
+                                 NULL, block_end($5, $7), NULL, 0);
                          if (parser->copline > (line_t)$4)
                              parser->copline = (line_t)$4;
                        }
@@ -477,7 +477,7 @@ barestmt:   PLUGSTMT
                        }
        |       ';'
                        {
-                         $$ = (OP*)NULL;
+                         $$ = NULL;
                          parser->copline = NOLINE;
                        }
        ;
@@ -508,7 +508,7 @@ formarg     :       /* NULL */
 
 /* An expression which may have a side-effect */
 sideff :       error
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       expr
                        { $$ = $1; }
        |       expr IF expr
@@ -520,7 +520,7 @@ sideff      :       error
        |       expr UNTIL iexpr
                        { $$ = newLOOPOP(OPf_PARENS, 1, $3, $1); }
        |       expr FOR expr
-                       { $$ = newFOROP(0, (OP*)NULL, $3, $1, (OP*)NULL);
+                       { $$ = newFOROP(0, NULL, $3, $1, NULL);
                          parser->copline = (line_t)$2; }
        |       expr WHEN expr
                        { $$ = newWHENOP($3, op_scope($1)); }
@@ -528,7 +528,7 @@ sideff      :       error
 
 /* else and elsif blocks */
 else   :       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       ELSE mblock
                        {
                          ($2)->op_flags |= OPf_PARENS;
@@ -545,7 +545,7 @@ else        :       /* NULL */
 
 /* Continue blocks */
 cont   :       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       CONTINUE block
                        { $$ = op_scope($2); }
        ;
@@ -558,7 +558,7 @@ mintro      :       /* NULL */
 
 /* Normal expression */
 nexpr  :       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       sideff
        ;
 
@@ -585,7 +585,7 @@ mnexpr      :       nexpr
        ;
 
 formname:      BAREWORD        { $$ = $1; }
-       |       /* NULL */      { $$ = (OP*)NULL; }
+       |       /* NULL */      { $$ = NULL; }
        ;
 
 startsub:      /* NULL */      /* start a regular subroutine scope */
@@ -611,24 +611,24 @@ subname   :       BAREWORD
 
 /* Subroutine prototype */
 proto  :       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       THING
        ;
 
 /* Optional list of subroutine attributes */
 subattrlist:   /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       COLONATTR THING
                        { $$ = $2; }
        |       COLONATTR
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        ;
 
 /* List of attributes for a "my" variable declaration */
 myattrlist:    COLONATTR THING
                        { $$ = $2; }
        |       COLONATTR
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        ;
 
 
@@ -639,7 +639,7 @@ myattrlist: COLONATTR THING
 
 /* the '' or 'foo' part of a '$' or '@foo' etc signature variable  */
 sigvarname:     /* NULL */
-                       { parser->in_my = 0; $$ = (OP*)NULL; }
+                       { parser->in_my = 0; $$ = NULL; }
         |       PRIVATEREF
                         { parser->in_my = 0; $$ = $1; }
        ;
@@ -665,13 +665,13 @@ sigslurpelem: sigslurpsigil sigvarname sigdefault/* def only to catch errors */
                                 yyerror("A slurpy parameter may not have "
                                         "a default value");
 
-                            $$ = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
+                            $$ = var ? newSTATEOP(0, NULL, var) : NULL;
                         }
        ;
 
 /* default part of sub signature scalar element: i.e. '= default_expr' */
 sigdefault:    /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
         |       ASSIGNOP
                         { $$ = newOP(OP_NULL, 0); }
         |       ASSIGNOP term
@@ -739,7 +739,7 @@ sigscalarelem:
                                             "follows optional parameter");
                             }
 
-                            $$ = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
+                            $$ = var ? newSTATEOP(0, NULL, var) : NULL;
                         }
        ;
 
@@ -765,7 +765,7 @@ siglist:
 
 /* () or (....) */
 siglistornull:         /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       siglist
                        { $$ = $1; }
 
@@ -788,7 +788,9 @@ subsignature:       '('
                             UNOP_AUX_item *aux;
                             OP            *check;
 
-                            assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            if (!parser->error_count) {
+                                assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            }
 
                             /* We shouldn't get here otherwise */
                             Perl_ck_warner_d(aTHX_
@@ -821,7 +823,7 @@ subsignature:       '('
 
 /* Optional subroutine body, for named subroutine declaration */
 optsubbody:    block
-       |       ';'     { $$ = (OP*)NULL; }
+       |       ';'     { $$ = NULL; }
        ;
 
 /* Ordinary expressions; logical combinations */
@@ -883,7 +885,7 @@ listop      :       LSTOP indirob listexpr /* map {...} @args or print $fh @args */
                        { $$ = op_convert_list($1, 0, $3); }
        |       LSTOPSUB startanonsub block /* sub f(&@);   f { foo } ... */
                        { SvREFCNT_inc_simple_void(PL_compcv);
-                         $<opval>$ = newANONATTRSUB($2, 0, (OP*)NULL, $3); }
+                         $<opval>$ = newANONATTRSUB($2, 0, NULL, $3); }
                    optlistexpr         %prec LSTOP  /* ... @bar */
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 op_append_elem(OP_LIST,
@@ -945,7 +947,7 @@ subscripted:    gelem '{' expr ';' '}'        /* *main::{something} */
        |       QWLIST '[' expr ']'            /* list literal slice */
                        { $$ = newSLICEOP(0, $3, $1); }
        |       '(' ')' '[' expr ']'                 /* empty list slice! */
-                       { $$ = newSLICEOP(0, $4, (OP*)NULL); }
+                       { $$ = newSLICEOP(0, $4, NULL); }
     ;
 
 /* Binary operators between terms */
@@ -1022,11 +1024,11 @@ termunop : '-' term %prec UMINUS                       /* -$x */
 anonymous:     '[' expr ']'
                        { $$ = newANONLIST($2); }
        |       '[' ']'
-                       { $$ = newANONLIST((OP*)NULL);}
+                       { $$ = newANONLIST(NULL);}
        |       HASHBRACK expr ';' '}'  %prec '(' /* { foo => "Bar" } */
                        { $$ = newANONHASH($2); }
        |       HASHBRACK ';' '}'       %prec '(' /* { } (';' by tokener) */
-                       { $$ = newANONHASH((OP*)NULL); }
+                       { $$ = newANONHASH(NULL); }
        |       ANONSUB startanonsub proto subattrlist block            %prec '('
                        { SvREFCNT_inc_simple_void(PL_compcv);
                          $$ = newANONATTRSUB($2, $3, $4, $5); }
@@ -1235,19 +1237,19 @@ myterm  :       '(' expr ')'
 
 /* Basic list expressions */
 optlistexpr:   /* NULL */ %prec PREC_LOW
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       listexpr    %prec PREC_LOW
                        { $$ = $1; }
        ;
 
 optexpr:       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       expr
                        { $$ = $1; }
        ;
 
 optrepl:       /* NULL */
-                       { $$ = (OP*)NULL; }
+                       { $$ = NULL; }
        |       '/' expr
                        { $$ = $2; }
        ;