Perlito5 - perl5 - fix emitted code for $$x[0]

fglock · Oct 4, 2012 · 805d42e · 805d42e
1 parent 414f594
commit 805d42e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -10695,6 +10695,9 @@ package Perlito5::AST::Index;
             ((my  $v) = $self->{'obj'});
             return (($v->emit_perl5($level) . '[' . $self->{'index_exp'}->emit_perl5() . ']'))
         };
+        if (($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<$>'))) {
+            return (($self->{'obj'}->{'arguments'}->[0]->emit_perl5($level) . '->[' . $self->{'index_exp'}->emit_perl5($level) . ']'))
+        };
         ($self->{'obj'}->emit_perl5($level) . '->[' . $self->{'index_exp'}->emit_perl5() . ']')
     }
 }};
@@ -10707,6 +10710,9 @@ package Perlito5::AST::Lookup;
             ((my  $v) = $self->{'obj'});
             return (($v->emit_perl5($level) . '{' . $self->autoquote($self->{'index_exp'})->emit_perl5($level) . '}'))
         };
+        if (($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<$>'))) {
+            return (($self->{'obj'}->{'arguments'}->[0]->emit_perl5($level) . '->{' . $self->autoquote($self->{'index_exp'})->emit_perl5($level) . '}'))
+        };
         ($self->{'obj'}->emit_perl5($level) . '->{' . $self->autoquote($self->{'index_exp'})->emit_perl5($level) . '}')
     }
 }};

diff --git a/src5/lib/Perlito5/Perl5/Emitter.pm b/src5/lib/Perlito5/Perl5/Emitter.pm
@@ -153,6 +153,14 @@ package Perlito5::AST::Index;
             return $v->emit_perl5($level) . '[' . $self->{index_exp}->emit_perl5() . ']';
         }
 
+        if (  $self->{obj}->isa('Perlito5::AST::Apply')
+           && $self->{obj}->{code} eq 'prefix:<$>'
+           )
+        {
+            # $$a[0] ==> $a->[0]
+            return $self->{obj}{arguments}[0]->emit_perl5($level) . '->[' . $self->{index_exp}->emit_perl5($level) . ']';
+        }
+
         $self->{obj}->emit_perl5($level) . '->[' . $self->{index_exp}->emit_perl5() . ']';
     }
 }
@@ -172,6 +180,14 @@ package Perlito5::AST::Lookup;
             return $v->emit_perl5($level) . '{' . $self->autoquote($self->{index_exp})->emit_perl5($level) . '}';
         }
 
+        if (  $self->{obj}->isa('Perlito5::AST::Apply')
+           && $self->{obj}->{code} eq 'prefix:<$>'
+           )
+        {
+            # $$a{0} ==> $a->{0}
+            return $self->{obj}{arguments}[0]->emit_perl5($level) . '->{' . $self->autoquote($self->{index_exp})->emit_perl5($level) . '}';
+        }
+
         $self->{obj}->emit_perl5($level) . '->{' . $self->autoquote($self->{index_exp})->emit_perl5($level) . '}';
     }
 }