2
===================================================================
3
--- a/epeval.c (revision 960449)
4
+++ b/epeval.c (revision 960450)
8
if (r -> Component.bStrict)
10
+ if ((flags & G_ARRAY) != G_SCALAR)
11
pSVCmd = newSVpvf(sFormatStrictArray, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
13
pSVCmd = newSVpvf(sFormatStrict, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
15
- if (flags & G_ARRAY)
16
+ if ((flags & G_ARRAY) != G_SCALAR)
17
pSVCmd = newSVpvf(sFormatArray, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
19
pSVCmd = newSVpvf(sFormat, r -> Component.sEvalPackage, sName, r -> Component.nSourceline, r -> Component.sSourcefile, sArg, sRef, sName) ;
22
SvREFCNT_dec (*ppSV) ;
24
- if (rc == ok && pSub != NULL && SvTYPE (pSub) == SVt_RV)
25
+ if (rc == ok && pSub != NULL && SvROK (pSub))
27
/*sv_setsv (*ppSV, pSub) ;*/
30
===================================================================
31
--- a/epcache.c (revision 960449)
32
+++ b/epcache.c (revision 960450)
35
/* lprintf (r -> pApp, "XXXXX Cache_New [%d/%d] pProviders=%x %s pCacheItems=%x %s pCachesToRelease=%x %s\n", _getpid(), GetCurrentThreadId(), pProviders, IsBadReadPtr (pProviders,4 )?"bad":"ok", pCacheItems, IsBadReadPtr (pCacheItems, 4)?"bad":"ok", pCachesToRelease, IsBadReadPtr (pCachesToRelease, 4)?"bad":"ok") ; */
37
- if (SvTYPE(pParam) == SVt_RV)
39
pParam = SvRV (pParam) ;
41
if (SvTYPE(pParam) == SVt_PV)
46
- if (SvTYPE(pParam) == SVt_RV)
48
pParam = SvRV (pParam) ;
50
if (SvTYPE(pParam) == SVt_PV)
52
===================================================================
53
--- a/epcmd2.c (revision 960449)
54
+++ b/epcmd2.c (revision 960450)
57
tDomTree * pDomTree = DomTree_self(xDomTree) ;
59
- if (SvTYPE(sText) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(sText))) == SVt_PVAV)
60
+ if (SvROK(sText) && SvTYPE((pAV = (AV *)SvRV(sText))) == SVt_PVAV)
61
{ /* Array reference inside URL */
68
- else if (SvTYPE(sText) == SVt_RV && SvTYPE((pHV = (HV *)SvRV(sText))) == SVt_PVHV)
69
+ else if (SvROK(sText) && SvTYPE((pHV = (HV *)SvRV(sText))) == SVt_PVHV)
70
{ /* Hash reference inside URL */
74
===================================================================
75
--- a/epcomp.c (revision 960449)
76
+++ b/epcomp.c (revision 960450)
79
ppSV = hv_fetch(pHash, "perlcode", 8, 0) ;
80
if (ppSV != NULL && *ppSV != NULL &&
81
- SvTYPE(*ppSV) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
82
+ SvROK(*ppSV) && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
83
{ /* Array reference */
84
int f = AvFILL(pAV) + 1 ;
88
ppSV = hv_fetch(pHash, "compiletimeperlcode", 19, 0) ;
89
if (ppSV != NULL && *ppSV != NULL &&
90
- SvTYPE(*ppSV) == SVt_RV && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
91
+ SvROK(*ppSV) && SvTYPE((pAV = (AV *)SvRV(*ppSV))) == SVt_PVAV)
92
{ /* Array reference */
93
int f = AvFILL(pAV) + 1 ;
99
- if (*ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
100
+ if (*ppSV == NULL || !SvROK (*ppSV))
103
SvREFCNT_dec (*ppSV) ;
107
ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)sStackName, strlen (sStackName), 0) ;
108
- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
109
+ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
112
pSV = av_pop ((AV *)SvRV (*ppSV)) ;
116
ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)sStackName, strlen (sStackName), 0) ;
117
- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
118
+ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
120
strcpy (r -> errdat1, "CompileMatchStack") ;
121
strncat (r -> errdat1, (char *)sStackName, sizeof (r -> errdat1) - 20) ;
125
ppSV = hv_fetch((HV *)(pDomTree -> pSV), (char *)p, e - p, 0) ;
126
- if (ppSV == NULL || *ppSV == NULL || SvTYPE (*ppSV) != SVt_RV)
127
+ if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
128
return op == '!'?1:0 ;
130
pAV = (AV *)SvRV (*ppSV) ;
132
===================================================================
133
--- a/epcmd.c (revision 960449)
134
+++ b/epcmd.c (revision 960450)
137
return rcMissingArgs ;
139
- if (SvTYPE (pRV) != SVt_RV)
143
return rcNotAnArray ;