X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FTypeConstraint.pm;h=aa4e9fc292343f753f5e0f99e115b2606269b4b8;hp=3d2f19525096dc636fa2260ee1879d93709da100;hb=eed39dffe505fa8df062e315c23c1fbe36f9c95b;hpb=5a363f78184c2c5ab4eeeaec0cf2dba9487f0d8e

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 3d2f195..aa4e9fc 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -1,154 +1,105 @@
 package Mouse::Meta::TypeConstraint;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
-use overload
-    'bool'   => sub { 1 },             # always true
-
-    '""'     => sub { $_[0]->name },   # stringify to tc name
-
-    '|'      => sub {                  # or-combination
-        require Mouse::Util::TypeConstraints;
-        return Mouse::Util::TypeConstraints::find_or_parse_type_constraint(
-            "$_[0] | $_[1]",
-        );
-    },
-
-    fallback => 1;
-
-use Carp         ();
-
-my $null_check = sub { 1 };
-
 sub new {
-    my($class, %args) = @_;
+    my $class = shift;
+    my %args  = @_ == 1 ? %{$_[0]} : @_;
 
     $args{name} = '__ANON__' if !defined $args{name};
 
-    my $check = delete $args{optimized};
-
-    if($args{_compiled_type_constraint}){
-        Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead")
-            if _MOUSE_VERBOSE;
-
-        $check = $args{_compiled_type_constraint};
+    my $type_parameter;
+    if(defined $args{parent}) { # subtyping
+        %args = (%{$args{parent}}, %args);
+
+        # a child type must not inherit 'compiled_type_constraint'
+        # and 'hand_optimized_type_constraint' from the parent
+        delete $args{compiled_type_constraint};       # don't inherit it
+        delete $args{hand_optimized_type_constraint}; # don't inherit it
+
+        $type_parameter = $args{type_parameter};
+        if(defined(my $parent_tp = $args{parent}{type_parameter})) {
+            if($parent_tp != $type_parameter) {
+                $type_parameter->is_a_type_of($parent_tp)
+                    or $class->throw_error(
+                        "$type_parameter is not a subtype of $parent_tp",
+                    );
+            }
+        }
     }
 
-    if($check){
+    my $check;
+
+    if($check = delete $args{optimized}) { # likely to be builtins
         $args{hand_optimized_type_constraint} = $check;
         $args{compiled_type_constraint}       = $check;
     }
-
-    $check = $args{constraint};
+    elsif(defined $type_parameter) { # parameterizing
+        my $generator = $args{constraint_generator}
+            || $class->throw_error(
+                  "The $args{name} constraint cannot be used,"
+                . " because $type_parameter doesn't subtype"
+                . " from a parameterizable type");
+
+        my $parameterized_check = $generator->($type_parameter);
+        if(defined(my $my_check = $args{constraint})) {
+            $check = sub {
+                return $parameterized_check->($_) && $my_check->($_);
+            };
+        }
+        else {
+            $check = $parameterized_check;
+        }
+        $args{constraint} = $check;
+    }
+    else { # common cases
+        $check = $args{constraint};
+    }
 
     if(defined($check) && ref($check) ne 'CODE'){
-        Carp::confess("Constraint for $args{name} is not a CODE reference");
+        $class->throw_error(
+            "Constraint for $args{name} is not a CODE reference");
     }
 
-    $args{package_defined_in} ||= caller;
-
     my $self = bless \%args, $class;
-    $self->compile_type_constraint() if !$self->{hand_optimized_type_constraint};
+    $self->compile_type_constraint()
+        if !$args{hand_optimized_type_constraint};
 
-    if($self->{type_constraints}){ # Union
-        my @coercions;
-        foreach my $type(@{$self->{type_constraints}}){
-            if($type->has_coercion){
-                push @coercions, $type;
-            }
-        }
-        if(@coercions){
-            $self->{_compiled_type_coercion} = sub {
-                my($thing) = @_;
-                foreach my $type(@coercions){
-                    my $value = $type->coerce($thing);
-                    return $value if $self->check($value);
-                }
-                return $thing;
-            };
-        }
+    if($args{type_constraints}) {
+        $self->_compile_union_type_coercion();
     }
-
     return $self;
 }
 
-sub create_child_type{
+sub create_child_type {
     my $self = shift;
-    # XXX: FIXME
-    return ref($self)->new(
-        # a child inherits its parent's attributes
-        %{$self},
-
-        # but does not inherit 'compiled_type_constraint' and 'hand_optimized_type_constraint'
-        compiled_type_constraint       => undef,
-        hand_optimized_type_constraint => undef,
-
-        # and is given child-specific args, of course.
-        @_,
-
-        # and its parent
-        parent => $self,
-   );
+    return ref($self)->new(@_, parent => $self);
 }
 
+sub name;
+sub parent;
+sub message;
+sub has_coercion;
 
-sub compile_type_constraint{
-    my($self) = @_;
+sub check;
 
-    # add parents first
-    my @checks;
-    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
-         if($parent->{hand_optimized_type_constraint}){
-            unshift @checks, $parent->{hand_optimized_type_constraint};
-            last; # a hand optimized constraint must include all the parents
-        }
-        elsif($parent->{constraint}){
-            unshift @checks, $parent->{constraint};
-        }
-    }
+sub type_parameter;
+sub __is_parameterized;
 
-    # then add child
-    if($self->{constraint}){
-        push @checks, $self->{constraint};
-    }
+sub _compiled_type_constraint;
+sub _compiled_type_coercion;
 
-    if($self->{type_constraints}){ # Union
-        my @types = map{ $_->_compiled_type_constraint } @{ $self->{type_constraints} };
-        push @checks, sub{
-            foreach my $c(@types){
-                return 1 if $c->($_[0]);
-            }
-            return 0;
-        };
-    }
+sub compile_type_constraint;
 
-    if(@checks == 0){
-        $self->{compiled_type_constraint} = $null_check;
-    }
-    elsif(@checks == 1){
-        my $c = $checks[0];
-        $self->{compiled_type_constraint} = sub{
-            my(@args) = @_;
-            local $_ = $args[0];
-            return $c->(@args);
-        };
-    }
-    else{
-        $self->{compiled_type_constraint} =  sub{
-            my(@args) = @_;
-            local $_ = $args[0];
-            foreach my $c(@checks){
-                return undef if !$c->(@args);
-            }
-            return 1;
-        };
-    }
-    return;
-}
 
-sub _add_type_coercions{
+sub _add_type_coercions { # ($self, @pairs)
     my $self = shift;
 
-    my $coercions = ($self->{_coercion_map} ||= []);
+    if(exists $self->{type_constraints}){ # union type
+        $self->throw_error(
+            "Cannot add additional type coercions to Union types '$self'");
+    }
+
+    my $coercions = ($self->{coercion_map} ||= []);
     my %has       = map{ $_->[0] => undef } @{$coercions};
 
     for(my $i = 0; $i < @_; $i++){
@@ -156,47 +107,68 @@ sub _add_type_coercions{
         my $action = $_[++$i];
 
         if(exists $has{$from}){
-            Carp::confess("A coercion action already exists for '$from'");
+            $self->throw_error("A coercion action already exists for '$from'");
         }
 
         my $type = Mouse::Util::TypeConstraints::find_or_parse_type_constraint($from)
-            or Carp::confess("Could not find the type constraint ($from) to coerce from");
+            or $self->throw_error(
+                "Could not find the type constraint ($from) to coerce from");
 
         push @{$coercions}, [ $type => $action ];
     }
 
-    # compile
-    if(exists $self->{type_constraints}){ # union type
-        Carp::confess("Cannot add additional type coercions to Union types");
+    $self->_compile_type_coercion();
+    return;
+}
+
+sub _compile_type_coercion {
+    my($self) = @_;
+
+    my @coercions = @{$self->{coercion_map}};
+
+    $self->{_compiled_type_coercion} = sub {
+       my($thing) = @_;
+       foreach my $pair (@coercions) {
+            #my ($constraint, $converter) = @$pair;
+            if ($pair->[0]->check($thing)) {
+              local $_ = $thing;
+              return $pair->[1]->($thing);
+            }
+       }
+       return $thing;
+    };
+    return;
+}
+
+sub _compile_union_type_coercion {
+    my($self) = @_;
+
+    my @coercions;
+    foreach my $type(@{$self->{type_constraints}}){
+        if($type->has_coercion){
+            push @coercions, $type;
+        }
     }
-    else{
+    if(@coercions){
         $self->{_compiled_type_coercion} = sub {
-           my($thing) = @_;
-           foreach my $pair (@{$coercions}) {
-                #my ($constraint, $converter) = @$pair;
-                if ($pair->[0]->check($thing)) {
-                  local $_ = $thing;
-                  return $pair->[1]->($thing);
-                }
-           }
-           return $thing;
+            my($thing) = @_;
+            foreach my $type(@coercions){
+                my $value = $type->coerce($thing);
+                return $value if $self->check($value);
+            }
+            return $thing;
         };
     }
     return;
 }
 
-sub check {
-    my $self = shift;
-    return $self->_compiled_type_constraint->(@_);
-}
-
 sub coerce {
     my $self = shift;
+    return $_[0] if $self->check(@_);
 
-    return $_[0] if $self->_compiled_type_constraint->(@_);
-
-    my $coercion = $self->_compiled_type_coercion;
-    return $coercion ? $coercion->(@_) : $_[0];
+    my $coercion = $self->{_compiled_type_coercion}
+        or $self->throw_error("Cannot coerce without a type coercion");
+    return  $coercion->(@_);
 }
 
 sub get_message {
@@ -206,12 +178,17 @@ sub get_message {
         return $msg->($value);
     }
     else {
-        $value = ( defined $value ? overload::StrVal($value) : 'undef' );
-        return "Validation failed for '$self' failed with value $value";
+        if(not defined $value) {
+            $value = 'undef';
+        }
+        elsif( ref($value) && defined(&overload::StrVal) ) {
+            $value = overload::StrVal($value);
+        }
+        return "Validation failed for '$self' with value $value";
     }
 }
 
-sub is_a_type_of{
+sub is_a_type_of {
     my($self, $other) = @_;
 
     # ->is_a_type_of('__ANON__') is always false
@@ -222,20 +199,20 @@ sub is_a_type_of{
     return 1 if $self->name eq $other_name;
 
     if(exists $self->{type_constraints}){ # union
-        foreach my $type(@{$self->{type_constraints}}){
+        foreach my $type(@{$self->{type_constraints}}) {
             return 1 if $type->name eq $other_name;
         }
     }
 
-    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
-        return 1 if $parent->name eq $other_name;
+    for(my $p = $self->parent; defined $p; $p = $p->parent) {
+        return 1 if $p->name eq $other_name;
     }
 
     return 0;
 }
 
 # See also Moose::Meta::TypeConstraint::Parameterizable
-sub parameterize{
+sub parameterize {
     my($self, $param, $name) = @_;
 
     if(!ref $param){
@@ -244,17 +221,30 @@ sub parameterize{
     }
 
     $name ||= sprintf '%s[%s]', $self->name, $param->name;
+    return Mouse::Meta::TypeConstraint->new(
+        name           => $name,
+        parent         => $self,
+        type_parameter => $param,
+    );
+}
 
-    my $generator = $self->{constraint_generator}
-        || Carp::confess("The $name constraint cannot be used, because $param doesn't subtype from a parameterizable type");
+sub assert_valid {
+    my ($self, $value) = @_;
 
-    return Mouse::Meta::TypeConstraint->new(
-        name        => $name,
-        parent      => $self,
-        parameter   => $param,
-        constraint  => $generator->($param), # must be 'constraint', not 'optimized'
+    if(!$self->check($value)){
+        $self->throw_error($self->get_message($value));
+    }
+    return 1;
+}
 
-        type        => 'Parameterized',
+sub _as_string { $_[0]->name                  } # overload ""
+sub _identity;                                  # overload 0+
+
+sub _unite { # overload infix:<|>
+    my($lhs, $rhs) = @_;
+    require Mouse::Util::TypeConstraints;
+    return Mouse::Util::TypeConstraints::find_or_parse_type_constraint(
+       " $lhs | $rhs",
     );
 }
 
@@ -267,25 +257,42 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_03
+This document describes Mouse version 0.81
 
 =head1 DESCRIPTION
 
-For the most part, the only time you will ever encounter an
-instance of this class is if you are doing some serious deep
-introspection. This API should not be considered final, but
-it is B<highly unlikely> that this will matter to a regular
-Mouse user.
-
-Don't use this.
+This class represents a type constraint, including built-in
+type constraints, union type constraints, parameterizable/
+parameterized type constraints, as well as custom type
+constraints
 
 =head1 METHODS
 
-=over 4
+=over
+
+=item C<< Mouse::Meta::TypeConstraint->new(%options) >>
+
+=item C<< $constraint->name >>
+
+=item C<< $constraint->parent >>
+
+=item C<< $constraint->constraint >>
+
+=item C<< $constraint->has_coercion >>
+
+=item C<< $constraint->message >>
+
+=item C<< $constraint->is_a_type_of($name or $object) >>
+
+=item C<< $constraint->coerce($value) >>
+
+=item C<< $constraint->check($value) >>
+
+=item C<< $constraint->assert_valid($value) >>
 
-=item B<new>
+=item C<< $constraint->get_message($value) >>
 
-=item B<name>
+=item C<< $constraint->create_child_type(%options) >>
 
 =back