rollback some stuff to reset my brain a bit

[gitmo/MooseX-Types-Structured.git] / lib / MooseX / Meta / TypeConstraint / Structured / Positional.pm

diff --git a/lib/MooseX/Meta/TypeConstraint/Structured/Positional.pm b/lib/MooseX/Meta/TypeConstraint/Structured/Positional.pm
index 115e25a..d29ed46 100644 (file)
--- a/lib/MooseX/Meta/TypeConstraint/Structured/Positional.pm
+++ b/lib/MooseX/Meta/TypeConstraint/Structured/Positional.pm
@@ -94,8 +94,8 @@ sub constraint {
     return sub {
         my @args = $self->_normalize_args(shift);
         my @signature = @{$self->signature};
-        my @optional_signature = @{$self->optional_signature}
-         if $self->has_optional_signature;
+               my @optional_signature = @{$self->optional_signature}
+               if $self->has_optional_signature; 
         
         ## First make sure all the required type constraints match        
         while( my $type_constraint = shift @signature) {
@@ -106,10 +106,13 @@ sub constraint {
         
         ## Now test the option type constraints.
         while( my $arg = shift @args) {
-            my $optional_type_constraint = shift @optional_signature;
-            if(my $error = $optional_type_constraint->validate($arg)) {
-                confess $error;
-            }              
+            if(my $optional_type_constraint = shift @optional_signature) {
+                if(my $error = $optional_type_constraint->validate($arg)) {
+                    confess $error;
+                }                              
+            } else {
+                confess "Too Many arguments for the available type constraints";
+            }
         }
         
         ## If we got this far we passed!
@@ -117,33 +120,6 @@ sub constraint {
     };
 }
 
-=head2 parse_parameter_str ($str)
-
-Given a $string that is the parameter information part of a parameterized
-constraint, parses it for internal constraint information.  For example:
-
-       MyType[Int,Int,Str]
-
-has a parameter string of "Int,Int,Str" (whitespace will automatically be 
-removed during normalization that happens in L<Moose::Util::TypeConstraints>)
-and we need to convert that to ['Int','Int','Str'] which then has any type
-constraints converted to true objects.
-
-=cut
-
-{
-    my $comma = qr{,};
-    my $indirection = qr{=>};
-    my $divider_ops = qr{ $comma | $indirection }x;
-    my $structure_divider = qr{\s* $divider_ops \s*}x;
-
-       sub parse_parameter_str {
-               my ($class, $type_str) = @_;
-               my @type_strs = split($structure_divider, $type_str);
-               return map { Moose::Util::TypeConstraints::find_or_create_isa_type_constraint($_) } @type_strs;
-       }
-}
-
 =head2 signature_equals
 
 Check that the signature equals another signature.