Minor optimizations for Type::Params

Author: tobyink

lib/Type/Params/Parameter.pm

@@ -354,6 +354,9 @@ sub _make_code {
 	elsif ( $constraint->{uniq} == Any->{uniq} ) {
 		$coderef->add_line( '1; # ... nothing to do' );
 	}
+	elsif ( $args{is_slurpy} and $self->_dont_validate_slurpy ) {
+		$coderef->add_line( '1; # ... nothing to do' );
+	}
 	elsif ( $constraint->can_be_inlined ) {
 		$coderef->add_line( $strictness_test . sprintf(
 			"%s\n\tor %s;",
@@ -428,6 +431,28 @@ sub _make_code {
 	$self;
 }
 
+# This list can be reused safely.
+my @uniqs;
+
+# If $SLURPY is one of a handful of very loose type constraints, there is
+# no need to validate it because we built it as a hashref or arrayref ourself,
+# so there's no way it couldn't be a hashref or arrayref.
+sub _dont_validate_slurpy {
+	my $self = shift;
+	my $type = $self->type or return 1;
+	if ( not @uniqs ) {
+		@uniqs = map { $_->{uniq} }
+			Slurpy,
+			Slurpy[Any],      Any,
+			Slurpy[Item],     Item,
+			Slurpy[Ref],      Ref,
+			Slurpy[HashRef],  HashRef,
+			Slurpy[ArrayRef], ArrayRef;
+	}
+	( $_ == $type->{uniq} and return 1 ) for @uniqs;
+	return 0;
+}
+
 1;
 
 __END__

lib/Type/Params/Signature.pm

@@ -775,6 +775,7 @@ sub _coderef_slurpy {
 		input_slot  => '$SLURPY',
 		display_var => '$SLURPY',
 		index       => 0,
+		is_slurpy   => 1,
 		$self->is_named
 			? ( output_slot => sprintf( '$out{%s}', B::perlstring( $parameter->name ) ) )
 			: ( output_var  => '@out' )
@@ -829,7 +830,7 @@ sub _coderef_end {
 	}
 
 	$self->_coderef_end_extra( $coderef );
-	$coderef->add_line( $self->_make_return_expression( is_early => 0 ) . ';' );
+	$coderef->add_line( $self->_make_return_expression( is_early => 0, allow_full_statements => 1 ) . ';' );
 	$coderef->{indent} =~ s/\t$//;
 	$coderef->add_line( '}' );
 
@@ -892,9 +893,13 @@ sub _make_return_expression {
 		elsif ( $list eq '@_' ) {
 			return sprintf 'goto( $__NEXT__ )';
 		}
+		elsif ( $args{allow_full_statements} and not ( $args{is_early} or not exists $args{is_early} ) ) {
+			# We are allowed to return full statements, not
+			# forced to use do {...} to make an expression.
+			return sprintf '@_ = ( %s ); goto $__NEXT__', $list;
+		}
 		else {
-			return sprintf 'do { @_ = ( %s ); goto $__NEXT__ }',
-				$list;
+			return sprintf 'do { @_ = ( %s ); goto $__NEXT__ }', $list;
 		}
 	}
 	elsif ( $args{is_early} or not exists $args{is_early} ) {