yylval.ival = f;
PL_expect = XTERM;
PL_bufptr = s;
- last_uni = oldbufptr;
- last_lop_op = f;
+ PL_last_uni = PL_oldbufptr;
+ PL_last_lop_op = f;
if (*s == '(')
return FUNC1;
s = skipspace(s);
PL_nextval[PL_nexttoke].ival = 0;
force_next(',');
#ifdef USE_THREADS
- nextval[nexttoke].opval = newOP(OP_THREADSV, 0);
- nextval[nexttoke].opval->op_targ = find_threadsv("\"");
+ PL_nextval[PL_nexttoke].opval = newOP(OP_THREADSV, 0);
+ PL_nextval[PL_nexttoke].opval->op_targ = find_threadsv("\"");
force_next(PRIVATEREF);
#else
force_ident("\"", '$');
*/
SV *x = GvSV(gv_fetchpv("\030", TRUE, SVt_PV));
assert(SvPOK(x) || SvGMAGICAL(x));
- if (sv_eq(x, GvSV(curcop->cop_filegv))) {
+ if (sv_eq(x, GvSV(PL_curcop->cop_filegv))) {
sv_setpvn(x, ipath, ipathend - ipath);
SvSETMAGIC(x);
}
gv = Nullgv;
gvp = 0;
if (PL_dowarn && hgv)
- warn("Ambiguous call resolved as CORE::%s(), "
- "qualify as such or use &", GvENAME(hgv));
+ warn("Ambiguous call resolved as CORE::%s(), %s",
+ GvENAME(hgv), "qualify as such or use &");
}
}
case KEY_crypt:
#ifdef FCRYPT
- if (!cryptseen++)
+ if (!PL_cryptseen++)
init_des();
#endif
LOP(OP_CRYPT,XTERM);
PUSHSTACKi(PERLSI_OVERLOAD);
ENTER;
SAVEOP();
- op = (OP *) &myop;
+ PL_op = (OP *) &myop;
if (PERLDB_SUB && PL_curstash != PL_debstash)
- op->op_private |= OPpENTERSUB_DB;
+ PL_op->op_private |= OPpENTERSUB_DB;
PUTBACK;
pp_pushmark(ARGS);
PUSHs(cv);
PUTBACK;
- if (op = pp_entersub(ARGS))
+ if (PL_op = pp_entersub(ARGS))
CALLRUNOPS();
LEAVE;
SPAGAIN;
PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
#ifdef TMP_CRLF_PATCH
if (PL_bufend - PL_linestart >= 2) {
- if (PL_bufend[-2] == '\r' || PL_bufend[-2] == '\n') {
+ if ((PL_bufend[-2] == '\r' && PL_bufend[-1] == '\n') ||
+ (PL_bufend[-2] == '\n' && PL_bufend[-1] == '\r'))
+ {
PL_bufend[-2] = '\n';
PL_bufend--;
SvCUR_set(PL_linestr, PL_bufend - SvPVX(PL_linestr));
#ifdef TMP_CRLF_PATCH
if (to - SvPVX(sv) >= 2) {
- if (to[-2] == '\r' || to[-2] == '\n') {
+ if ((to[-2] == '\r' && to[-1] == '\n') ||
+ (to[-2] == '\n' && to[-1] == '\r'))
+ {
to[-2] = '\n';
to--;
SvCUR_set(sv, to - SvPVX(sv));
PL_padix = 0;
PL_subline = PL_curcop->cop_line;
#ifdef USE_THREADS
- av_store(comppad_name, 0, newSVpv("@_", 2));
- curpad[0] = (SV*)newAV();
- SvPADMY_on(curpad[0]); /* XXX Needed? */
+ av_store(PL_comppad_name, 0, newSVpv("@_", 2));
+ PL_curpad[0] = (SV*)newAV();
+ SvPADMY_on(PL_curpad[0]); /* XXX Needed? */
#endif /* USE_THREADS */
comppadlist = newAV();
CvPADLIST(PL_compcv) = comppadlist;
CvOUTSIDE(PL_compcv) = (CV*)SvREFCNT_inc(outsidecv);
#ifdef USE_THREADS
- CvOWNER(compcv) = 0;
- New(666, CvMUTEXP(compcv), 1, perl_mutex);
- MUTEX_INIT(CvMUTEXP(compcv));
+ CvOWNER(PL_compcv) = 0;
+ New(666, CvMUTEXP(PL_compcv), 1, perl_mutex);
+ MUTEX_INIT(CvMUTEXP(PL_compcv));
#endif /* USE_THREADS */
return oldsavestack_ix;