Merge pull request shadow-dot-cat#15 from zmughal/13-postderef-direct…

…-access PostfixDeref: direct dereference
zmughal · Sep 2, 2022 · 09ddf2e · 09ddf2e
2 parents 00862db + 7a839b8
commit 09ddf2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/Babble/Plugin/PostfixDeref.pm b/lib/Babble/Plugin/PostfixDeref.pm
@@ -121,7 +121,7 @@ sub transform_to_plain {
       my $stripped = $1;
       if ($stripped =~ /(\$\#?)\*$/) {
         my $sigil = $1;
-        $term = '(map '.$sigil.'$_, '.$term.')[0]';
+        $term = $sigil.'{'.$term.'}';
         if( $interpolate ) {
           $term = "\@{[ $term ]}";
         }
@@ -132,7 +132,7 @@ sub transform_to_plain {
     if ($postfix) {
       my ($sigil, $rest) = ($postfix =~ /^\s*->\s*([\@%])(.*)$/);
       $rest = '' if $rest eq '*';
-      $term = '(map '.$sigil.'{$_}'.$rest.', '.$term.')';
+      $term = $sigil.'{'.$term.'}'.$rest;
       if( $interpolate ) {
         # NOTE This can be interpolated safely
         # because:

diff --git a/t/plugin-postfixderef.t b/t/plugin-postfixderef.t
@@ -7,29 +7,29 @@ my $pd = Babble::Plugin::PostfixDeref->new;
 
 my @cand = (
   [ 'my $x = $foo->$*; my @y = $bar->baz->@*;',
-    'my $x = (map $$_, $foo)[0]; my @y = (map @{$_}, $bar->baz);' ],
+    'my $x = ${$foo}; my @y = @{$bar->baz};' ],
   [ 'my $x = ($foo->bar->$*)->baz->@*;',
-    'my $x = (map @{$_}, ((map $$_, $foo->bar)[0])->baz);' ],
+    'my $x = @{(${$foo->bar})->baz};' ],
   [ 'my @val = $foo->@{qw(key names)};',
-    'my @val = (map @{$_}{qw(key names)}, $foo);' ],
+    'my @val = @{$foo}{qw(key names)};' ],
   [ 'my $val = $foo[0];',
     'my $val = $foo[0];' ],
   [ 'my $val = $foo[$idx];',
     'my $val = $foo[$idx];' ],
   [ '$bar->{key0}{key1}',
     '$bar->{key0}{key1}' ],
   [ '$bar->{key0}{key1}->@*',
-    '(map @{$_}, $bar->{key0}{key1})' ],
+    '@{$bar->{key0}{key1}}' ],
   [ '$bar->{key0}{key1}->@[@idx]',
-    '(map @{$_}[@idx], $bar->{key0}{key1})' ],
+    '@{$bar->{key0}{key1}}[@idx]' ],
   [ 'my %val = $foo->%[@idx];',
-    'my %val = (map %{$_}[@idx], $foo);' ],
+    'my %val = %{$foo}[@idx];' ],
   [ 'my %val = $foo->%{qw(key names)};',
-    'my %val = (map %{$_}{qw(key names)}, $foo);' ],
+    'my %val = %{$foo}{qw(key names)};' ],
   [ 'qq{ $foo->@* }',
-    'qq{ @{[ (map @{$_}, $foo) ]} }' ],
+    'qq{ @{[ @{$foo} ]} }' ],
   [ 'qq{ $foo->@{qw(key names)} }',
-    'qq{ @{[ (map @{$_}{qw(key names)}, $foo) ]} }' ],
+    'qq{ @{[ @{$foo}{qw(key names)} ]} }' ],
 
   [ 'qq{ $foo }',
     'qq{ $foo }' ],
@@ -39,15 +39,15 @@ my @cand = (
   [ 'qq{ $foo->%* }',
     'qq{ $foo->%* }' ],
   [ 'qq{ $foo->%* $bar->@* }',
-    'qq{ $foo->%* @{[ (map @{$_}, $bar) ]} }' ],
+    'qq{ $foo->%* @{[ @{$bar} ]} }' ],
 
   [ 'qq{ $foo->$* }',
-    'qq{ @{[ (map $$_, $foo)[0] ]} }' ],
+    'qq{ @{[ ${$foo} ]} }' ],
 
   [ '$foo->$#*',
-    '(map $#$_, $foo)[0]' ],
+    '$#{$foo}' ],
   [ 'qq{ $foo->$#* }',
-    'qq{ @{[ (map $#$_, $foo)[0] ]} }' ],
+    'qq{ @{[ $#{$foo} ]} }' ],
 );
 
 foreach my $cand (@cand) {