X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=toke.c;h=13582da4b055dd6c6063b07d75e66b983e5afbe0;hb=b21a80ce2a669073adfd175b505267b94bc65e88;hp=df89130abe7f1c3cacaa96b04d979e12d47e866b;hpb=cdd8118e49c05b43bd2785d9a269d538a4e8fe8c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/toke.c b/toke.c index df89130..13582da 100644 --- a/toke.c +++ b/toke.c @@ -820,7 +820,7 @@ S_skipspace(pTHX_ register char *s) PerlIO_clearerr(PL_rsfp); else (void)PerlIO_close(PL_rsfp); - PL_rsfp = Nullfp; + PL_rsfp = NULL; return s; } @@ -1083,7 +1083,7 @@ STATIC char * S_force_version(pTHX_ char *s, int guessing) { dVAR; - OP *version = Nullop; + OP *version = NULL; char *d; s = skipspace(s); @@ -1206,7 +1206,7 @@ S_sublex_start(pTHX) if (op_type == OP_NULL) { yylval.opval = PL_lex_op; - PL_lex_op = Nullop; + PL_lex_op = NULL; return THING; } if (op_type == OP_CONST || op_type == OP_READLINE) { @@ -1215,7 +1215,7 @@ S_sublex_start(pTHX) if (SvTYPE(sv) == SVt_PVIV) { /* Overloaded constants, nothing fancy: Convert to SVt_PV: */ STRLEN len; - const char *p = SvPV_const(sv, len); + const char * const p = SvPV_const(sv, len); SV * const nsv = newSVpvn(p, len); if (SvUTF8(sv)) SvUTF8_on(nsv); @@ -1238,7 +1238,7 @@ S_sublex_start(pTHX) PL_expect = XTERM; if (PL_lex_op) { yylval.opval = PL_lex_op; - PL_lex_op = Nullop; + PL_lex_op = NULL; return PMFUNC; } else @@ -1302,7 +1302,7 @@ S_sublex_push(pTHX) if (PL_lex_inwhat == OP_MATCH || PL_lex_inwhat == OP_QR || PL_lex_inwhat == OP_SUBST) PL_lex_inpat = PL_sublex_info.sub_op; else - PL_lex_inpat = Nullop; + PL_lex_inpat = NULL; return '('; } @@ -1893,15 +1893,15 @@ S_scan_const(pTHX_ char *start) and then encode the next character */ if ((has_utf8 || this_utf8) && !NATIVE_IS_INVARIANT((U8)(*s))) { STRLEN len = 1; - const UV uv = (this_utf8) ? utf8n_to_uvchr((U8*)s, send - s, &len, 0) : (UV) ((U8) *s); - const STRLEN need = UNISKIP(NATIVE_TO_UNI(uv)); + const UV nextuv = (this_utf8) ? utf8n_to_uvchr((U8*)s, send - s, &len, 0) : (UV) ((U8) *s); + const STRLEN need = UNISKIP(NATIVE_TO_UNI(nextuv)); s += len; if (need > len) { /* encoded value larger than old, need extra space (NOTE: SvCUR() not set here) */ const STRLEN off = d - SvPVX_const(sv); d = SvGROW(sv, SvLEN(sv) + (need-len)) + off; } - d = (char*)uvchr_to_utf8((U8*)d, uv); + d = (char*)uvchr_to_utf8((U8*)d, nextuv); has_utf8 = TRUE; } else { @@ -2399,7 +2399,7 @@ S_tokenize_use(pTHX_ int is_use, char *s) { if (isDIGIT(*s) || (*s == 'v' && isDIGIT(s[1]))) { s = force_version(s, TRUE); if (*s == ';' || (s = skipspace(s), *s == ';')) { - PL_nextval[PL_nexttoke].opval = Nullop; + PL_nextval[PL_nexttoke].opval = NULL; force_next(WORD); } else if (*s == 'v') { @@ -2781,7 +2781,7 @@ Perl_yylex(pTHX) PerlIO_clearerr(PL_rsfp); else (void)PerlIO_close(PL_rsfp); - PL_rsfp = Nullfp; + PL_rsfp = NULL; PL_doextract = FALSE; } if (!PL_in_eval && (PL_minus_n || PL_minus_p)) { @@ -3008,12 +3008,7 @@ Perl_yylex(pTHX) Perl_croak(aTHX_ "Too late for \"-%.*s\" option", (int)(d - m), m); } - /* Given that these switches are within the script, - then it is not unsafe to allow them even within - a suidperl fd script. Hence pass in the - suidscript flag as -1, irrespective of what we - really are. */ - d = moreswitches(d, -1); + d = moreswitches(d); } while (d); if (PL_doswitches && !switches_done) { int argc = PL_origargc; @@ -3277,7 +3272,7 @@ Perl_yylex(pTHX) PL_expect = XTERMBLOCK; grabattrs: s = skipspace(s); - attrs = Nullop; + attrs = NULL; while (isIDFIRST_lazy_if(s,UTF)) { I32 tmp; d = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len); @@ -3324,7 +3319,7 @@ Perl_yylex(pTHX) #ifdef USE_ITHREADS GvUNIQUE_on(cGVOPx_gv(yylval.opval)); #else - ; /* skip to avoid loading attributes.pm */ + /*EMPTY*/; /* skip to avoid loading attributes.pm */ #endif else Perl_croak(aTHX_ "The 'unique' attribute may only be applied to 'our' variables"); @@ -3851,9 +3846,9 @@ Perl_yylex(pTHX) char tmpbuf[sizeof PL_tokenbuf]; for (t++; isSPACE(*t); t++) ; if (isIDFIRST_lazy_if(t,UTF)) { - STRLEN len; + STRLEN dummylen; t = scan_word(t, tmpbuf, sizeof tmpbuf, TRUE, - &len); + &dummylen); for (; isSPACE(*t); t++) ; if (*t == ';' && get_cv(tmpbuf, FALSE)) Perl_warner(aTHX_ packWARN(WARN_SYNTAX), @@ -4448,7 +4443,7 @@ Perl_yylex(pTHX) if ((sv = gv_const_sv(gv))) { its_constant: SvREFCNT_dec(((SVOP*)yylval.opval)->op_sv); - ((SVOP*)yylval.opval)->op_sv = SvREFCNT_inc(sv); + ((SVOP*)yylval.opval)->op_sv = SvREFCNT_inc_simple(sv); yylval.opval->op_private = 0; TOKEN(WORD); } @@ -4469,9 +4464,9 @@ Perl_yylex(pTHX) PL_last_lop_op = OP_ENTERSUB; /* Is there a prototype? */ if (SvPOK(cv)) { - STRLEN len; - const char *proto = SvPV_const((SV*)cv, len); - if (!len) + STRLEN protolen; + const char *proto = SvPV_const((SV*)cv, protolen); + if (!protolen) TERM(FUNC0SUB); if (*proto == '$' && proto[1] == '\0') OPERATOR(UNIOPSUB); @@ -4615,7 +4610,7 @@ Perl_yylex(pTHX) } } #endif - PL_rsfp = Nullfp; + PL_rsfp = NULL; } goto fake_eof; } @@ -5109,10 +5104,10 @@ Perl_yylex(pTHX) /* [perl #16184] */ && !(t[0] == '=' && t[1] == '>') ) { - int len = (int)(d-s); + int parms_len = (int)(d-s); Perl_warner(aTHX_ packWARN(WARN_PRECEDENCE), "Precedence problem: open %.*s should be open(%.*s)", - len, s, len, s); + parms_len, s, parms_len, s); } } LOP(OP_OPEN,XTERM); @@ -5177,7 +5172,7 @@ Perl_yylex(pTHX) PL_expect = XOPERATOR; force_next(')'); if (SvCUR(PL_lex_stuff)) { - OP *words = Nullop; + OP *words = NULL; int warned = 0; d = SvPV_force(PL_lex_stuff, len); while (len) { @@ -5756,7 +5751,7 @@ S_pending_ident(pTHX) tmp = pad_findmy(PL_tokenbuf); if (tmp != NOT_IN_PAD) { /* might be an "our" variable" */ - if (PAD_COMPNAME_FLAGS(tmp) & SVpad_OUR) { + if (PAD_COMPNAME_FLAGS_isOUR(tmp)) { /* build ops for a bareword */ HV * const stash = PAD_COMPNAME_OURSTASH(tmp); HEK * const stashname = HvNAME_HEK(stash); @@ -9334,11 +9329,11 @@ S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, SV *sv, SV *pv, sv_catpvs(ERRSV, "Propagated"); yyerror(SvPV_nolen_const(ERRSV)); /* Duplicates the message inside eval */ (void)POPs; - res = SvREFCNT_inc(sv); + res = SvREFCNT_inc_simple(sv); } else { res = POPs; - (void)SvREFCNT_inc(res); + SvREFCNT_inc_simple_void(res); } PUTBACK ; @@ -9557,6 +9552,7 @@ S_scan_ident(pTHX_ register char *s, register const char *send, char *dest, STRL void Perl_pmflag(pTHX_ U32* pmfl, int ch) { + PERL_UNUSED_CONTEXT; if (ch == 'i') *pmfl |= PMf_FOLD; else if (ch == 'g') @@ -10042,7 +10038,7 @@ S_scan_inputsymbol(pTHX_ char *start) add symbol table ops */ if ((tmp = pad_findmy(d)) != NOT_IN_PAD) { - if (PAD_COMPNAME_FLAGS(tmp) & SVpad_OUR) { + if (PAD_COMPNAME_FLAGS_isOUR(tmp)) { HV * const stash = PAD_COMPNAME_OURSTASH(tmp); HEK * const stashname = HvNAME_HEK(stash); SV * const sym = sv_2mortal(newSVhek(stashname)); @@ -10378,13 +10374,13 @@ S_scan_str(pTHX_ char *start, int keep_quoted, int keep_delims) /* update debugger info */ if (PERLDB_LINE && PL_curstash != PL_debstash) { - SV * const sv = newSV(0); + SV * const line_sv = newSV(0); - sv_upgrade(sv, SVt_PVMG); - sv_setsv(sv,PL_linestr); - (void)SvIOK_on(sv); - SvIV_set(sv, 0); - av_store(CopFILEAVx(PL_curcop), (I32)CopLINE(PL_curcop), sv); + sv_upgrade(line_sv, SVt_PVMG); + sv_setsv(line_sv,PL_linestr); + (void)SvIOK_on(line_sv); + SvIV_set(line_sv, 0); + av_store(CopFILEAVx(PL_curcop), (I32)CopLINE(PL_curcop), line_sv); } /* having changed the buffer, we must update PL_bufend */ @@ -10820,7 +10816,7 @@ vstring: if (sv) lvalp->opval = newSVOP(OP_CONST, 0, sv); else - lvalp->opval = Nullop; + lvalp->opval = NULL; return (char *)s; } @@ -10927,6 +10923,10 @@ S_set_csh(pTHX) dVAR; if (!PL_cshlen) PL_cshlen = strlen(PL_cshname); +#else +#if defined(USE_ITHREADS) + PERL_UNUSED_CONTEXT; +#endif #endif } @@ -10950,7 +10950,7 @@ Perl_start_subparse(pTHX_ I32 is_format, U32 flags) PL_subline = CopLINE(PL_curcop); CvPADLIST(PL_compcv) = pad_new(padnew_SAVE|padnew_SAVESUB); - CvOUTSIDE(PL_compcv) = (CV*)SvREFCNT_inc(outsidecv); + CvOUTSIDE(PL_compcv) = (CV*)SvREFCNT_inc_simple(outsidecv); CvOUTSIDE_SEQ(PL_compcv) = PL_cop_seqmax; return oldsavestack_ix;