Perlito5 - integrate Perlito5/Grammar/Print.pm - indirect syntax for print

Author: fglock

src5/lib/Perlito5/Emitter/Token.pm

@@ -264,7 +264,10 @@ sub closure { $_[0]->{closure} }
 sub emit_perl5 {
     my $self = $_[0];
 
-    '(do { ' . $self->{closure} . '; 1 })'
+    '(do { ' 
+        . '$MATCH->{str} = $str; '
+        . $self->{closure} 
+        . '; 1 })'
 }
 sub set_captures_to_array {
     my $self = $_[0];

src5/lib/Perlito5/Grammar.pm

@@ -7,6 +7,7 @@ use Perlito5::Grammar::Sigil;
 use Perlito5::Grammar::Use;
 use Perlito5::Grammar::Block;
 use Perlito5::Grammar::Space;
+use Perlito5::Grammar::Print;
 
 sub word {
     substr( $_[1], $_[2], 1 ) =~ m/\w/

src5/lib/Perlito5/Grammar/Print.pm

@@ -15,40 +15,51 @@ token the_object {
     [
         <before '$'> <Perlito5::Grammar::Sigil.term_sigil>
             <!before '+'>
-            <.Perlito5::Grammar::Space.opt_ws>
             {
                 $MATCH->{capture} = Perlito5::Match::flat($MATCH->{'Perlito5::Grammar::Sigil.term_sigil'})->[1];
             }
     |
         '{' <Perlito5::Expression.curly_parse> '}'
-            <.Perlito5::Grammar::Space.opt_ws>
-            <!before ','>
             {
                 $MATCH->{capture} = Perlito5::Match::flat($MATCH->{'Perlito5::Expression.curly_parse'});
             }
     |
         <typeglob>
-            <.Perlito5::Grammar::Space.opt_ws>
-            <!before ','>
             {
                 $MATCH->{capture} = Perlito5::Match::flat($MATCH->{'typeglob'});
             }
     ]
 
     {
-        my $s = substr($MATCH->{str}, $MATCH->{to}, 1);
-        if ( $s eq ',' ) {
+        my $pos = $MATCH->{to};
+        my $m = Perlito5::Grammar::Space->ws($MATCH->{str}, $pos);
+        $pos = $m->{to} if $m;
+
+        my $s = substr($MATCH->{str}, $pos, 1);
+        my $s2 = substr($MATCH->{str}, $pos, 2);
+
+        # print Perlito5::Dumper::Dumper $MATCH;
+        # print "after: $MATCH->{capture} $pos '$MATCH->{str}' '$s' '$s2'\n";
+
+        if (  $s eq ',' 
+           || $s eq '?'
+           || $s2 eq '->' 
+           || $s eq '[' 
+           || $s eq '{' 
+           || $s eq '(' 
+           ) 
+        {
             return
         }
         if ( $s eq '+' ) {
-            my $m = Perlito5::Grammar::Space->ws($MATCH->{str}, $MATCH->{to} + 1);
+            my $m = Perlito5::Grammar::Space->ws($MATCH->{str}, $pos + 1);
             if ($m) {
                 return 
             }
             # print "space + non-space\n";
         }
         else {
-            my $m = Perlito5::Precedence->op_parse($MATCH->{str}, $MATCH->{to}, 1);
+            my $m = Perlito5::Precedence->op_parse($MATCH->{str}, $pos, 1);
             my $next_op = $m ? Perlito5::Match::flat($m)->[1] : '';
             my $is_infix = Perlito5::Precedence::is_fixity_type('infix', $next_op);
             # print "is_infix $is_infix '$next_op'\n";

t5/01-perlito/05-for-global.t

@@ -0,0 +1,9 @@
+use feature 'say';
+use strict;
+
+say '1..2';
+my @a = ( 1, 2 );
+for my $v (@a) {
+    say 'ok ' . $v . ' - loop';
+}
+