Always load Mouse::Util first, which will be load Mouse::XS in the future

[gitmo/Mouse.git] / lib / Mouse / Util.pm

diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index eb72c43..1e8d028 100644 (file)
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -2,6 +2,7 @@ package Mouse::Util;
 use strict;
 use warnings;
 use base qw/Exporter/;
+
 use Carp qw(confess);
 use B ();
 
@@ -9,6 +10,7 @@ our @EXPORT_OK = qw(
     find_meta
     does_role
     resolve_metaclass_alias
+    english_list
 
     load_class
     is_class_loaded
@@ -26,13 +28,13 @@ our %EXPORT_TAGS = (
 # Moose::Util compatible utilities
 
 sub find_meta{
-    return Mouse::Module::class_of( $_[0] );
+    return Mouse::Meta::Module::class_of( $_[0] );
 }
 
 sub does_role{
     my ($class_or_obj, $role) = @_;\r
 \r
-    my $meta = Mouse::Module::class_of($class_or_obj);\r
+    my $meta = Mouse::Meta::Module::class_of($class_or_obj);\r
 \r
     return 0 unless defined $meta;\r
     return 1 if $meta->does_role($role);\r
@@ -261,6 +263,19 @@ sub apply_all_roles {
     return;
 }
 
+# taken from Moose::Util 0.90
+sub english_list {
+    return $_[0] if @_ == 1;\r
+
+    my @items = sort @_;\r
+\r
+    return "$items[0] and $items[1]" if @items == 2;\r
+\r
+    my $tail = pop @items;\r
+\r
+    return join q{, }, @items, "and $tail";\r
+}
+
 sub not_supported{
     my($feature) = @_;