Perlito5 - perl5 emitter - grep, sort

fglock · fglock · commit 3fe28542cb1d · 2013-09-12T12:03:29.000+02:00
diff --git a/perlito5.pl b/perlito5.pl
@@ -11694,13 +11694,13 @@ package Perlito5::AST::Apply;
         if (($self->{'code'} eq 'package')) {
             return ('package ' . $self->{'namespace'})
         };
-        if (($code eq 'map')) {
+        if (((($code eq 'map') || ($code eq 'grep')) || ($code eq 'sort'))) {
             if ($self->{'special_arg'}) {
-                return ('map {' . chr(10) . join(';' . chr(10), map {
+                return ($code . ' {' . chr(10) . join(';' . chr(10), map {
                                 (Perlito5::Perl5::tab(($level + 1)) . $_->emit_perl5(($level + 1)))
                             } @{$self->{'special_arg'}->{'stmts'}}) . chr(10) . Perlito5::Perl5::tab($level) . '} ' . $self->emit_perl5_args(($level + 1)))
             };
-            return ('map(' . $self->emit_perl5_args(($level + 1)) . ')')
+            return ($code . '(' . $self->emit_perl5_args(($level + 1)) . ')')
         };
         if (($code eq 'infix:<x>')) {
             return ('join("", ' . join(' x ', map($_->emit_perl5(($level + 1)), @{$self->{'arguments'}})) . ')')
diff --git a/src5/lib/Perlito5/Perl5/Emitter.pm b/src5/lib/Perlito5/Perl5/Emitter.pm
@@ -373,18 +373,18 @@ package Perlito5::AST::Apply;
         }
         if ($self->{code} eq 'package')    { return 'package ' . $self->{namespace} }
 
-        if ($code eq 'map')       {    
+        if ($code eq 'map' || $code eq 'grep' || $code eq 'sort') {    
 
             if ( $self->{special_arg} ) {
                 # TODO - test 'special_arg' type (scalar, block, ...)
-                return "map {\n"
+                return "$code {\n"
                 .   join(";\n", map { Perlito5::Perl5::tab($level+1) . $_->emit_perl5( $level + 1 ) } @{$self->{special_arg}{stmts}} ) . "\n"
                 . Perlito5::Perl5::tab($level) . "} "
     
                 . $self->emit_perl5_args($level+1);
             }
 
-            return 'map(' . $self->emit_perl5_args($level+1) . ')'
+            return "$code(" . $self->emit_perl5_args($level+1) . ')'
         }
 
         if ($code eq 'infix:<x>')  { 

Original file line number	Diff line number	Diff line change
`@@ -373,18 +373,18 @@ package Perlito5::AST::Apply;`
`373`	`373`	`}`
`374`	`374`	`if ($self->{code} eq 'package') { return 'package ' . $self->{namespace} }`
`375`	`375`
`376`		`- if ($code eq 'map') {`
	`376`	`+ if ($code eq 'map' \|\| $code eq 'grep' \|\| $code eq 'sort') {`
`377`	`377`
`378`	`378`	`if ( $self->{special_arg} ) {`
`379`	`379`	`# TODO - test 'special_arg' type (scalar, block, ...)`
`380`		`- return "map {\n"`
	`380`	`+ return "$code {\n"`
`381`	`381`	`. join(";\n", map { Perlito5::Perl5::tab($level+1) . $_->emit_perl5( $level + 1 ) } @{$self->{special_arg}{stmts}} ) . "\n"`
`382`	`382`	`. Perlito5::Perl5::tab($level) . "} "`
`383`	`383`
`384`	`384`	`. $self->emit_perl5_args($level+1);`
`385`	`385`	`}`
`386`	`386`
`387`		`- return 'map(' . $self->emit_perl5_args($level+1) . ')'`
	`387`	`+ return "$code(" . $self->emit_perl5_args($level+1) . ')'`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if ($code eq 'infix:<x>') {`