diff options
| author | Petr Baudis <pasky@suse.cz> | 2006-07-26 03:03:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-25 21:13:30 -0700 |
| commit | 96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 (patch) | |
| tree | 425d60decf270a7904b32bef27a70129d324f80e /perl | |
| parent | 7fb39d5f58efd05e982fe148630edc97ded753b6 (diff) | |
| download | git-96bc4de85cf810db5c7cd94bf0688a98a64a0bc7.tar.gz | |
Eliminate Scalar::Util usage from private-Error.pm
We used just the blessed() routine so steal it from Scalar/Util.pm.
Unfortunately, Scalar::Util is not bundled with older Perl versions.
This is a newer much saner blessed() version by Randal L. Schwarz.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/private-Error.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl/private-Error.pm b/perl/private-Error.pm index ebd07498a2..8fff86699f 100644 --- a/perl/private-Error.pm +++ b/perl/private-Error.pm @@ -43,8 +43,6 @@ $Error::ObjectifyCallback = \&throw_Error_Simple; # Exported subs are defined in Error::subs -use Scalar::Util (); - sub import { shift; local $Exporter::ExportLevel = $Exporter::ExportLevel + 1; @@ -290,6 +288,14 @@ use vars qw(@EXPORT_OK @ISA %EXPORT_TAGS); @ISA = qw(Exporter); + +sub blessed { + my $item = shift; + local $@; # don't kill an outer $@ + ref $item and eval { $item->can('can') }; +} + + sub run_clauses ($$$\@) { my($clauses,$err,$wantarray,$result) = @_; my $code = undef; @@ -312,7 +318,7 @@ sub run_clauses ($$$\@) { $i -= 2; next CATCHLOOP; } - elsif(Scalar::Util::blessed($err) && $err->isa($pkg)) { + elsif(blessed($err) && $err->isa($pkg)) { $code = $catch->[$i+1]; while(1) { my $more = 0; @@ -421,7 +427,7 @@ sub try (&;$) { if (defined($err)) { - if (Scalar::Util::blessed($err) && $err->can('throw')) + if (blessed($err) && $err->can('throw')) { throw $err; } |