Perlito5 - perl6 - while; <>

fglock · Oct 15, 2013 · 3ce38e5 · 3ce38e5
1 parent 2120983
commit 3ce38e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -12643,6 +12643,9 @@ package Perlito5::AST::Apply;
         if (($code eq 'shift' || $code eq 'pop') && !@{$self->{'arguments'}}) {
             return(['apply' => '(', $code, '@_'])
         }
+        if ($code eq 'glob' && ref($self->{'arguments'}->[0]) eq 'Perlito5::AST::Val::Buf' && $self->{'arguments'}->[0]->{'buf'} eq '') {
+            return(['apply' => '(', ['keyword' => 'lines']])
+        }
         if ($code eq 'infix:<x>') {
             my $arg = $self->{'arguments'}->[0];
             if (ref($arg) eq 'Perlito5::AST::Apply' && $arg->{'code'} eq 'circumfix:<( )>') {
@@ -12745,7 +12748,7 @@ package Perlito5::AST::When;
 {
     sub Perlito5::AST::When::emit_perl6 {
         my $self = $_[0];
-        return(['stmt' => ['keyword' => 'when'], ['paren' => '(', $self->{'cond'}->emit_perl6()], Perlito5::Perl6::emit_perl6_block($self->{'body'}->stmts())])
+        return(['stmt' => ['keyword' => 'when'], $self->{'cond'}->emit_perl6(), Perlito5::Perl6::emit_perl6_block($self->{'body'}->stmts())])
     }
 }
 package Perlito5::AST::While;
@@ -12758,7 +12761,7 @@ package Perlito5::AST::While;
         if ($self->{'body'} && ref($self->{'body'}) ne 'Perlito5::AST::Lit::Block') {
             return(@out, ['stmt_modifier' => $self->{'body'}->emit_perl6(), ['stmt' => ['keyword' => 'while'], $self->{'cond'}->emit_perl6()]])
         }
-        push(@out, ['stmt' => ['keyword' => 'while'], ['paren' => '(', $self->{'cond'}->emit_perl6()], Perlito5::Perl6::emit_perl6_block($self->{'body'}->stmts())]);
+        push(@out, ['stmt' => ['keyword' => 'while'], $self->{'cond'}->emit_perl6(), Perlito5::Perl6::emit_perl6_block($self->{'body'}->stmts())]);
         if ($self->{'continue'} && @{$self->{'continue'}->{'stmts'}}) {
             push(@out, ['stmt' => ['keyword' => 'continue'], Perlito5::Perl6::emit_perl6_block($self->{'continue'}->{'stmts'})])
         }

diff --git a/src5/lib/Perlito5/Perl6/Emitter.pm b/src5/lib/Perlito5/Perl6/Emitter.pm
@@ -417,6 +417,14 @@ package Perlito5::AST::Apply;
             # TODO - @ARGV instead of @_ depending on context
             return [ apply => '(', $code, '@_' ];
         }
+        if (  $code eq 'glob' 
+           && ref($self->{arguments}[0]) eq 'Perlito5::AST::Val::Buf'
+           && $self->{arguments}[0]{buf} eq ''
+           )
+        {
+            # TODO - glob or <> depending on context
+            return [ apply => '(', [ keyword => 'lines' ], ];
+        }
 
         if ($code eq 'infix:<x>' ) {
             my $arg   = $self->{arguments}->[0];
@@ -554,7 +562,7 @@ package Perlito5::AST::When;
     sub emit_perl6 {
         my $self = $_[0];
         return [ stmt => [ keyword => 'when' ],
-                 [ paren => '(', $self->{cond}->emit_perl6() ],
+                 $self->{cond}->emit_perl6(),
                  Perlito5::Perl6::emit_perl6_block($self->{body}->stmts)
                ];
     }
@@ -574,7 +582,7 @@ package Perlito5::AST::While;
                                       [ stmt => [ keyword => 'while' ], $self->{cond}->emit_perl6() ] ];
         }
         push @out, [ stmt => [ keyword => 'while' ],
-                     [ paren => '(', $self->{cond}->emit_perl6() ],
+                     $self->{cond}->emit_perl6(),
                      Perlito5::Perl6::emit_perl6_block($self->{body}->stmts)
                    ];
         if ($self->{continue} && @{ $self->{continue}{stmts} }) {