Make the interface of composite role more comatible

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

diff --git a/lib/ouse.pm b/lib/ouse.pm
index 6ebf64d..a932c66 100644 (file)
--- a/lib/ouse.pm
+++ b/lib/ouse.pm
@@ -1,19 +1,17 @@
 package ouse;
 
-use strict;
-use warnings;
-
-BEGIN {
-    my $package;
-    sub import { 
-        $package = $_[1] || 'Class';
-        if ($package =~ /^\+/) {
-            $package =~ s/^\+//;
-            eval "require $package; 1" or die;
-        }
+use Mouse::Util; # enables strict and warnings
+
+
+my $package = 'Class';
+sub import {
+    $package = $_[1] || 'Class';
+    if ($package =~ /^\+/) {
+        $package =~ s/^\+//;
+        Mouse::Util::load_class($package);
     }
-    use Filter::Simple sub { s/^/package $package;\nuse Mouse;\n/; }
 }
+use Filter::Simple sub { s/^/package $package;\nuse Mouse;\nuse Mouse::Util::TypeConstraints;\n/; };
 
 1;
 __END__