Skip to content

Commit

Permalink
Fix for RT#86239
Browse files Browse the repository at this point in the history
  • Loading branch information
tobyink committed Jun 18, 2013
1 parent fdae079 commit 5541857
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 6 deletions.
14 changes: 8 additions & 6 deletions lib/Types/Standard.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1246,9 +1246,10 @@ $lib->get_type("Dict")->{coercion_generator} = sub
{
push @code, sprintf('%%tmp = (); $tmp{x} = %s;', $ct->coercion->inline_coercion("\$orig->{$K}"));
push @code, sprintf(
$ct_optional
? 'if (%s) { $new{%s}=$tmp{x} }'
: 'if (%s) { $new{%s}=$tmp{x} } else { $return_orig = 1; last %s }',
# $ct_optional
# ? 'if (%s) { $new{%s}=$tmp{x} }'
# :
'if (%s) { $new{%s}=$tmp{x} } else { $return_orig = 1; last %s }',
$ct->inline_check('$tmp{x}'),
$K,
$label,
Expand All @@ -1257,9 +1258,10 @@ $lib->get_type("Dict")->{coercion_generator} = sub
else
{
push @code, sprintf(
$ct_optional
? 'if (%s) { $new{%s}=$orig->{%s} }'
: 'if (%s) { $new{%s}=$orig->{%s} } else { $return_orig = 1; last %s }',
# $ct_optional
# ? 'if (%s) { $new{%s}=$orig->{%s} }'
# :
'if (%s) { $new{%s}=$orig->{%s} } else { $return_orig = 1; last %s }',
$ct->inline_check("\$orig->{$K}"),
$K,
$K,
Expand Down
64 changes: 64 additions & 0 deletions t/rt86239.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
=pod
=encoding utf-8
=head1 PURPOSE
Fix: Optional constraints ignored if wrapped in Dict.
=head1 SEE ALSO
L<https://rt.cpan.org/Ticket/Display.html?id=86239>.
=head1 AUTHOR
Vyacheslav Matyukhin E<lt>mmcleric@cpan.orgE<gt>.
(Minor changes by Toby Inkster E<lt>tobyink@cpan.orgE<gt>.)
=head1 COPYRIGHT AND LICENCE
This software is copyright (c) 2013 by Vyacheslav Matyukhin.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
=cut

use strict;
use warnings;

use Test::More;
use Test::Fatal;
use Type::Params qw(validate compile);
use Types::Standard qw(ArrayRef Dict Optional Str);

my $i = 0;
sub announce { note sprintf("Test %d ########", ++$i) }
sub got { note "got: " . join ", ", explain(@_) }

sub f {
announce();
got validate(
\@_,
Optional[Str],
);
}

is exception { f("foo") }, undef;
is exception { f() }, undef;
like exception { f(["abc"]) }, qr/type constraint/;

sub g {
announce();
got validate(
\@_,
Dict[foo => Optional[Str]],
);
}

is exception { g({ foo => "foo" }) }, undef;
is exception { g({}) }, undef;
like exception { g({ foo => ["abc"] }) }, qr/type constraint/;

done_testing;

0 comments on commit 5541857

Please sign in to comment.