Browse Source

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>
maint
Petr Baudis 19 years ago committed by Junio C Hamano
parent
commit
96bc4de85c
  1. 14
      perl/private-Error.pm

14
perl/private-Error.pm

@ -43,8 +43,6 @@ $Error::ObjectifyCallback = \&throw_Error_Simple; @@ -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); @@ -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 ($$$\@) { @@ -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 (&;$) { @@ -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;
}

Loading…
Cancel
Save