use warnings;
use strict;
-use vars qw( $STORAGE_VAR );
-use Package::Stash;
+our $VERSION = '0.26';
+$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
-our $VERSION = '0.22';
+our $STORAGE_VAR = '__NAMESPACE_CLEAN_STORAGE';
-$STORAGE_VAR = '__NAMESPACE_CLEAN_STORAGE';
+use B::Hooks::EndOfScope 'on_scope_end';
-# FIXME - all of this buggery will migrate to B::H::EOS soon
+# FIXME This is a crock of shit, needs to go away
+# currently here to work around https://rt.cpan.org/Ticket/Display.html?id=74151
+# kill with fire when PS::XS is *finally* fixed
BEGIN {
- # when changing also change in Makefile.PL
- my $b_h_eos_req = '0.07';
-
- if (! $ENV{NAMESPACE_CLEAN_USE_PP} and eval {
- require B::Hooks::EndOfScope;
- B::Hooks::EndOfScope->VERSION($b_h_eos_req);
- 1
- } ) {
- B::Hooks::EndOfScope->import('on_scope_end');
- }
- elsif ($] < 5.009_003_1) {
- require namespace::clean::_PP_OSE_5_8;
- *on_scope_end = \&namespace::clean::_PP_OSE_5_8::on_scope_end;
+ my $provider;
+
+ if ( "$]" < 5.008007 ) {
+ require Package::Stash::PP;
+ $provider = 'Package::Stash::PP';
}
else {
- require namespace::clean::_PP_OSE;
- *on_scope_end = \&namespace::clean::_PP_OSE::on_scope_end;
+ require Package::Stash;
+ $provider = 'Package::Stash';
}
+ eval <<"EOS" or die $@;
+
+sub stash_for (\$) {
+ $provider->new(\$_[0]);
+}
+
+1;
+
+EOS
+}
+
+use namespace::clean::_Util qw( DEBUGGER_NEEDS_CV_RENAME DEBUGGER_NEEDS_CV_PIVOT );
+
+# Built-in debugger CV-retrieval fixups necessary before perl 5.15.5:
+# since we are deleting the glob where the subroutine was originally
+# defined, the assumptions below no longer hold.
+#
+# In 5.8.9 ~ 5.13.5 (inclusive) the debugger assumes that a CV can
+# always be found under sub_fullname($sub)
+# Workaround: use sub naming to properly name the sub hidden in the package's
+# deleted-stash
+#
+# In the rest of the range ( ... ~ 5.8.8 and 5.13.6 ~ 5.15.4 ) the debugger
+# assumes the name of the glob passed to entersub can be used to find the CV
+# Workaround: realias the original glob to the deleted-stash slot
+#
+# Can not tie constants to the current value of $^P directly,
+# as the debugger can be enabled during runtime (kinda dubious)
+#
+
+my $RemoveSubs = sub {
+ my $cleanee = shift;
+ my $store = shift;
+ my $cleanee_stash = stash_for($cleanee);
+ my $deleted_stash;
+
+ SYMBOL:
+ for my $f (@_) {
+
+ # ignore already removed symbols
+ next SYMBOL if $store->{exclude}{ $f };
+
+ my $sub = $cleanee_stash->get_symbol("&$f")
+ or next SYMBOL;
+
+ my $need_debugger_fixup =
+ ( DEBUGGER_NEEDS_CV_RENAME or DEBUGGER_NEEDS_CV_PIVOT )
+ &&
+ $^P
+ &&
+ ref(my $globref = \$cleanee_stash->namespace->{$f}) eq 'GLOB'
+ &&
+ ( $deleted_stash ||= stash_for("namespace::clean::deleted::$cleanee") )
+ ;
+
+ # convince the Perl debugger to work
+ # see the comment on top
+ if ( DEBUGGER_NEEDS_CV_RENAME and $need_debugger_fixup ) {
+ #
+ # Note - both get_subname and set_subname are only compiled when CV_RENAME
+ # is true ( the 5.8.9 ~ 5.12 range ). On other perls this entire block is
+ # constant folded away, and so are the definitions in ::_Util
+ #
+ # Do not be surprised that they are missing without DEBUGGER_NEEDS_CV_RENAME
+ #
+ namespace::clean::_Util::get_subname( $sub ) eq ( $cleanee_stash->name . "::$f" )
+ and
+ $deleted_stash->add_symbol(
+ "&$f",
+ namespace::clean::_Util::set_subname( $deleted_stash->name . "::$f", $sub ),
+ );
+ }
+ elsif ( DEBUGGER_NEEDS_CV_PIVOT and $need_debugger_fixup ) {
+ $deleted_stash->add_symbol("&$f", $sub);
+ }
+
+ my @symbols = map {
+ my $name = $_ . $f;
+ my $def = $cleanee_stash->get_symbol($name);
+ defined($def) ? [$name, $def] : ()
+ } '$', '@', '%', '';
+
+ $cleanee_stash->remove_glob($f);
+
+ # if this perl needs no renaming trick we need to
+ # rename the original glob after the fact
+ DEBUGGER_NEEDS_CV_PIVOT
+ and
+ $need_debugger_fixup
+ and
+ *$globref = $deleted_stash->namespace->{$f};
+
+ $cleanee_stash->add_symbol(@$_) for @symbols;
+ }
+};
+
+sub clean_subroutines {
+ my ($nc, $cleanee, @subs) = @_;
+ $RemoveSubs->($cleanee, {}, @subs);
+}
+
+sub import {
+ my ($pragma, @args) = @_;
+
+ my (%args, $is_explicit);
+
+ ARG:
+ while (@args) {
+
+ if ($args[0] =~ /^\-/) {
+ my $key = shift @args;
+ my $value = shift @args;
+ $args{ $key } = $value;
+ }
+ else {
+ $is_explicit++;
+ last ARG;
+ }
+ }
+
+ my $cleanee = exists $args{ -cleanee } ? $args{ -cleanee } : scalar caller;
+ if ($is_explicit) {
+ on_scope_end {
+ $RemoveSubs->($cleanee, {}, @args);
+ };
+ }
+ else {
+
+ # calling class, all current functions and our storage
+ my $functions = $pragma->get_functions($cleanee);
+ my $store = $pragma->get_class_store($cleanee);
+ my $stash = stash_for($cleanee);
+
+ # except parameter can be array ref or single value
+ my %except = map {( $_ => 1 )} (
+ $args{ -except }
+ ? ( ref $args{ -except } eq 'ARRAY' ? @{ $args{ -except } } : $args{ -except } )
+ : ()
+ );
+
+ # register symbols for removal, if they have a CODE entry
+ for my $f (keys %$functions) {
+ next if $except{ $f };
+ next unless $stash->has_symbol("&$f");
+ $store->{remove}{ $f } = 1;
+ }
+
+ # register EOF handler on first call to import
+ unless ($store->{handler_is_installed}) {
+ on_scope_end {
+ $RemoveSubs->($cleanee, $store, keys %{ $store->{remove} });
+ };
+ $store->{handler_is_installed} = 1;
+ }
+
+ return 1;
+ }
+}
+
+sub unimport {
+ my ($pragma, %args) = @_;
+
+ # the calling class, the current functions and our storage
+ my $cleanee = exists $args{ -cleanee } ? $args{ -cleanee } : scalar caller;
+ my $functions = $pragma->get_functions($cleanee);
+ my $store = $pragma->get_class_store($cleanee);
+
+ # register all unknown previous functions as excluded
+ for my $f (keys %$functions) {
+ next if $store->{remove}{ $f }
+ or $store->{exclude}{ $f };
+ $store->{exclude}{ $f } = 1;
+ }
+
+ return 1;
+}
+
+sub get_class_store {
+ my ($pragma, $class) = @_;
+ my $stash = stash_for($class);
+ my $var = "%$STORAGE_VAR";
+ $stash->add_symbol($var, {})
+ unless $stash->has_symbol($var);
+ return $stash->get_symbol($var);
+}
+
+sub get_functions {
+ my ($pragma, $class) = @_;
+
+ my $stash = stash_for($class);
+ return {
+ map { $_ => $stash->get_symbol("&$_") }
+ $stash->list_all_symbols('CODE')
+ };
}
+'Danger! Laws of Thermodynamics may not apply.'
+
+__END__
+
=head1 NAME
namespace::clean - Keep imports and functions out of your namespace
If you just want to C<-except> a single sub, you can pass it directly.
For more than one value you have to use an array reference.
+=head3 Late binding caveat
+
+Note that the L<technique used by this module|/IMPLEMENTATION DETAILS> relies
+on perl having resolved all names to actual code references during the
+compilation of a scope. While this is almost always what the interpreter does,
+there are some exceptions, notably the L<sort SUBNAME|perlfunc/sort> style of
+the C<sort> built-in invocation. The following example will not work, because
+C<sort> does not try to resolve the function name to an actual code reference
+until B<runtime>.
+
+ use MyApp::Utils 'my_sorter';
+ use namespace::clean;
+
+ my @sorted = sort my_sorter @list;
+
+You need to work around this by forcing a compile-time resolution like so:
+
+ use MyApp::Utils 'sorter';
+ use namespace::clean;
+
+ my $my_sorter_cref = \&sorter;
+
+ my @sorted = sort $my_sorter_cref @list;
+
=head2 Explicitly removing functions when your scope is compiled
It is also possible to explicitly tell C<namespace::clean> what packages
effect at a specific time (e.g. C<namespace::clean> acts on scope compile end)
it is your responsibility to make sure it runs at that time.
-=cut
-
-# Constant to optimise away the unused code branches
-use constant FIXUP_NEEDED => $] < 5.015_005_1;
-use constant FIXUP_RENAME_SUB => $] > 5.008_008_9 && $] < 5.013_005_1;
-{
- no strict;
- delete ${__PACKAGE__."::"}{FIXUP_NEEDED};
- delete ${__PACKAGE__."::"}{FIXUP_RENAME_SUB};
-}
-
-# Debugger fixup necessary before perl 5.15.5
-#
-# In perl 5.8.9-5.12, it assumes that sub_fullname($sub) can
-# always be used to find the CV again.
-# In perl 5.8.8 and 5.14, it assumes that the name of the glob
-# passed to entersub can be used to find the CV.
-# since we are deleting the glob where the subroutine was originally
-# defined, those assumptions no longer hold.
-#
-# So in 5.8.9-5.12 we need to move it elsewhere and point the
-# CV's name to the new glob.
-#
-# In 5.8.8 and 5.14 we move it elsewhere and rename the
-# original glob by assigning the new glob back to it.
-my $sub_utils_loaded;
-my $DebuggerFixup = sub {
- my ($f, $sub, $cleanee_stash, $deleted_stash) = @_;
-
- if (FIXUP_RENAME_SUB) {
- if (! defined $sub_utils_loaded ) {
- $sub_utils_loaded = do {
-
- # when changing version also change in Makefile.PL
- my $sn_ver = 0.04;
- eval { require Sub::Name; Sub::Name->VERSION($sn_ver) }
- or die "Sub::Name $sn_ver required when running under -d or equivalent: $@";
-
- # when changing version also change in Makefile.PL
- my $si_ver = 0.04;
- eval { require Sub::Identify; Sub::Identify->VERSION($si_ver) }
- or die "Sub::Identify $si_ver required when running under -d or equivalent: $@";
-
- 1;
- } ? 1 : 0;
- }
-
- if ( Sub::Identify::sub_fullname($sub) eq ($cleanee_stash->name . "::$f") ) {
- my $new_fq = $deleted_stash->name . "::$f";
- Sub::Name::subname($new_fq, $sub);
- $deleted_stash->add_symbol("&$f", $sub);
- }
- }
- else {
- $deleted_stash->add_symbol("&$f", $sub);
- }
-};
-
-my $RemoveSubs = sub {
- my $cleanee = shift;
- my $store = shift;
- my $cleanee_stash = Package::Stash->new($cleanee);
- my $deleted_stash;
-
- SYMBOL:
- for my $f (@_) {
-
- # ignore already removed symbols
- next SYMBOL if $store->{exclude}{ $f };
-
- my $sub = $cleanee_stash->get_symbol("&$f")
- or next SYMBOL;
-
- my $need_debugger_fixup =
- FIXUP_NEEDED
- &&
- $^P
- &&
- ref(my $globref = \$cleanee_stash->namespace->{$f}) eq 'GLOB'
- ;
-
- if (FIXUP_NEEDED && $need_debugger_fixup) {
- # convince the Perl debugger to work
- # see the comment on top of $DebuggerFixup
- $DebuggerFixup->(
- $f,
- $sub,
- $cleanee_stash,
- $deleted_stash ||= Package::Stash->new("namespace::clean::deleted::$cleanee"),
- );
- }
-
- my @symbols = map {
- my $name = $_ . $f;
- my $def = $cleanee_stash->get_symbol($name);
- defined($def) ? [$name, $def] : ()
- } '$', '@', '%', '';
-
- $cleanee_stash->remove_glob($f);
-
- # if this perl needs no renaming trick we need to
- # rename the original glob after the fact
- # (see commend of $DebuggerFixup
- if (FIXUP_NEEDED && !FIXUP_RENAME_SUB && $need_debugger_fixup) {
- *$globref = $deleted_stash->namespace->{$f};
- }
-
- $cleanee_stash->add_symbol(@$_) for @symbols;
- }
-};
-
-sub clean_subroutines {
- my ($nc, $cleanee, @subs) = @_;
- $RemoveSubs->($cleanee, {}, @subs);
-}
-
=head2 import
Makes a snapshot of the current defined functions and installs a
L<B::Hooks::EndOfScope> hook in the current scope to invoke the cleanups.
-=cut
-
-sub import {
- my ($pragma, @args) = @_;
-
- my (%args, $is_explicit);
-
- ARG:
- while (@args) {
-
- if ($args[0] =~ /^\-/) {
- my $key = shift @args;
- my $value = shift @args;
- $args{ $key } = $value;
- }
- else {
- $is_explicit++;
- last ARG;
- }
- }
-
- my $cleanee = exists $args{ -cleanee } ? $args{ -cleanee } : scalar caller;
- if ($is_explicit) {
- on_scope_end {
- $RemoveSubs->($cleanee, {}, @args);
- };
- }
- else {
-
- # calling class, all current functions and our storage
- my $functions = $pragma->get_functions($cleanee);
- my $store = $pragma->get_class_store($cleanee);
- my $stash = Package::Stash->new($cleanee);
-
- # except parameter can be array ref or single value
- my %except = map {( $_ => 1 )} (
- $args{ -except }
- ? ( ref $args{ -except } eq 'ARRAY' ? @{ $args{ -except } } : $args{ -except } )
- : ()
- );
-
- # register symbols for removal, if they have a CODE entry
- for my $f (keys %$functions) {
- next if $except{ $f };
- next unless $stash->has_symbol("&$f");
- $store->{remove}{ $f } = 1;
- }
-
- # register EOF handler on first call to import
- unless ($store->{handler_is_installed}) {
- on_scope_end {
- $RemoveSubs->($cleanee, $store, keys %{ $store->{remove} });
- };
- $store->{handler_is_installed} = 1;
- }
-
- return 1;
- }
-}
=head2 unimport
It will start a new section of code that defines functions to clean up.
-=cut
-
-sub unimport {
- my ($pragma, %args) = @_;
-
- # the calling class, the current functions and our storage
- my $cleanee = exists $args{ -cleanee } ? $args{ -cleanee } : scalar caller;
- my $functions = $pragma->get_functions($cleanee);
- my $store = $pragma->get_class_store($cleanee);
-
- # register all unknown previous functions as excluded
- for my $f (keys %$functions) {
- next if $store->{remove}{ $f }
- or $store->{exclude}{ $f };
- $store->{exclude}{ $f } = 1;
- }
-
- return 1;
-}
-
=head2 get_class_store
This returns a reference to a hash in a passed package containing
information about function names included and excluded from removal.
-=cut
-
-sub get_class_store {
- my ($pragma, $class) = @_;
- my $stash = Package::Stash->new($class);
- my $var = "%$STORAGE_VAR";
- $stash->add_symbol($var, {})
- unless $stash->has_symbol($var);
- return $stash->get_symbol($var);
-}
-
=head2 get_functions
Takes a class as argument and returns all currently defined functions
in it as a hash reference with the function name as key and a typeglob
reference to the symbol as value.
-=cut
-
-sub get_functions {
- my ($pragma, $class) = @_;
-
- my $stash = Package::Stash->new($class);
- return {
- map { $_ => $stash->get_symbol("&$_") }
- $stash->list_all_symbols('CODE')
- };
-}
-
=head1 IMPLEMENTATION DETAILS
This module works through the effect that a
This software is copyright (c) 2011 by L</AUTHORS>
This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself.
-
-=cut
-
-no warnings;
-'Danger! Laws of Thermodynamics may not apply.'
projects / p5sagit/namespace-clean.git / blobdiff