Perlito5 - perl5 - pretty-printer - slices

fglock · Oct 6, 2013 · 71da9bc · 71da9bc
1 parent 46c565c
commit 71da9bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -12250,7 +12250,7 @@ package Perlito5::AST::Index;
 {
     sub Perlito5::AST::Index::emit_perl5_2 {
         my $self = $_[0];
-        if (($self->{'obj'}->isa('Perlito5::AST::Var') && ($self->{'obj'}->sigil() eq '$'))) {
+        if (((($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<@>'))) || (($self->{'obj'}->isa('Perlito5::AST::Var') && ((($self->{'obj'}->sigil() eq '$') || ($self->{'obj'}->sigil() eq '@'))))))) {
             return ['apply', '[', $self->{'obj'}->emit_perl5_2(), $self->{'index_exp'}->emit_perl5_2()]
         };
         if (($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<$>'))) {
@@ -12263,7 +12263,7 @@ package Perlito5::AST::Lookup;
 {
     sub Perlito5::AST::Lookup::emit_perl5_2 {
         my $self = $_[0];
-        if (($self->{'obj'}->isa('Perlito5::AST::Var') && ($self->{'obj'}->sigil() eq '$'))) {
+        if (((($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<@>'))) || (($self->{'obj'}->isa('Perlito5::AST::Var') && ((($self->{'obj'}->sigil() eq '$') || ($self->{'obj'}->sigil() eq '@'))))))) {
             return ['apply', '{', $self->{'obj'}->emit_perl5_2(), $self->autoquote($self->{'index_exp'})->emit_perl5_2()]
         };
         if (($self->{'obj'}->isa('Perlito5::AST::Apply') && ($self->{'obj'}->{'code'} eq 'prefix:<$>'))) {

diff --git a/src5/lib/Perlito5/Perl5/Emitter2.pm b/src5/lib/Perlito5/Perl5/Emitter2.pm
@@ -66,8 +66,12 @@ package Perlito5::AST::Index;
 {
     sub emit_perl5_2 {
         my $self = $_[0];
-        if (  $self->{obj}->isa('Perlito5::AST::Var')
-           && $self->{obj}->sigil eq '$'
+        if (  (  $self->{obj}->isa('Perlito5::AST::Apply')
+              && $self->{obj}->{code} eq 'prefix:<@>'
+              )
+           || (  $self->{obj}->isa('Perlito5::AST::Var')
+              && ( $self->{obj}->sigil eq '$' || $self->{obj}->sigil eq '@' )
+              )
            )
         {
             return [ apply => '[', $self->{obj}->emit_perl5_2(), $self->{index_exp}->emit_perl5_2() ];
@@ -89,13 +93,16 @@ package Perlito5::AST::Lookup;
 {
     sub emit_perl5_2 {
         my $self = $_[0];
-        if (  $self->{obj}->isa('Perlito5::AST::Var')
-           && $self->{obj}->sigil eq '$'
+        if (  (  $self->{obj}->isa('Perlito5::AST::Apply')
+              && $self->{obj}->{code} eq 'prefix:<@>'
+              )
+           || (  $self->{obj}->isa('Perlito5::AST::Var')
+              && ( $self->{obj}->sigil eq '$' || $self->{obj}->sigil eq '@' )
+              )
            )
         {
             return [ apply => '{', $self->{obj}->emit_perl5_2(), $self->autoquote($self->{index_exp})->emit_perl5_2() ];
         }
-
         if (  $self->{obj}->isa('Perlito5::AST::Apply')
            && $self->{obj}->{code} eq 'prefix:<$>'
            )