X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FUtil%2FTypeConstraints.pm;h=4ebb08a50bf7ec95c91831891299c8df625254dd;hp=d4db67312087dd3712a153832abfe1521c910df0;hb=ffbbf459fec594dcd08b5f7d05014740390bde58;hpb=e3281eafbd3005f63707187c9eab7952f9daedfc

diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm
index d4db673..4ebb08a 100644
--- a/lib/Mouse/Util/TypeConstraints.pm
+++ b/lib/Mouse/Util/TypeConstraints.pm
@@ -72,9 +72,8 @@ BEGIN {
 
     while (my ($name, $code) = each %builtins) {
         $TYPE{$name} = Mouse::Meta::TypeConstraint->new(
-            name                      => $name,
-            _compiled_type_constraint => $code,
-            package_defined_in        => __PACKAGE__,
+            name      => $name,
+            optimized => $code,
         );
     }
 
@@ -125,17 +124,15 @@ sub _create_type{
               . "$existing->{package_defined_in} and cannot be created again in $package_defined_in");
     }
 
-    $args{constraint}                = delete($args{where})
-        if exists $args{where};
-    $args{_compiled_type_constraint} = delete $args{optimized_as}
-        if exists $args{optimized_as};
+    $args{constraint} = delete($args{where})       if exists $args{where};
+    $args{optimized}  = delete $args{optimized_as} if exists $args{optimized_as};
 
     my $constraint;
     if($mode eq 'subtype'){
-        my $parent = exists($args{as}) ? delete($args{as}) : delete($args{name});
+        my $parent = delete($args{as})
+            or confess('A subtype cannot consist solely of a name, it must have a parent');
 
-        $parent = blessed($parent) ? $parent : find_or_create_isa_type_constraint($parent);
-        $constraint = $parent->create_child_type(%args);
+        $constraint = find_or_create_isa_type_constraint($parent)->create_child_type(%args);
     }
     else{
         $constraint = Mouse::Meta::TypeConstraint->new(%args);
@@ -153,35 +150,12 @@ sub subtype {
 }
 
 sub coerce {
-    my $name = shift;
+    my $type_name = shift;
 
-    $name =~ s/\s+//g;
-    confess "Cannot find type '$name', perhaps you forgot to load it."
-        unless $TYPE{$name};
+    my $type = find_type_constraint($type_name)
+        or confess("Cannot find type '$type_name', perhaps you forgot to load it.");
 
-    unless ($COERCE{$name}) {
-        $COERCE{$name}      = {};
-        $COERCE_KEYS{$name} = [];
-    }
-
-    my $package_defined_in = caller;
-
-    while (my($from, $code) = splice @_, 0, 2) {
-        $from =~ s/\s+//g;
-
-        confess "A coercion action already exists for '$from'"
-            if $COERCE{$name}->{$from};
-
-        my $type = find_or_parse_type_constraint($from, $package_defined_in);
-        if (!$type) {
-            confess "Could not find the type constraint ($from) to coerce from"
-        }
-
-        warn "# REGISTER COERCE $name, from $type\n" if _DEBUG;
-
-        push @{ $COERCE_KEYS{$name} }, $type;
-        $COERCE{$name}->{$from} = $code;
-    }
+    $type->_add_type_coercions(@_);
     return;
 }
 
@@ -217,34 +191,10 @@ sub role_type {
 
 # this is an original method for Mouse
 sub typecast_constraints {
-    my($class, $pkg, $types, $value) = @_;
+    my($class, $pkg, $type, $value) = @_;
     Carp::croak("wrong arguments count") unless @_ == 4;
 
-    local $_;
-    for my $type ($types, ($types->{type_constraints} ? @{$types->{type_constraints}} : ()) ) {
-        for my $coerce_type (@{ $COERCE_KEYS{$type}}) {
-
-            if(_DEBUG){
-                warn sprintf "# COERCE: from %s to %s for %s (%s)\n",
-                    $coerce_type, $type, defined($value) ? $value : 'undef',
-                    $coerce_type->check($value) ? "try" : "skip";
-            }
-
-            next if !$coerce_type->check($value);
-
-            # try to coerce
-            $_ = $value;
-            $_ = $COERCE{$type}->{$coerce_type}->($_); # coerce
-
-            if(_DEBUG){
-                warn sprintf "# COERCE: got %s, which is%s %s\n",
-                    defined($_) ? $_ : 'undef', $types->check($_) ? '' : ' not', $types;
-            }
-
-            return $_ if $types->check($_); # check for $types, not $constraint
-        }
-    }
-    return $value;
+    return $type->coerce($value);
 }
 
 sub enum {
@@ -280,7 +230,7 @@ sub _find_or_create_regular_type{
 
     my $check;
     my $type;
-    if($meta && $meta->isa('Mouse::Meta::Role')){
+    if($meta->isa('Mouse::Meta::Role')){
         $check = sub{
             return blessed($_[0]) && $_[0]->does($spec);
         };
@@ -296,16 +246,16 @@ sub _find_or_create_regular_type{
     warn "#CREATE a $type type for $spec\n" if _DEBUG;
 
     return $TYPE{$spec} = Mouse::Meta::TypeConstraint->new(
-        name                      => $spec,
-        _compiled_type_constraint => $check,
+        name      => $spec,
+        optimized => $check,
 
-        type                      => $type,
+        type      => $type,
     );
 }
 
 $TYPE{ArrayRef}{constraint_generator} = sub {
     my($type_parameter) = @_;
-    my $check = $type_parameter->{_compiled_type_constraint};
+    my $check = $type_parameter->_compiled_type_constraint;
 
     return sub{
         foreach my $value (@{$_}) {
@@ -316,7 +266,7 @@ $TYPE{ArrayRef}{constraint_generator} = sub {
 };
 $TYPE{HashRef}{constraint_generator} = sub {
     my($type_parameter) = @_;
-    my $check = $type_parameter->{_compiled_type_constraint};
+    my $check = $type_parameter->_compiled_type_constraint;
 
     return sub{
         foreach my $value(values %{$_}){
@@ -329,7 +279,7 @@ $TYPE{HashRef}{constraint_generator} = sub {
 # 'Maybe' type accepts 'Any', so it requires parameters
 $TYPE{Maybe}{constraint_generator} = sub {
     my($type_parameter) = @_;
-    my $check = $type_parameter->{_compiled_type_constraint};
+    my $check = $type_parameter->_compiled_type_constraint;
 
     return sub{
         return !defined($_) || $check->($_);
@@ -360,26 +310,18 @@ sub _find_or_create_parameterized_type{
     }
 }
 sub _find_or_create_union_type{
-    my @types              = map{ $_->{type_constraints} ? @{$_->{type_constraints}} : $_ } @_;
+    my @types = map{ $_->{type_constraints} ? @{$_->{type_constraints}} : $_ } @_;
 
     my $name = join '|', map{ $_->name } @types;
 
     $TYPE{$name} ||= do{
         warn "# CREATE a Union type for ", Mouse::Util::english_list(@types),"\n" if _DEBUG;
 
-        my $check = sub{
-            foreach my $type(@types){
-                return 1 if $type->check($_[0]);
-            }
-            return 0;
-        };
-
         return Mouse::Meta::TypeConstraint->new(
-            name                      => $name,
-            _compiled_type_constraint => $check,
-            type_constraints          => \@types,
+            name              => $name,
+            type_constraints  => \@types,
 
-            type                      => 'Union',
+            type              => 'Union',
         );
     };
 }
@@ -398,7 +340,7 @@ sub _parse_type{
         my $char = substr($spec, $i, 1);
 
         if($char eq '['){
-            my $base = _find_or_create_regular_type( substr($spec, $start, $i - $start))
+            my $base = _find_or_create_regular_type( substr($spec, $start, $i - $start) )
                 or return;
 
             ($i, $subtype) = _parse_type($spec, $i+1)
@@ -412,8 +354,12 @@ sub _parse_type{
             last;
         }
         elsif($char eq '|'){
-            my $type = _find_or_create_regular_type( substr($spec, $start, $i - $start))
-                or return;
+            my $type = _find_or_create_regular_type( substr($spec, $start, $i - $start) );
+
+            if(!defined $type){
+                # XXX: Mouse creates a new class type, but Moose does not.
+                $type = class_type( substr($spec, $start, $i - $start) );
+            }
 
             push @list, $type;
 
@@ -443,7 +389,7 @@ sub _parse_type{
 
 sub find_type_constraint {
     my($spec) = @_;
-    return $spec if blessed($spec);
+    return $spec if blessed($spec) && $spec->isa('Mouse::Meta::TypeConstraint');
 
     $spec =~ s/\s+//g;
     return $TYPE{$spec};
@@ -451,8 +397,7 @@ sub find_type_constraint {
 
 sub find_or_parse_type_constraint {
     my($spec) = @_;
-
-    return $spec if blessed($spec);
+    return $spec if blessed($spec) && $spec->isa('Mouse::Meta::TypeConstraint');
 
     $spec =~ s/\s+//g;
     return $TYPE{$spec} || do{
@@ -641,9 +586,13 @@ related C<eq_deeply> function.
 
 =head1 METHODS
 
-=head2 optimized_constraints -> HashRef[CODE]
+=head2 C<< list_all_builtin_type_constraints -> (Names) >>
+
+Returns the names of builtin type constraints.
+
+=head2 C<< list_all_type_constraints -> (Names) >>
 
-Returns the simple type constraints that Mouse understands.
+Returns the names of all the type constraints.
 
 =head1 FUNCTIONS