percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 05:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 1073532: Mo doesn't work with Scalar::Util::PP

Browse Source 
Unlike Scalar::Util, Scalar::Util::PP::looks_like_number shifts @_,
so calling it as &looks_like_number works differently in both
versions; see https://rt.cpan.org/Public/Bug/Display.html?id=80525
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-10-31 12:04:30 -03:00
parent 64fe380986
commit e6158cd2f8
3 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Mo.pm
View File

@@ -41,19 +41,19 @@ use strict;
use warnings qw( FATAL all );
use Carp ();
use Scalar::Util ();
use Scalar::Util qw(looks_like_number blessed);
# Basic types for isa. If you want a new type, either add it here,
# or give isa a coderef.
our %TYPES = (
Bool => sub { !$_[0] || (defined $_[0] && &Scalar::Util::looks_like_number && $_[0] == 1) },
Num => sub { defined $_[0] && &Scalar::Util::looks_like_number },
Int => sub { defined $_[0] && &Scalar::Util::looks_like_number && $_[0] == int $_[0] },
Bool => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
Num => sub { defined $_[0] && looks_like_number($_[0]) },
Int => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
Str => sub { defined $_[0] },
Object => sub { defined $_[0] && &Scalar::Util::blessed },
Object => sub { defined $_[0] && blessed($_[0]) },
FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
# Ref types:
map {
my $type = /R/ ? $_ : uc $_;
$_ . "Ref" => sub { ref $_[0] eq $type }
@@ -245,7 +245,7 @@ sub Mo::import {
$method = sub {
if ( $#_ ) {
Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
unless blessed($_[1]) && $_[1]->does($role)
unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
}
goto &$original_method
};