Perlito5 - perl6 - class definition in a block

Author: fglock

perlito5.pl

@@ -12217,9 +12217,26 @@ package Perlito5::AST::CompUnit;
     }
     sub Perlito5::AST::CompUnit::emit_perl6_program {
         my $comp_units = $_[0];
-        return(map {
+        my @body = @{$comp_units};
+        my @out;
+        my $pkg = {'name' => 'main', 'body' => []};
+        for my $stmt (@body) {
+            if (ref($stmt) eq 'Perlito5::AST::Apply' && $stmt->{'code'} eq 'package') {
+                push(@out, ['stmt' => ['keyword' => 'class'], ['bareword' => $pkg->{'name'}], ['block' => map {
+                    $_->emit_perl6()
+                } @{$pkg->{'body'}}]])
+                    if @{$pkg->{'body'}};
+                $pkg = {'name' => $stmt->{'namespace'}, 'body' => []}
+            }
+            else {
+                push(@{$pkg->{'body'}}, $stmt)
+            }
+        }
+        push(@out, ['stmt' => ['keyword' => 'class'], ['bareword' => $pkg->{'name'}], ['block' => map {
             $_->emit_perl6()
-        } @{$comp_units})
+        } @{$pkg->{'body'}}]])
+            if @{$pkg->{'body'}};
+        return(@out)
     }
 }
 package Perlito5::AST::Val::Int;

src5/lib/Perlito5/Perl6/Emitter.pm

@@ -99,7 +99,26 @@ package Perlito5::AST::CompUnit;
     }
     sub emit_perl6_program {
         my $comp_units = $_[0];
-        return  map { $_->emit_perl6() } @$comp_units;
+        my @body = @$comp_units;
+        my @out;
+        my $pkg = { name => 'main', body => [] };
+        for my $stmt (@body) {
+            if (ref($stmt) eq 'Perlito5::AST::Apply' && $stmt->{code} eq 'package') {
+                push @out, [ stmt => [ keyword => 'class'], [ bareword => $pkg->{name} ],
+                             [ block => map { $_->emit_perl6() } @{ $pkg->{body} } ]
+                           ]
+                    if @{ $pkg->{body} };
+                $pkg = { name => $stmt->{namespace}, body => [] };
+            }
+            else {
+                push @{ $pkg->{body} }, $stmt;
+            }
+        }
+        push @out, [ stmt => [ keyword => 'class'], [ bareword => $pkg->{name} ],
+                     [ block => map { $_->emit_perl6() } @{ $pkg->{body} } ]
+                   ]
+            if @{ $pkg->{body} };
+        return @out;
     }
 }