diff options
author | Gurusamy Sarathy <gsar@cpan.org> | 1999-11-11 06:04:20 +0000 |
---|---|---|
committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-11-11 06:04:20 +0000 |
commit | 57843af05bc7863df9b9bfb6b37e3a29d08532a9 (patch) | |
tree | afce7f3f9e5ac7d38a7578c9d040f161c686fe6b /cv.h | |
parent | 743e66e61aecff1c9998bd0ff719a1d679b03e9f (diff) | |
download | perl-57843af05bc7863df9b9bfb6b37e3a29d08532a9.tar.gz |
another change towards a shareable optree: avoid pointer to filegv
in COP; revert parts of change#4485 and s/xcv_filegv/xcv_file/
(CvFILE() may yet come in handy somewhere); adjust compiler doodads
to suit
p4raw-link: @4485 on //depot/perl: b195d4879f55e1610299cb9b1b55356940c2a577
p4raw-id: //depot/perl@4545
Diffstat (limited to 'cv.h')
-rw-r--r-- | cv.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -7,7 +7,8 @@ * */ -/* This structure much match the beginning of XPVFM */ +/* This structure much match XPVCV in B/C.pm and the beginning of XPVFM + * in sv.h */ struct xpvcv { char * xpv_pv; /* pointer to malloced string */ @@ -24,9 +25,7 @@ struct xpvcv { void (*xcv_xsub) (pTHXo_ CV*); ANY xcv_xsubany; GV * xcv_gv; -#if defined(PERL_BINCOMPAT_5005) - GV * xcv_filegv; /* XXX unused (and deprecated) */ -#endif + char * xcv_file; long xcv_depth; /* >= 2 indicates recursive call */ AV * xcv_padlist; CV * xcv_outside; @@ -45,6 +44,8 @@ struct xpvcv { #define CvXSUB(sv) ((XPVCV*)SvANY(sv))->xcv_xsub #define CvXSUBANY(sv) ((XPVCV*)SvANY(sv))->xcv_xsubany #define CvGV(sv) ((XPVCV*)SvANY(sv))->xcv_gv +#define CvFILE(sv) ((XPVCV*)SvANY(sv))->xcv_file +#define CvFILEGV(sv) (gv_fetchfile(CvFILE(sv)) #define CvDEPTH(sv) ((XPVCV*)SvANY(sv))->xcv_depth #define CvPADLIST(sv) ((XPVCV*)SvANY(sv))->xcv_padlist #define CvOUTSIDE(sv) ((XPVCV*)SvANY(sv))->xcv_outside |