Merge pull request shadow-dot-cat#14 from zmughal/definedor-assign-pr…

…ecedence

DefinedOr: operator precedence for assignment + ConditionalExpression

lib/Babble/Plugin/DefinedOr.pm

@@ -29,7 +29,7 @@ sub transform_to_plain {
     my ($before, $after) = $m->subtexts(qw(before after));
     s/^\s+//, s/\s+$// for ($before, $after);
     if ($m->submatches->{op}->text =~ /=$/) {
-      $after = '$_ = '.$after;
+      $after = '($_ = '.$after.')';
     }
     $m->replace_text('(map +(defined($_) ? $_ : '.$after.'), '.$before.')[0]');
   };
@@ -39,9 +39,9 @@ sub transform_to_plain {
     [ after => '(?>(?&PerlPrefixPostfixTerm))' ],
   ] => $tf);
   $top->each_match_within(Assignment => [
-    [ before => '(?>(?&PerlPrefixPostfixTerm))' ],
+    [ before => '(?>(?&PerlConditionalExpression))' ],
     [ op => '(?>(?&PerlOWS) //=)' ], '(?>(?&PerlOWS))',
-    [ after => '(?>(?&PerlPrefixPostfixTerm))' ],
+    [ after => '(?>(?&PerlConditionalExpression))' ],
   ] => $tf);
 }
 

t/plugin-definedor.t

@@ -9,13 +9,15 @@ my @cand = (
   [ 'my $x = $y // $z;',
     'my $x = (map +(defined($_) ? $_ : $z), $y)[0];', ],
   [ 'my $x = ($y //= $z);',
-    'my $x = ((map +(defined($_) ? $_ : $_ = $z), $y)[0]);', ],
+    'my $x = ((map +(defined($_) ? $_ : ($_ = $z)), $y)[0]);', ],
   [ 'my $x; my $y = 3; $x //= $y; say $x;',
     'my $x; my $y = 3; defined($_) or $_ = $y for $x; say $x;', ],
   [ 'my $x; my $y = 3; $x //= $y if $z; say $x;',
     'my $x; my $y = 3; do { defined($_) or $_ = $y for $x } if $z; say $x;', ],
   [ 'sub foo { return $x // 3 }',
     'sub foo { return (map +(defined($_) ? $_ : 3), $x)[0] }', ],
+  [ '$lhs ? $i : $j //= $rhs ? $x : $y',
+    '(map +(defined($_) ? $_ : ($_ = $rhs ? $x : $y)), $lhs ? $i : $j)[0]', ],
 );
 
 foreach my $cand (@cand) {