X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;ds=inline;f=lib%2FScope%2FUpper.pm;h=765b2b267ecfa8324d668dfc39057cace6d18e44;hb=bb599962d594880ba0069b297a293eacd95092d9;hp=d276ae443f69b291cdcbe5ed8fa21b59da2af945;hpb=5118f63b759353515f90e036384b82717ba50a39;p=perl%2Fmodules%2FScope-Upper.git
diff --git a/lib/Scope/Upper.pm b/lib/Scope/Upper.pm
index d276ae4..765b2b2 100644
--- a/lib/Scope/Upper.pm
+++ b/lib/Scope/Upper.pm
@@ -9,61 +9,89 @@ Scope::Upper - Act on upper scopes.
=head1 VERSION
-Version 0.07
+Version 0.13
=cut
our $VERSION;
BEGIN {
- $VERSION = '0.07';
+ $VERSION = '0.13';
}
=head1 SYNOPSIS
- package X;
+L, L, L, L and L :
+
+ package Scope;
use Scope::Upper qw/reap localize localize_elem localize_delete :words/;
- sub desc { shift->{desc} }
+ sub new {
+ my ($class, $name) = @_;
+
+ localize '$tag' => bless({ name => $name }, $class) => UP;
- sub set_tag {
- my ($desc) = @_;
+ reap { print Scope->tag->name, ": end\n" } UP;
+ }
- # First localize $x so that it gets destroyed last
- localize '$x' => bless({ desc => $desc }, __PACKAGE__) => UP; # one scope up
+ # Get the tag stored in the caller namespace
+ sub tag {
+ my $l = 0;
+ my $pkg = __PACKAGE__;
+ $pkg = caller $l++ while $pkg eq __PACKAGE__;
+
+ no strict 'refs';
+ ${$pkg . '::tag'};
+ }
- reap sub {
- my $pkg = caller;
- my $x = do { no strict 'refs'; ${$pkg.'::x'} }; # Get the $x in the scope
- print $x->desc . ": done\n";
- } => SCOPE 1; # same as UP here
+ sub name { shift->{name} }
+ # Locally capture warnings and reprint them with the name prefixed
+ sub catch {
localize_elem '%SIG', '__WARN__' => sub {
- my $pkg = caller;
- my $x = do { no strict 'refs'; ${$pkg.'::x'} }; # Get the $x in the scope
- CORE::warn($x->desc . ': ' . join('', @_));
- } => UP CALLER 0; # same as UP here
+ print Scope->tag->name, ': ', @_;
+ } => UP;
+ }
- # delete last @ARGV element
- localize_delete '@ARGV', -1 => UP SUB HERE; # same as UP here
+ # Locally clear @INC
+ sub private {
+ for (reverse 0 .. $#INC) {
+ # First UP is the for loop, second is the sub boundary
+ localize_delete '@INC', $_ => UP UP;
+ }
}
- package Y;
+ ...
+
+ package UserLand;
{
- X::set_tag('pie');
- # $x is now a X object, and @ARGV has one element less
- warn 'what'; # warns "pie: what at ..."
- ...
- } # "pie: done" is printed
+ Scope->new("top"); # initializes $UserLand::tag
+
+ {
+ Scope->catch;
+ my $one = 1 + undef; # prints "top: Use of uninitialized value..."
+
+ {
+ Scope->private;
+ eval { require Cwd };
+ print $@; # prints "Can't locate Cwd.pm in @INC (@INC contains:) at..."
+ }
+
+ require Cwd; # loads Cwd.pm
+ }
- package Z;
+ } # prints "top: done"
+
+L and L :
+
+ package Try;
use Scope::Upper qw/unwind want_at :words/;
sub try (&) {
my @result = shift->();
- my $cx = SUB UP SUB;
+ my $cx = SUB UP; # Point to the sub above this one
unwind +(want_at($cx) ? @result : scalar @result) => $cx;
}
@@ -71,13 +99,15 @@ BEGIN {
sub zap {
try {
+ my @things = qw/a b c/;
return @things; # returns to try() and then outside zap()
# not reached
- }
+ };
# not reached
}
- my @what = zap(); # @what contains @things
+ my @stuff = zap(); # @stuff contains qw/a b c/
+ my $stuff = zap(); # $stuff contains 3
=head1 DESCRIPTION
@@ -117,11 +147,11 @@ BEGIN {
=head2 C
-Add a destructor that calls C<$callback> (in void context) when the upper scope represented by C<$context> ends.
+Adds a destructor that calls C<$callback> (in void context) when the upper scope represented by C<$context> ends.
=head2 C
-A C delayed to the time of first return into the upper scope denoted by C<$context>.
+Introduces a C delayed to the time of first return into the upper scope denoted by C<$context>.
C<$what> can be :
=over 4
@@ -143,24 +173,44 @@ For example,
will set C<$x> to a reference to the string C<'foo'>.
Other sigils (C<'@'>, C<'%'>, C<'&'> and C<'*'>) require C<$value> to be a reference of the corresponding type.
-When the symbol is given by a string, it is resolved when the actual localization takes place and not when C is called.
-This means that
+When the symbol is given by a string, it is resolved when the actual localization takes place and not when L is called.
+Thus, if the symbol name is not qualified, it will refer to the variable in the package where the localization actually takes place and not in the one where the L call was compiled.
+For example,
+
+ {
+ package Scope;
+ sub new { localize '$tag', $_[0] => UP }
+ }
+
+ {
+ package Tool;
+ {
+ Scope->new;
+ ...
+ }
+ }
- sub tag { localize '$x', $_[0] => UP }
+will localize C<$Tool::tag> and not C<$Scope::tag>.
+If you want the other behaviour, you just have to specify C<$what> as a glob or a qualified name.
-will localize in the caller's namespace.
+Note that if C<$what> is a string denoting a variable that wasn't declared beforehand, the relevant slot will be vivified as needed and won't be deleted from the glob when the localization ends.
+This situation never arises with C because it only compiles when the localized variable is already declared.
+Although I believe it shouldn't be a problem as glob slots definedness is pretty much an implementation detail, this behaviour may change in the future if proved harmful.
=back
=head2 C
-Similar to L but for array and hash elements.
-If C<$what> is a glob, the slot to fill is determined from which type of reference C<$value> is ; otherwise it's inferred from the sigil.
+Introduces a C or C delayed to the time of first return into the upper scope denoted by C<$context>.
+Unlike L, C<$what> must be a string and the type of localization is inferred from its sigil.
+The two only valid types are array and hash ; for anything besides those, L will throw an exception.
C<$key> is either an array index or a hash key, depending of which kind of variable you localize.
+If C<$what> is a string pointing to an undeclared variable, the variable will be vivified as soon as the localization occurs and emptied when it ends, although it will still exist in its glob.
+
=head2 C
-Similiar to L, but for deleting variables or array/hash elements.
+Introduces the deletion of a variable or an array/hash element delayed to the time of first return into the upper scope denoted by C<$context>.
C<$what> can be:
=over 4
@@ -183,7 +233,7 @@ C<$key> is ignored.
=head2 C
-Returns C<@values> I the context pointed by C<$context>, i.e. from the subroutine, eval or format just above C<$context>, and immediately restart the program flow at this point - thus effectively returning to (or from, depending on how you see it) an upper context.
+Returns C<@values> I the context pointed by C<$context>, i.e. from the subroutine, eval or format at or just above C<$context>, and immediately restart the program flow at this point - thus effectively returning to an upper scope.
The upper context isn't coerced onto C<@values>, which is hence always evaluated in list context.
This means that
@@ -199,7 +249,7 @@ You can use L to handle these cases.
=head2 C
-Like C, but for the subroutine/eval/format just above C<$context>.
+Like C, but for the subroutine/eval/format at or just above C<$context>.
The previous example can then be "corrected" :
@@ -209,7 +259,13 @@ The previous example can then be "corrected" :
# not reached
}->();
-will righteously set C<$num> to C<26>.
+will rightfully set C<$num> to C<26>.
+
+=head1 CONSTANTS
+
+=head2 C
+
+True iff the module could have been built when thread-safety features.
=head1 WORDS
@@ -318,6 +374,8 @@ Where L and L point to depending on the C<$cxt>:
The functions L, L, L, L, L and L are only exported on request, either individually or by the tags C<':funcs'> and C<':all'>.
+The constant L is also only exported on request, individually or by the tags C<':consts'> and C<':all'>.
+
Same goes for the words L, L, L, L, L, L and L that are only exported on request, individually or by the tags C<':words'> and C<':all'>.
=cut
@@ -326,8 +384,9 @@ use base qw/Exporter/;
our @EXPORT = ();
our %EXPORT_TAGS = (
- funcs => [ qw/reap localize localize_elem localize_delete unwind want_at/ ],
- words => [ qw/TOP HERE UP SUB EVAL SCOPE CALLER/ ],
+ funcs => [ qw/reap localize localize_elem localize_delete unwind want_at/ ],
+ words => [ qw/TOP HERE UP SUB EVAL SCOPE CALLER/ ],
+ consts => [ qw/SU_THREADSAFE/ ],
);
our @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
$EXPORT_TAGS{'all'} = [ @EXPORT_OK ];
@@ -367,8 +426,15 @@ L (standard since perl 5.006).
=head1 SEE ALSO
+L, L.
+
L, L, L, L.
+L is a thin wrapper around L that gives you a continuation passing style interface to L.
+It's easier to use, but it requires you to have control over the scope where you want to return.
+
+L.
+
=head1 AUTHOR
Vincent Pit, C<< >>, L.
@@ -377,7 +443,8 @@ You can contact me by mail or on C (vincent).
=head1 BUGS
-Please report any bugs or feature requests to C, or through the web interface at L. I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
+Please report any bugs or feature requests to C, or through the web interface at L.
+I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
=head1 SUPPORT
@@ -395,7 +462,7 @@ Thanks to Shawn M. Moore for motivation.
=head1 COPYRIGHT & LICENSE
-Copyright 2008-2009 Vincent Pit, all rights reserved.
+Copyright 2008,2009,2010,2011 Vincent Pit, all rights reserved.
This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.