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>

diff --git a/perl/private-Error.pm b/perl/private-Error.pm
index ebd07498a22ec598449211e8a26c0b63689633ff..8fff86699fc4585ef9378150d3a60edf911ecc8c 100644 (file)
--- a/perl/private-Error.pm
+++ b/perl/private-Error.pm
@@ -43,8 +43,6 @@ sub throw_Error_Simple
 
 # Exported subs are defined in Error::subs
 
 
 # Exported subs are defined in Error::subs
 

-use Scalar::Util ();
-

 sub import {
     shift;
     local $Exporter::ExportLevel = $Exporter::ExportLevel + 1;
 sub import {
     shift;
     local $Exporter::ExportLevel = $Exporter::ExportLevel + 1;


@@ -290,6 +288,14 @@ package Error::subs;
 
 @ISA = qw(Exporter);
 
 
 @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;
 sub run_clauses ($$$\@) {
     my($clauses,$err,$wantarray,$result) = @_;
     my $code = undef;


@@ -312,7 +318,7 @@ ($$$\@)
                    $i -= 2;
                    next CATCHLOOP;
                }
                    $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;
                    $code = $catch->[$i+1];
                    while(1) {
                        my $more = 0;


@@ -421,7 +427,7 @@ (&;$)
 
     if (defined($err))
     {
 
     if (defined($err))
     {

-        if (Scalar::Util::blessed($err) && $err->can('throw'))
+        if (blessed($err) && $err->can('throw'))

         {
             throw $err;
         }
         {
             throw $err;
         }