mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin.c: remove the unimport function

Browse Source 
This removes the ability to  `no builtin ...`

This also removes the last place a pad entry with PADNAMEf_TOMBSTONE
could be created, so that code can now all be removed in a later commit.
This commit is contained in:
Paul "LeoNerd" Evans 2024-02-19 16:47:02 +00:00 committed by Paul Evans
parent 4fc2379a01
commit 1ebd85eebd
4 changed files with 12 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
builtin.c
View File

@ -674,7 +674,7 @@ XS(XS_builtin_import)
SV *sym = ST(i);
STRLEN symlen;
const char *sympv = SvPV(sym, symlen);
if(strEQ(sympv, "import") || strEQ(sympv, "unimport"))
if(strEQ(sympv, "import"))
Perl_croak(aTHX_ builtin_not_recognised, sym);
if(sympv[0] == ':') {
@ -701,49 +701,6 @@ XS(XS_builtin_import)
finish_export_lexical();
}
XS(XS_builtin_unimport);
XS(XS_builtin_unimport)
{
dXSARGS;
if(!PL_compcv)
Perl_croak(aTHX_
"builtin::unimport can only be called at compile time");
prepare_export_lexical();
for(int i = 1; i < items; i++) {
SV *sym = ST(i);
const char *sympv = SvPV_nolen(sym);
if(strEQ(sympv, "import") || strEQ(sympv, "unimport"))
Perl_croak(aTHX_ builtin_not_recognised, sym);
SV *ampname = sv_2mortal(Perl_newSVpvf(aTHX_ "&%" SVf, SVfARG(sym)));
SV *fqname = sv_2mortal(Perl_newSVpvf(aTHX_ "builtin::%" SVf, SVfARG(sym)));
CV *cv = get_cv(SvPV_nolen(fqname), SvUTF8(fqname) ? SVf_UTF8 : 0);
if(!cv)
Perl_croak(aTHX_ builtin_not_recognised, sym);
PADOFFSET off = pad_findmy_sv(ampname, 0);
if((off == NOT_IN_PAD) ||
(PL_curpad[off] != (SV *)cv))
Perl_croak(aTHX_
"'%" SVf "' does not appear to be an imported builtin function", SVfARG(ampname));
/* Add a tombstone entry */
/* TODO: If the pad entry we found is going to go out of scope at the
* same time as this tombstone would, we could not bother adding the
* tombstone and instead COP_SEQ_MAX_HIGH_set() on the padname to
* clear it.
*/
pad_add_name_sv(ampname, padadd_STATE|padadd_TOMBSTONE, 0, 0);
}
COP_SEQMAX_INC;
finish_export_lexical();
}
void
Perl_boot_core_builtin(pTHX)
{
@ -779,8 +736,7 @@ Perl_boot_core_builtin(pTHX)
}
}
newXS_flags("builtin::import", &XS_builtin_import, __FILE__, NULL, 0);
newXS_flags("builtin::unimport", &XS_builtin_unimport, __FILE__, NULL, 0);
newXS_flags("builtin::import", &XS_builtin_import, __FILE__, NULL, 0);
}
/*

18
lib/builtin.pm
View File

@ -1,9 +1,9 @@
package builtin 0.013;
package builtin 0.014;
use strict;
use warnings;
# All code, including &import and &unimport, is implemented by always-present
# All code, including &import, is implemented by always-present
# functions in the perl interpreter itself.
# See also `builtin.c` in perl source
@ -81,13 +81,15 @@ don't accidentally appear as object methods from a class.
# Can't locate object method "true" via package "An::Object::Class"
# at ...
Imported symbols can also be removed again by using the C<no> keyword:
Once imported, a lexical function is much like any other lexical symbol
(such as a variable) in that it cannot be removed again. If you wish to
limit the visiblity of an imported C<builtin> function, put it inside its
own scope:
use builtin 'true';
my $yes = true;
no builtin 'true';
# true() is no longer aliased from builtin
{
use builtin 'refaddr';
...
}
=head2 Version Bundles

22
lib/builtin.t
View File

@ -292,28 +292,6 @@ package FetchStoreCounter {
ok($recursecoderef->("rec"), 'true in self-recursive anon sub');
}
# imported builtins can be unexported
{
package UnimportTest;
no warnings 'shadow';
sub true() { return "true" };
{
use builtin 'true';
no builtin 'true';
::is(true(), "true", 'no builtin can remove lexical import');
}
{
use builtin 'true';
{ no builtin 'true'; }
::is(true(), 1, 'no builtin is lexically scoped');
}
}
{
use builtin qw( true false );

7
pod/perldiag.pod
View File

@ -657,13 +657,6 @@ is currently being compiled. Since this method is used to introduce new
lexical subroutines into the scope currently being compiled, this is not
going to have any effect.
=item builtin::unimport can only be called at compile time
(F) The C<unimport> method of the C<builtin> package was invoked when no code
is currently being compiled. Since this method is used to remove
previously-introduced lexical subroutines from the scope currently being
compiled, this is not going to have any effect.
=item Builtin version bundle "%s" is not supported by Perl
(F) You attempted to C<use builtin :ver> for a version number that is either