Merge pull request #25 from haarg/dict-tuple-warn

avoid warnings in Dict and Tuple types
tobyink · May 7, 2015 · 7a4c5f6 · 7a4c5f6
2 parents 4c980f8 + 249efe3
commit 7a4c5f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Types/Standard/Dict.pm b/lib/Types/Standard/Dict.pm
@@ -226,7 +226,7 @@ sub __coercion_generator
 				my $K = B::perlstring($k);
 
 				push @code, sprintf(
-					'if (exists $orig->{%s}) { $tmp = %s; (%s) ? ($new{%s}=$tmp) : ($return_orig=1 and last %s) }',
+					'if (exists $orig->{%s}) { $tmp = %s; (%s) ? ($new{%s}=$tmp) : (($return_orig=1), last %s) }',
 					$K,
 					$ct_coerce
 						? $ct->coercion->inline_coercion("\$orig->{$K}")

diff --git a/lib/Types/Standard/Tuple.pm b/lib/Types/Standard/Tuple.pm
@@ -247,7 +247,7 @@ sub __coercion_generator
 				my $ct_optional = $ct->is_a_type_of(Types::Standard::Optional);
 
 				push @code, sprintf(
-					'if (@$orig > %d) { $tmp = %s; (%s) ? ($new[%d]=$tmp) : ($return_orig=1 and last %s) }',
+					'if (@$orig > %d) { $tmp = %s; (%s) ? ($new[%d]=$tmp) : (($return_orig=1), last %s) }',
 					$i,
 					$ct_coerce
 						? $ct->coercion->inline_coercion("\$orig->[$i]")