- depend to Scalar::Util when perl5.6.x
Tokuhiro Matsuno [Sat, 6 Dec 2008 07:31:32 +0000 (07:31 +0000)]
- refactor the mro::get_linear_isa loader.

Makefile.PL
lib/Mouse/Util.pm
t/800_shikabased/011-util-linear-isa.t [new file with mode: 0644]

index 8fb88e4..be74c98 100755 (executable)
@@ -5,6 +5,10 @@ all_from 'lib/Mouse.pm';
 
 tests 't/*.t t/*/*.t';
 
+if ($] < 5.007003) {
+    requires 'Scalar::Util';
+}
+
 build_requires 'Test::Exception';
 build_requires 'Sub::Uplevel';    # required by Test::Exception
 build_requires 'Test::More';
index e24db21..cf807da 100644 (file)
@@ -4,176 +4,53 @@ use strict;
 use warnings;
 use base qw/Exporter/;
 use Carp;
+use Scalar::Util qw(blessed looks_like_number openhandle reftype weaken);
 
 our @EXPORT_OK = qw(
-    blessed
+    blessed looks_like_number openhandle reftype weaken
     get_linear_isa
-    looks_like_number
-    openhandle
-    reftype
-    weaken
 );
 our %EXPORT_TAGS = (
     all  => \@EXPORT_OK,
 );
 
-# We only have to do this nastiness if we haven't loaded XS version of
-# Mouse.pm, so check if we're running under PurePerl or not
 BEGIN {
-    our %dependencies = (
-        'Scalar::Util' => {
-
-#       VVVVV   CODE TAKEN FROM SCALAR::UTIL   VVVVV
-            'blessed' => do {
-                *UNIVERSAL::a_sub_not_likely_to_be_here = sub {
-                    my $ref = ref($_[0]);
-
-                    # deviation from Scalar::Util
-                    # XS returns undef, PP returns GLOB.
-                    # let's make that more consistent by having PP return
-                    # undef if it's a GLOB. :/
-
-                    # \*STDOUT would be allowed as an object in PP blessed
-                    # but not XS
-                    return $ref eq 'GLOB' ? undef : $ref;
-                };
-
-                sub {
-                    local($@, $SIG{__DIE__}, $SIG{__WARN__});
-                    length(ref($_[0]))
-                        ? eval { $_[0]->a_sub_not_likely_to_be_here }
-                        : undef;
-                },
-            },
-            'looks_like_number' => sub {
-                local $_ = shift;
-
-                # checks from perlfaq4
-                return 0 if !defined($_) or ref($_);
-                return 1 if (/^[+-]?\d+$/); # is a +/- integer
-                return 1 if (/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/); # a C float
-                return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i);
-
-                0;
-            },
-            'reftype' => sub {
-                local($@, $SIG{__DIE__}, $SIG{__WARN__});
-                my $r = shift;
-                my $t;
-
-                length($t = ref($r)) or return undef;
-
-                # This eval will fail if the reference is not blessed
-                eval { $r->a_sub_not_likely_to_be_here; 1 }
-                ? do {
-                    $t = eval {
-                        # we have a GLOB or an IO. Stringify a GLOB gives it's name
-                        my $q = *$r;
-                        $q =~ /^\*/ ? "GLOB" : "IO";
-                    }
-                    or do {
-                        # OK, if we don't have a GLOB what parts of
-                        # a glob will it populate.
-                        # NOTE: A glob always has a SCALAR
-                        local *glob = $r;
-                        defined *glob{ARRAY} && "ARRAY"
-                            or defined *glob{HASH} && "HASH"
-                            or defined *glob{CODE} && "CODE"
-                            or length(ref(${$r})) ? "REF" : "SCALAR";
-                    }
-                }
-                : $t
-            },
-            'openhandle' => sub {
-                my $fh = shift;
-                my $rt = reftype($fh) || '';
-
-                return defined(fileno($fh)) ? $fh : undef
-                    if $rt eq 'IO';
-
-                if (reftype(\$fh) eq 'GLOB') { # handle  openhandle(*DATA)
-                    $fh = \(my $tmp=$fh);
-                }
-                elsif ($rt ne 'GLOB') {
-                    return undef;
-                }
-
-                (tied(*$fh) or defined(fileno($fh)))
-                    ? $fh : undef;
-            },
-            weaken => {
-                loaded => \&Scalar::Util::weaken,
-                not_loaded => sub { die "Scalar::Util required for weak reference support" },
-            },
-#       ^^^^^   CODE TAKEN FROM SCALAR::UTIL   ^^^^^
-        },
-        'MRO::Compat' => {
-#       VVVVV   CODE TAKEN FROM MRO::COMPAT   VVVVV
-            'get_linear_isa' => {
-                loaded     => \&mro::get_linear_isa,
-                not_loaded => do {
-                    # this recurses so it isn't pretty
-                    my $code;
-                    $code = sub {
-                        no strict 'refs';
-
-                        my $classname = shift;
-
-                        my @lin = ($classname);
-                        my %stored;
-                        foreach my $parent (@{"$classname\::ISA"}) {
-                            my $plin = $code->($parent);
-                            foreach (@$plin) {
-                                next if exists $stored{$_};
-                                push(@lin, $_);
-                                $stored{$_} = 1;
-                            }
-                        }
-                        return \@lin;
-                    }
-                },
-            },
-#       ^^^^^   CODE TAKEN FROM MRO::COMPAT   ^^^^^
-        },
-    );
-
-    our %loaded;
-
-    our @EXPORT_OK = map { keys %$_ } values %dependencies;
-    our %EXPORT_TAGS = (
-        all  => \@EXPORT_OK,
-        test => [qw/throws_ok lives_ok dies_ok/],
-    );
-
-    for my $module (keys %dependencies) {
-        my ($module_name, $version) = split ' ', $module;
-
+    my $impl;
+    if (\&mro::get_linear_isa) {
+        $impl = \&mro::get_linear_isa;
+    } else {
         my $loaded = do {
             local $SIG{__DIE__} = 'DEFAULT';
-            eval "use $module (); 1";
+            eval "use MRO::Compat (); 1";
         };
-
-        $loaded{$module_name} = $loaded;
-
-        for my $method_name (keys %{ $dependencies{ $module } }) {
-            my $producer = $dependencies{$module}{$method_name};
-            my $implementation;
-
-            if (ref($producer) eq 'HASH') {
-                $implementation = $loaded
-                                ? $producer->{loaded}
-                                : $producer->{not_loaded};
-            }
-            else {
-                $implementation = $loaded
-                                ? $module_name->can($method_name)
-                                : $producer;
-            }
-
-            no strict 'refs';
-            *{ __PACKAGE__ . '::' . $method_name } = $implementation;
+        if ($loaded) {
+            $impl = \&mro::get_linear_isa;
+        } else {
+#       VVVVV   CODE TAKEN FROM MRO::COMPAT   VVVVV
+            my $code; # this recurses so it isn't pretty
+            $code = sub {
+                no strict 'refs';
+
+                my $classname = shift;
+
+                my @lin = ($classname);
+                my %stored;
+                foreach my $parent (@{"$classname\::ISA"}) {
+                    my $plin = $code->($parent);
+                    foreach (@$plin) {
+                        next if exists $stored{$_};
+                        push(@lin, $_);
+                        $stored{$_} = 1;
+                    }
+                }
+                return \@lin;
+            };
+#       ^^^^^   CODE TAKEN FROM MRO::COMPAT   ^^^^^
+            $impl = $code;
         }
     }
+    no strict 'refs';
+    *{ __PACKAGE__ . '::get_linear_isa'} = $impl;
 }
 
 sub apply_all_roles {
diff --git a/t/800_shikabased/011-util-linear-isa.t b/t/800_shikabased/011-util-linear-isa.t
new file mode 100644 (file)
index 0000000..2d2663d
--- /dev/null
@@ -0,0 +1,18 @@
+use strict;
+use warnings;
+use Mouse::Util 'get_linear_isa';
+use Test::More tests => 2;
+
+{
+    package Parent;
+}
+
+{
+    package Child;
+    use Mouse;
+    extends 'Parent';
+}
+
+is_deeply get_linear_isa('Parent'), [ 'Parent' ];
+is_deeply get_linear_isa('Child'),  [ 'Child', 'Parent' ];
+