X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2Findirect.pm;h=1b39ca5574c496e94dea84ace1f72c3eb0a62121;hb=c7b10fa5c0fe7243236bf0efa9a33776bafdc5c1;hp=fe39bd9123fa4b3f977b887e9ee9d86632998db8;hpb=2d1491ff7f2e6b5d845c5dc8f7631340d81bf4a8;p=perl%2Fmodules%2Findirect.git

diff --git a/lib/indirect.pm b/lib/indirect.pm
index fe39bd9..1b39ca5 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.14
+Version 0.15
 
 =cut
 
 our $VERSION;
 BEGIN {
- $VERSION = '0.14';
+ $VERSION = '0.15';
 }
 
 =head1 SYNOPSIS
@@ -33,6 +33,8 @@ BEGIN {
       my $z = new Pineapple 'fresh'; # croaks 'You really wanted Pineapple->new at blurp.pm:13'
      }
     }
+    try { ... }; # warns
+
     no indirect ':fatal';
     if (defied $foo) { ... } # croaks, note the typo
 
@@ -48,7 +50,7 @@ BEGIN {
 When enabled (or disabled as some may prefer to say, since you actually turn it on by calling C<no indirect>), this pragma warns about indirect object syntax constructs that may have slipped into your code.
 This syntax is now considered harmful, since its parsing has many quirks and its use is error prone (when C<swoosh> isn't defined, C<swoosh $x> actually compiles to C<< $x->swoosh >>).
 
-It currently does not warn when the object is enclosed between braces (like C<meth { $obj } @args>) or for core functions (C<print> or C<say>).
+It currently does not warn for core functions (C<print>, C<say>, C<exec> or C<system>).
 This may change in the future, or may be added as optional features that would be enabled by passing options to C<unimport>.
 
 This module is B<not> a source filter.
@@ -76,7 +78,8 @@ If it's the string C<':fatal'>, the compilation will croak on the first indirect
 
 =item *
 
-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]>, the method name as C<$_[1]>, the current file as C<$_[2]> and the line number as C<$_[3]>.
+If the key/value pair C<< hook => $hook >> comes first, C<$hook> will be called for each error with a string representation of the object as C<$_[0]>, the method name as C<$_[1]>, the current file as C<$_[2]> and the line number as C<$_[3]>.
+If and only if the object is actually a block, C<$_[0]> is assured to start by C<'{'>.
 
 =item *
 
@@ -86,10 +89,6 @@ Otherwise, a warning will be emitted for each indirect construct.
 
 =cut
 
-my $msg = sub {
- "Indirect call of method \"$_[1]\" on object \"$_[0]\" at $_[2] line $_[3].\n"
-};
-
 sub unimport {
  shift;
 
@@ -99,11 +98,11 @@ sub unimport {
   if ($arg eq 'hook') {
    $hook = shift;
   } elsif ($arg eq ':fatal') {
-   $hook = sub { die $msg->(@_) };
+   $hook = sub { die msg(@_) };
   }
   last if $hook;
  }
- $hook = sub { warn $msg->(@_) } unless defined $hook;
+ $hook = sub { warn msg(@_) } unless defined $hook;
 
  $^H |= 0x00020000;
  $^H{+(__PACKAGE__)} = _tag($hook);
@@ -122,6 +121,22 @@ sub import {
  ();
 }
 
+=head1 FUNCTIONS
+
+=head2 C<msg $object, $method, $file, $line>
+
+Returns the default error message generated by C<indirect> when an invalid construct is reported.
+
+=cut
+
+sub msg {
+ my $obj = $_[0];
+
+ join ' ', "Indirect call of method \"$_[1]\" on",
+           ($obj =~ /^\s*\{/ ? "a block" : "object \"$obj\""),
+           "at $_[2] line $_[3].\n";
+};
+
 =head1 CONSTANTS
 
 =head2 C<I_THREADSAFE>