X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2Findirect.pm;h=6354a1361f30c36af3a672f88a8579d03b9928e0;hb=36e1f9a23b073751223769b71f1e84643913e592;hp=092b7e54f91a3716261eec6b22290b690171093c;hpb=ac63b5ab9e6d13e92a53bc89e55a1d5dd306854e;p=perl%2Fmodules%2Findirect.git

diff --git a/lib/indirect.pm b/lib/indirect.pm
index 092b7e5..6354a13 100644
--- a/lib/indirect.pm
+++ b/lib/indirect.pm
@@ -11,13 +11,13 @@ indirect - Lexically warn about using the indirect object syntax.
 
 =head1 VERSION
 
-Version 0.09
+Version 0.11
 
 =cut
 
 our $VERSION;
 BEGIN {
- $VERSION = '0.09';
+ $VERSION = '0.11';
 }
 
 =head1 SYNOPSIS
@@ -39,45 +39,91 @@ It currently does not warn when the object is enclosed between braces (like C<me
 
 This module is B<not> a source filter.
 
+=cut
+
+BEGIN {
+ require XSLoader;
+ XSLoader::load(__PACKAGE__, $VERSION);
+}
+
 =head1 METHODS
 
-=head2 C<unimport @opts>
+=head2 C<< unimport [ hook => $hook | ':fatal' ] >>
 
-Magically called when C<no indirect @opts> is encountered. Turns the module on. If C<@opts> contains C<':fatal'>, the module will croak on the first indirect syntax met.
+Magically called when C<no indirect @opts> is encountered.
+Turns the module on.
+The policy to apply depends on what is first found in C<@opts> :
 
-=head2 C<import>
+=over 4
 
-Magically called at each C<use indirect>. Turns the module off.
+=item *
 
-=cut
+If it's the string C<':fatal'>, the compilation will croak on the first indirect syntax met.
 
-BEGIN {
- require XSLoader;
- XSLoader::load(__PACKAGE__, $VERSION);
-}
+=item *
 
-sub import {
- $^H{indirect} = undef;
-}
+If the key/value pair C<< hook => $hook >> comes first, C<$hook> will be called for each error with the object name as C<$_[0]> and the method name as C<$_[1]>.
+
+=item *
+
+Otherwise, a warning will be emitted for each indirect construct.
+
+=back
+
+=cut
+
+my $msg = sub { "Indirect call of method \"$_[1]\" on object \"$_[0]\"" };
 
 sub unimport {
- (undef, my $type) = @_;
+ shift;
+
+ my $hook;
+ while (@_) {
+  my $arg = shift;
+  if ($arg eq 'hook') {
+   $hook = shift;
+  } elsif ($arg eq ':fatal') {
+   $hook = sub { die $msg->(@_) };
+  }
+  last if $hook;
+ }
+ $hook = sub { warn $msg->(@_) } unless defined $hook;
+
  $^H |= 0x00020000;
- $^H{indirect} = (defined $type and $type eq ':fatal') ? 2 : 1;
+ $^H{+(__PACKAGE__)} = _tag($hook);
+
+ ();
 }
 
-=head1 DEPENDENCIES
+=head2 C<import>
 
-L<perl> 5.8.
+Magically called at each C<use indirect>. Turns the module off.
 
-L<XSLoader> (standard since perl 5.006).
+=cut
+
+sub import {
+ $^H{+(__PACKAGE__)} = undef;
+ ();
+}
+
+=head1 CONSTANTS
+
+=head2 C<I_THREADSAFE>
+
+True iff the module could have been built when thread-safety features.
 
 =head1 CAVEATS
 
 C<meth $obj> (no semicolon) at the end of a file won't be seen as an indirect object syntax, although it will as soon as there is another token before the end (as in C<meth $obj;> or C<meth $obj 1>).
 
 With 5.8 perls, the pragma does not propagate into C<eval STRING>.
-This is due to a shortcoming in the way perl handles the hints hash, and is fixed in perl 5.10.
+This is due to a shortcoming in the way perl handles the hints hash, which is addressed in perl 5.10.
+
+=head1 DEPENDENCIES
+
+L<perl> 5.8.
+
+L<XSLoader> (standard since perl 5.006).
 
 =head1 AUTHOR
 
@@ -103,7 +149,7 @@ Bram, for motivation and advices.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008 Vincent Pit, all rights reserved.
+Copyright 2008-2009 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.