Change 11089 by jhi@alpha on 2001/07/02 13:25:40
Subject: Re: [PATH] shared -> unique;
From: Abhijit Menon-Sen <[EMAIL PROTECTED]>
Date: Wed, 27 Jun 2001 03:51:27 +0530
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/dump.c#86 edit
... //depot/perl/gv.c#148 edit
... //depot/perl/gv.h#21 edit
... //depot/perl/op.c#403 edit
... //depot/perl/pp_sys.c#245 edit
... //depot/perl/sv.c#433 edit
... //depot/perl/toke.c#367 edit
... //depot/perl/xsutils.c#15 edit
Differences ...
==== //depot/perl/dump.c#86 (text) ====
Index: perl/dump.c
--- perl/dump.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/dump.c Mon Jul 2 07:30:07 2001
@@ -960,7 +960,7 @@
case SVt_PVGV:
if (GvINTRO(sv)) sv_catpv(d, "INTRO,");
if (GvMULTI(sv)) sv_catpv(d, "MULTI,");
- if (GvSHARED(sv)) sv_catpv(d, "SHARED,");
+ if (GvUNIQUE(sv)) sv_catpv(d, "UNIQUE,");
if (GvASSUMECV(sv)) sv_catpv(d, "ASSUMECV,");
if (GvIN_PAD(sv)) sv_catpv(d, "IN_PAD,");
if (flags & SVpad_OUR) sv_catpv(d, "OUR,");
==== //depot/perl/gv.c#148 (text) ====
Index: perl/gv.c
--- perl/gv.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/gv.c Mon Jul 2 07:30:07 2001
@@ -46,9 +46,9 @@
if (!gv || SvTYPE((SV*)gv) != SVt_PVGV)
Perl_croak(aTHX_ "Bad symbol for filehandle");
if (!GvIOp(gv)) {
-#ifdef GV_SHARED_CHECK
- if (GvSHARED(gv)) {
- Perl_croak(aTHX_ "Bad symbol for filehandle (GV is shared)");
+#ifdef GV_UNIQUE_CHECK
+ if (GvUNIQUE(gv)) {
+ Perl_croak(aTHX_ "Bad symbol for filehandle (GV is unique)");
}
#endif
GvIOp(gv) = newIO();
==== //depot/perl/gv.h#21 (text) ====
Index: perl/gv.h
--- perl/gv.h.~1~ Mon Jul 2 07:30:07 2001
+++ perl/gv.h Mon Jul 2 07:30:07 2001
@@ -133,15 +133,15 @@
/* XXX: all GvFLAGS options are used, borrowing GvGPFLAGS for the moment */
-#define GVf_SHARED 0x0001
-#define GvSHARED(gv) (GvGP(gv) && (GvGPFLAGS(gv) & GVf_SHARED))
-#define GvSHARED_on(gv) (GvGPFLAGS(gv) |= GVf_SHARED)
-#define GvSHARED_off(gv) (GvGPFLAGS(gv) &= ~GVf_SHARED)
+#define GVf_UNIQUE 0x0001
+#define GvUNIQUE(gv) (GvGP(gv) && (GvGPFLAGS(gv) & GVf_UNIQUE))
+#define GvUNIQUE_on(gv) (GvGPFLAGS(gv) |= GVf_UNIQUE)
+#define GvUNIQUE_off(gv) (GvGPFLAGS(gv) &= ~GVf_UNIQUE)
#ifdef USE_ITHREADS
-#define GV_SHARED_CHECK
+#define GV_UNIQUE_CHECK
#else
-#undef GV_SHARED_CHECK
+#undef GV_UNIQUE_CHECK
#endif
#define Nullgv Null(GV*)
==== //depot/perl/op.c#403 (text) ====
Index: perl/op.c
--- perl/op.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/op.c Mon Jul 2 07:30:07 2001
@@ -4598,9 +4598,9 @@
cv = (!name || GvCVGEN(gv)) ? Nullcv : GvCV(gv);
-#ifdef GV_SHARED_CHECK
- if (cv && GvSHARED(gv) && SvREADONLY(cv)) {
- Perl_croak(aTHX_ "Can't define subroutine %s (GV is shared)", name);
+#ifdef GV_UNIQUE_CHECK
+ if (cv && GvUNIQUE(gv) && SvREADONLY(cv)) {
+ Perl_croak(aTHX_ "Can't define subroutine %s (GV is unique)", name);
}
#endif
@@ -4612,9 +4612,9 @@
if (cv) {
bool exists = CvROOT(cv) || CvXSUB(cv);
-#ifdef GV_SHARED_CHECK
- if (exists && GvSHARED(gv)) {
- Perl_croak(aTHX_ "Can't redefine shared subroutine %s", name);
+#ifdef GV_UNIQUE_CHECK
+ if (exists && GvUNIQUE(gv)) {
+ Perl_croak(aTHX_ "Can't redefine unique subroutine %s", name);
}
#endif
@@ -5102,9 +5102,9 @@
else
name = "STDOUT";
gv = gv_fetchpv(name,TRUE, SVt_PVFM);
-#ifdef GV_SHARED_CHECK
- if (GvSHARED(gv)) {
- Perl_croak(aTHX_ "Bad symbol for form (GV is shared)");
+#ifdef GV_UNIQUE_CHECK
+ if (GvUNIQUE(gv)) {
+ Perl_croak(aTHX_ "Bad symbol for form (GV is unique)");
}
#endif
GvMULTI_on(gv);
==== //depot/perl/pp_sys.c#245 (text) ====
Index: perl/pp_sys.c
--- perl/pp_sys.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/pp_sys.c Mon Jul 2 07:30:07 2001
@@ -758,9 +758,9 @@
methname = "TIEARRAY";
break;
case SVt_PVGV:
-#ifdef GV_SHARED_CHECK
- if (GvSHARED((GV*)varsv)) {
- Perl_croak(aTHX_ "Attempt to tie shared GV");
+#ifdef GV_UNIQUE_CHECK
+ if (GvUNIQUE((GV*)varsv)) {
+ Perl_croak(aTHX_ "Attempt to tie unique GV");
}
#endif
methname = "TIEHANDLE";
==== //depot/perl/sv.c#433 (text) ====
Index: perl/sv.c
--- perl/sv.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/sv.c Mon Jul 2 07:30:07 2001
@@ -3613,8 +3613,8 @@
Perl_croak(aTHX_ "Can't redefine active sort subroutine %s",
GvNAME(dstr));
-#ifdef GV_SHARED_CHECK
- if (GvSHARED((GV*)dstr)) {
+#ifdef GV_UNIQUE_CHECK
+ if (GvUNIQUE((GV*)dstr)) {
Perl_croak(aTHX_ PL_no_modify);
}
#endif
@@ -3659,8 +3659,8 @@
SV *dref = 0;
int intro = GvINTRO(dstr);
-#ifdef GV_SHARED_CHECK
- if (GvSHARED((GV*)dstr)) {
+#ifdef GV_UNIQUE_CHECK
+ if (GvUNIQUE((GV*)dstr)) {
Perl_croak(aTHX_ PL_no_modify);
}
#endif
@@ -8636,7 +8636,7 @@
SV *sv = &PL_sv_no; /* just need SvREADONLY-ness */
if (GvIO(gv) || GvFORM(gv)) {
- GvSHARED_off(gv); /* GvIOs cannot be shared. nor can GvFORMs */
+ GvUNIQUE_off(gv); /* GvIOs cannot be shared. nor can GvFORMs */
}
else if (!GvCV(gv)) {
GvCV(gv) = (CV*)sv;
@@ -8644,11 +8644,11 @@
else {
/* CvPADLISTs cannot be shared */
if (!CvXSUB(GvCV(gv))) {
- GvSHARED_off(gv);
+ GvUNIQUE_off(gv);
}
}
- if (!GvSHARED(gv)) {
+ if (!GvUNIQUE(gv)) {
#if 0
PerlIO_printf(Perl_debug_log, "gv_share: unable to share %s::%s\n",
HvNAME(GvSTASH(gv)), GvNAME(gv));
@@ -8832,7 +8832,7 @@
LvTYPE(dstr) = LvTYPE(sstr);
break;
case SVt_PVGV:
- if (GvSHARED((GV*)sstr)) {
+ if (GvUNIQUE((GV*)sstr)) {
SV *share;
if ((share = gv_share(sstr))) {
del_SV(dstr);
==== //depot/perl/toke.c#367 (text) ====
Index: perl/toke.c
--- perl/toke.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/toke.c Mon Jul 2 07:30:07 2001
@@ -3092,7 +3092,7 @@
CvMETHOD_on(PL_compcv);
#ifdef USE_ITHREADS
else if (PL_in_my == KEY_our && len == 6 && strnEQ(s, "unique", len))
- GvSHARED_on(cGVOPx_gv(yylval.opval));
+ GvUNIQUE_on(cGVOPx_gv(yylval.opval));
#endif
/* After we've set the flags, it could be argued that
we don't need to do the attributes.pm-based setting
==== //depot/perl/xsutils.c#15 (text) ====
Index: perl/xsutils.c
--- perl/xsutils.c.~1~ Mon Jul 2 07:30:07 2001
+++ perl/xsutils.c Mon Jul 2 07:30:07 2001
@@ -87,9 +87,9 @@
case 's':
if (strEQ(name, "unique")) {
if (negated)
- GvSHARED_off(CvGV((CV*)sv));
+ GvUNIQUE_off(CvGV((CV*)sv));
else
- GvSHARED_on(CvGV((CV*)sv));
+ GvUNIQUE_on(CvGV((CV*)sv));
continue;
}
break;
@@ -103,7 +103,7 @@
switch (*name) {
case 's':
if (strEQ(name, "unique")) {
- /* toke.c has already marked as GvSHARED */
+ /* toke.c has already marked as GVf_UNIQUE */
continue;
}
}
@@ -189,7 +189,7 @@
#endif
if (cvflags & CVf_METHOD)
XPUSHs(sv_2mortal(newSVpvn("method", 6)));
- if (GvSHARED(CvGV((CV*)sv)))
+ if (GvUNIQUE(CvGV((CV*)sv)))
XPUSHs(sv_2mortal(newSVpvn("unique", 6)));
break;
default:
End of Patch.
