summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--op.h4
-rw-r--r--perly.act64
-rw-r--r--perly.y64
-rw-r--r--win32/perlhost.h4
4 files changed, 69 insertions, 67 deletions
diff --git a/op.h b/op.h
index fd0ec3432b..5c189008b8 100644
--- a/op.h
+++ b/op.h
@@ -517,7 +517,9 @@ struct loop {
#define cSVOPo_sv cSVOPx_sv(o)
#define kSVOP_sv cSVOPx_sv(kid)
-#define Nullop ((OP*)NULL)
+#ifndef PERL_CORE
+# define Nullop ((OP*)NULL)
+#endif
/* Lowest byte-and-a-bit of PL_opargs */
#define OA_MARK 1
diff --git a/perly.act b/perly.act
index 61c8f5b44a..4ff627cc05 100644
--- a/perly.act
+++ b/perly.act
@@ -47,7 +47,7 @@ case 2:
case 9:
#line 180 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 10:
@@ -97,7 +97,7 @@ case 2:
else {
(yyval.opval) = IF_MAD(
newOP(OP_NULL, 0),
- Nullop);
+ (OP*)NULL);
PL_parser->copline = NOLINE;
TOKEN_FREE((ps[(1) - (2)].val.p_tkval));
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),';');
@@ -127,7 +127,7 @@ case 2:
case 18:
#line 243 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 19:
@@ -166,14 +166,14 @@ case 2:
case 24:
#line 263 "perly.y"
{ (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
- Nullop, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), Nullop);
+ (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
;}
break;
case 25:
#line 271 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 26:
@@ -229,7 +229,7 @@ case 2:
case 32:
#line 315 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 33:
@@ -245,7 +245,7 @@ case 2:
PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
(yyval.opval) = block_end((ps[(4) - (9)].val.ival),
newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)),
- innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+ innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival))));
TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L');
TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W');
@@ -260,7 +260,7 @@ case 2:
PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
(yyval.opval) = block_end((ps[(4) - (9)].val.ival),
newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)),
- innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+ innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival))));
TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L');
TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W');
@@ -301,7 +301,7 @@ case 2:
{ OP *innerop;
(yyval.opval) = block_end((ps[(4) - (8)].val.ival),
innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)),
- Nullop, (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
+ (OP*)NULL, (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
TOKEN_GETMAD((ps[(1) - (8)].val.p_tkval),((LISTOP*)innerop)->op_first,'L');
TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
TOKEN_GETMAD((ps[(3) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
@@ -314,7 +314,7 @@ case 2:
{ OP *forop;
PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval));
forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)),
- newWHILEOP(0, 1, (LOOP*)Nullop,
+ newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL((ps[(2) - (12)].val.i_tkval)), scalar((ps[(7) - (12)].val.opval)),
(ps[(12) - (12)].val.opval), (ps[(10) - (12)].val.opval), (ps[(9) - (12)].val.ival)));
#ifdef MAD
@@ -345,8 +345,8 @@ case 2:
case 40:
#line 412 "perly.y"
{ (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)),
- newWHILEOP(0, 1, (LOOP*)Nullop,
- NOLINE, Nullop, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0));
+ newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+ NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0));
TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
break;
@@ -368,7 +368,7 @@ case 2:
case 43:
#line 435 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 45:
@@ -458,7 +458,7 @@ case 2:
token_free((ps[(1) - (4)].val.i_tkval));
#else
newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
- (yyval.opval) = Nullop;
+ (yyval.opval) = (OP*)NULL;
#endif
;}
break;
@@ -470,7 +470,7 @@ case 2:
case 62:
#line 518 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 63:
@@ -481,7 +481,7 @@ case 2:
token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d');
#else
newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
- (yyval.opval) = Nullop;
+ (yyval.opval) = (OP*)NULL;
#endif
;}
break;
@@ -504,7 +504,7 @@ case 2:
}
#else
newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
- (yyval.opval) = Nullop;
+ (yyval.opval) = (OP*)NULL;
#endif
;}
break;
@@ -539,12 +539,12 @@ case 2:
case 69:
#line 584 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 71:
#line 590 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 72:
@@ -558,7 +558,7 @@ case 2:
#line 596 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL, 0),
- Nullop
+ (OP*)NULL
);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
;}
@@ -575,7 +575,7 @@ case 2:
#line 610 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL, 0),
- Nullop
+ (OP*)NULL
);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
;}
@@ -590,7 +590,7 @@ case 2:
#line 620 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL,0),
- Nullop
+ (OP*)NULL
);
PL_parser->expect = XSTATE;
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';');
@@ -606,7 +606,7 @@ case 2:
token_getmad((ps[(3) - (3)].val.i_tkval),(yyval.opval),';');
#else
package((ps[(2) - (3)].val.opval));
- (yyval.opval) = Nullop;
+ (yyval.opval) = (OP*)NULL;
#endif
;}
break;
@@ -628,7 +628,7 @@ case 2:
append_madprops(newMADPROP('!', MAD_PV, "", 0), (yyval.opval), 0);
#else
utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
- (yyval.opval) = Nullop;
+ (yyval.opval) = (OP*)NULL;
#endif
;}
break;
@@ -757,7 +757,7 @@ case 2:
case 96:
#line 752 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
- (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, Nullop, (ps[(3) - (3)].val.opval)); ;}
+ (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
break;
case 97:
@@ -894,7 +894,7 @@ case 2:
case 112:
#line 859 "perly.y"
- { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), Nullop);
+ { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL);
TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')');
TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'[');
@@ -1086,7 +1086,7 @@ case 2:
case 136:
#line 989 "perly.y"
- { (yyval.opval) = newANONLIST(Nullop);
+ { (yyval.opval) = newANONLIST((OP*)NULL);
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
;}
@@ -1103,7 +1103,7 @@ case 2:
case 138:
#line 1000 "perly.y"
- { (yyval.opval) = newANONHASH(Nullop);
+ { (yyval.opval) = newANONHASH((OP*)NULL);
TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{');
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';');
TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'}');
@@ -1142,7 +1142,7 @@ case 2:
scalar(newCVREF(
(OPpENTERSUB_AMPER<<8),
scalar((ps[(2) - (4)].val.opval))
- )),Nullop)); dep();
+ )),(OP*)NULL)); dep();
TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
@@ -1169,7 +1169,7 @@ case 2:
#line 1050 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
prepend_elem(OP_LIST,
- scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), Nullop)); dep();
+ scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
@@ -1499,7 +1499,7 @@ case 2:
case 194:
#line 1268 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 195:
@@ -1509,7 +1509,7 @@ case 2:
case 196:
#line 1274 "perly.y"
- { (yyval.opval) = Nullop; ;}
+ { (yyval.opval) = (OP*)NULL; ;}
break;
case 197:
diff --git a/perly.y b/perly.y
index 4dac4d0dcd..ad7b55209e 100644
--- a/perly.y
+++ b/perly.y
@@ -177,7 +177,7 @@ mremember: /* NULL */ /* start a partial lexical scope */
/* A collection of "lines" in the program */
lineseq : /* NULL */
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| lineseq decl
{
$$ = IF_MAD(
@@ -213,7 +213,7 @@ line : label cond
else {
$$ = IF_MAD(
newOP(OP_NULL, 0),
- Nullop);
+ (OP*)NULL);
PL_parser->copline = NOLINE;
TOKEN_FREE($1);
TOKEN_GETMAD($2,$$,';');
@@ -240,7 +240,7 @@ line : label cond
/* An expression which may have a side-effect */
sideff : error
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| expr
{ $$ = $1; }
| expr IF expr
@@ -261,14 +261,14 @@ sideff : error
}
| expr FOR expr
{ $$ = newFOROP(0, NULL, (line_t)IVAL($2),
- Nullop, $3, $1, Nullop);
+ (OP*)NULL, $3, $1, (OP*)NULL);
TOKEN_GETMAD($2,((LISTOP*)$$)->op_first->op_sibling,'w');
}
;
/* else and elsif blocks */
else : /* NULL */
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| ELSE mblock
{ ($2)->op_flags |= OPf_PARENS; $$ = scope($2);
TOKEN_GETMAD($1,$$,'o');
@@ -312,7 +312,7 @@ case : WHEN '(' remember mexpr ')' mblock
/* Continue blocks */
cont : /* NULL */
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| CONTINUE block
{ $$ = scope($2);
TOKEN_GETMAD($1,$$,'o');
@@ -325,7 +325,7 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont
PL_parser->copline = (line_t)$2;
$$ = block_end($4,
newSTATEOP(0, PVAL($1),
- innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+ innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL($2), $5, $8, $9, $7)));
TOKEN_GETMAD($1,innerop,'L');
TOKEN_GETMAD($2,innerop,'W');
@@ -338,7 +338,7 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont
PL_parser->copline = (line_t)$2;
$$ = block_end($4,
newSTATEOP(0, PVAL($1),
- innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+ innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL($2), $5, $8, $9, $7)));
TOKEN_GETMAD($1,innerop,'L');
TOKEN_GETMAD($2,innerop,'W');
@@ -370,7 +370,7 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont
{ OP *innerop;
$$ = block_end($4,
innerop = newFOROP(0, PVAL($1), (line_t)IVAL($2),
- Nullop, $5, $7, $8));
+ (OP*)NULL, $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,'(');
@@ -382,7 +382,7 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont
{ OP *forop;
PL_parser->copline = (line_t)IVAL($2);
forop = newSTATEOP(0, PVAL($1),
- newWHILEOP(0, 1, (LOOP*)Nullop,
+ newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
IVAL($2), scalar($7),
$12, $10, $9));
#ifdef MAD
@@ -410,8 +410,8 @@ loop : label WHILE '(' remember texpr ')' mintro mblock cont
$$ = 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));
+ newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+ NOLINE, (OP*)NULL, $2, $3, 0));
TOKEN_GETMAD($1,((LISTOP*)$$)->op_first,'L'); }
;
@@ -432,7 +432,7 @@ mintro : /* NULL */
/* Normal expression */
nexpr : /* NULL */
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| sideff
;
@@ -509,13 +509,13 @@ format : FORMAT startformsub formname block
token_free($1);
#else
newFORM($2, $3, $4);
- $$ = Nullop;
+ $$ = (OP*)NULL;
#endif
}
;
formname: WORD { $$ = $1; }
- | /* NULL */ { $$ = Nullop; }
+ | /* NULL */ { $$ = (OP*)NULL; }
;
/* Unimplemented "my sub foo { }" */
@@ -526,7 +526,7 @@ mysubrout: MYSUB startsub subname proto subattrlist subbody
token_getmad($1,$$,'d');
#else
newMYSUB($2, $3, $4, $5, $6);
- $$ = Nullop;
+ $$ = (OP*)NULL;
#endif
}
;
@@ -549,7 +549,7 @@ subrout : SUB startsub subname proto subattrlist subbody
}
#else
newATTRSUB($2, $3, $4, $5, $6);
- $$ = Nullop;
+ $$ = (OP*)NULL;
#endif
}
;
@@ -581,13 +581,13 @@ subname : WORD { const char *const name = SvPV_nolen_const(((SVOP*)$1)->op_sv);
/* 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 +595,7 @@ subattrlist: /* NULL */
| COLONATTR
{ $$ = IF_MAD(
newOP(OP_NULL, 0),
- Nullop
+ (OP*)NULL
);
TOKEN_GETMAD($1,$$,':');
}
@@ -609,7 +609,7 @@ myattrlist: COLONATTR THING
| COLONATTR
{ $$ = IF_MAD(
newOP(OP_NULL, 0),
- Nullop
+ (OP*)NULL
);
TOKEN_GETMAD($1,$$,':');
}
@@ -619,7 +619,7 @@ myattrlist: COLONATTR THING
subbody : block { $$ = $1; }
| ';' { $$ = IF_MAD(
newOP(OP_NULL,0),
- Nullop
+ (OP*)NULL
);
PL_parser->expect = XSTATE;
TOKEN_GETMAD($1,$$,';');
@@ -634,7 +634,7 @@ package : PACKAGE WORD ';'
token_getmad($3,$$,';');
#else
package($2);
- $$ = Nullop;
+ $$ = (OP*)NULL;
#endif
}
;
@@ -652,7 +652,7 @@ use : USE startsub
append_madprops(newMADPROP('!', MAD_PV, "", 0), $$, 0);
#else
utilize(IVAL($1), $2, $4, $5, $6);
- $$ = Nullop;
+ $$ = (OP*)NULL;
#endif
}
;
@@ -750,7 +750,7 @@ listop : LSTOP indirob argexpr /* map {...} @args or print $fh @args */
}
| LSTOPSUB startanonsub block /* sub f(&@); f { foo } ... */
{ SvREFCNT_inc_simple_void(PL_compcv);
- $<opval>$ = newANONATTRSUB($2, 0, Nullop, $3); }
+ $<opval>$ = newANONATTRSUB($2, 0, (OP*)NULL, $3); }
listexpr %prec LSTOP /* ... @bar */
{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
append_elem(OP_LIST,
@@ -856,7 +856,7 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */
TOKEN_GETMAD($6,$$,']');
}
| '(' ')' '[' expr ']' /* empty list slice! */
- { $$ = newSLICEOP(0, $4, Nullop);
+ { $$ = newSLICEOP(0, $4, (OP*)NULL);
TOKEN_GETMAD($1,$$,'(');
TOKEN_GETMAD($2,$$,')');
TOKEN_GETMAD($3,$$,'[');
@@ -986,7 +986,7 @@ anonymous: '[' expr ']'
TOKEN_GETMAD($3,$$,']');
}
| '[' ']'
- { $$ = newANONLIST(Nullop);
+ { $$ = newANONLIST((OP*)NULL);
TOKEN_GETMAD($1,$$,'[');
TOKEN_GETMAD($2,$$,']');
}
@@ -997,7 +997,7 @@ anonymous: '[' expr ']'
TOKEN_GETMAD($4,$$,'}');
}
| HASHBRACK ';' '}' %prec '(' /* { } (';' by tokener) */
- { $$ = newANONHASH(Nullop);
+ { $$ = newANONHASH((OP*)NULL);
TOKEN_GETMAD($1,$$,'{');
TOKEN_GETMAD($2,$$,';');
TOKEN_GETMAD($3,$$,'}');
@@ -1028,7 +1028,7 @@ termdo : DO term %prec UNIOP /* do $filename */
scalar(newCVREF(
(OPpENTERSUB_AMPER<<8),
scalar($2)
- )),Nullop)); dep();
+ )),(OP*)NULL)); dep();
TOKEN_GETMAD($1,$$,'o');
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($4,$$,')');
@@ -1049,7 +1049,7 @@ termdo : DO term %prec UNIOP /* do $filename */
| DO scalar '(' ')' /* do $subref () */
{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
prepend_elem(OP_LIST,
- scalar(newCVREF(0,scalar($2))), Nullop)); dep();
+ scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep();
TOKEN_GETMAD($1,$$,'o');
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($4,$$,')');
@@ -1265,13 +1265,13 @@ myterm : '(' expr ')'
/* Basic list expressions */
listexpr: /* NULL */ %prec PREC_LOW
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| argexpr %prec PREC_LOW
{ $$ = $1; }
;
listexprcom: /* NULL */
- { $$ = Nullop; }
+ { $$ = (OP*)NULL; }
| expr
{ $$ = $1; }
| expr ','
diff --git a/win32/perlhost.h b/win32/perlhost.h
index b9d4e1e4ab..76e469657f 100644
--- a/win32/perlhost.h
+++ b/win32/perlhost.h
@@ -1782,7 +1782,7 @@ restart:
if (PL_restartop) {
POPSTACK_TO(PL_mainstack);
PL_op = PL_restartop;
- PL_restartop = Nullop;
+ PL_restartop = (OP*)NULL;
goto restart;
}
PerlIO_printf(Perl_error_log, "panic: restartop\n");
@@ -1794,7 +1794,7 @@ restart:
/* XXX hack to avoid perl_destruct() freeing optree */
win32_checkTLS(my_perl);
- PL_main_root = Nullop;
+ PL_main_root = (OP*)NULL;
}
win32_checkTLS(my_perl);
View Lorry Controller Status