From: Vincent Pit <vince@profvince.com>
Date: Mon, 3 Nov 2008 09:54:07 +0000 (+0100)
Subject: Fix some croak backtraces
X-Git-Tag: v0.09~12
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FSub-Prototype-Util.git;a=commitdiff_plain;h=92b328c090598b186ee6dd5168ca4b5047a834c9

Fix some croak backtraces
---

diff --git a/lib/Sub/Prototype/Util.pm b/lib/Sub/Prototype/Util.pm
index d549a1c..20525ec 100644
--- a/lib/Sub/Prototype/Util.pm
+++ b/lib/Sub/Prototype/Util.pm
@@ -57,6 +57,12 @@ sub _check_ref {
  return $r;
 }
 
+sub _clean_msg {
+ my ($msg) = @_;
+ $msg =~ s/(?:\s+called)?\s+at\s+.*$//s;
+ return $msg;
+}
+
 =head2 C<flatten $proto, @args>
 
 Flattens the array C<@args> according to the prototype C<$proto>. When C<@args> is what C<@_> is after calling a subroutine with prototype C<$proto>, C<flatten> returns the list of what C<@_> would have been if there were no prototype.
@@ -223,7 +229,7 @@ sub wrap {
  $call = 'sub ' . $call if $opts{sub};
  if ($opts{compile}) {
   $call = eval $call;
-  croak $@ if $@;
+  croak _clean_msg $@ if $@;
  }
  return $call;
 }
@@ -242,7 +248,7 @@ If you plan to recall several times, consider using L</wrap> instead.
 
 sub recall {
  my $wrap = eval { wrap shift };
- croak $@ if $@;
+ croak _clean_msg $@ if $@;
  return $wrap->(@_);
 }
 
diff --git a/t/11-wrap.t b/t/11-wrap.t
index 47fd20e..7e01323 100644
--- a/t/11-wrap.t
+++ b/t/11-wrap.t
@@ -132,4 +132,4 @@ if ($^V ge v5.10.0) {
 }
 
 eval { wrap { 'main::dummy' => '\[@%]' }, ref => 'shift' };
-like($@, qr/to\s+shift\s+must\s+be\s+array/, 'invalid eval code croaks');
+like($@, qr/to\s+shift\s+must\s+be\s+array +\([\w ]+\) +at\s+\Q$0\E/, 'invalid eval code croaks');
diff --git a/t/12-recall.t b/t/12-recall.t
index 916e7c5..8420ceb 100644
--- a/t/12-recall.t
+++ b/t/12-recall.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 7 + 20 + (($^V ge v5.10.0) ? 4 : 0);
+use Test::More tests => 8 + 20 + (($^V ge v5.10.0) ? 4 : 0);
 
 use Scalar::Util qw/set_prototype/;
 use Sub::Prototype::Util qw/recall/;
@@ -22,6 +22,8 @@ eval { recall { 'foo' => undef, 'bar' => undef } };
 like($@, qr!exactly\s+one\s+key/value\s+pair!, 'recall hashref with 2 pairs croaks');
 eval { recall 'hlagh' };
 like($@, qr/^Undefined\s+subroutine/, 'recall <unknown> croaks');
+eval { recall 'for' };
+like($@, qr/^syntax\s+error\s+at\s+\Q$0\E/, 'invalid eval code croaks');
 
 sub noproto { $_[1], $_[0] }
 sub mytrunc ($;$) { $_[1], $_[0] }