Perlito5 - perl6 - sub cleanup

fglock · Oct 15, 2013 · c3c420e · c3c420e
1 parent 66a0327
commit c3c420e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -12812,7 +12812,10 @@ package Perlito5::AST::Sub;
             if defined($self->{'block'});
         return(['op' => 'prefix:<sub>', @parts])
             if !$self->{'name'};
-        return(['stmt' => ['keyword' => 'sub'], ['bareword' => $self->{'namespace'} . '::' . $self->{'name'}], @parts])
+        my $name = $self->{'name'};
+        $name = $self->{'namespace'} . '::' . $name
+            if $Perlito5::PKG_NAME ne $self->{'namespace'};
+        return(['stmt' => ['keyword' => 'sub'], ['bareword' => $name], @parts])
     }
 }
 package Perlito5::AST::Do;

diff --git a/src5/lib/Perlito5/Perl6/Emitter.pm b/src5/lib/Perlito5/Perl6/Emitter.pm
@@ -672,7 +672,12 @@ package Perlito5::AST::Sub;
         push @parts, Perlito5::Perl6::emit_perl6_block($self->{block})
             if defined $self->{block};
         return [ op => 'prefix:<sub>', @parts ] if !$self->{name};
-        return [ stmt => [ keyword => 'sub' ], [ bareword => $self->{namespace} . "::" . $self->{name} ], @parts ];
+
+        my $name = $self->{name};
+        $name = $self->{namespace} . "::" . $name
+            if $Perlito5::PKG_NAME ne $self->{namespace};
+
+        return [ stmt => [ keyword => 'sub' ], [ bareword => $name ], @parts ];
     }
 }