Perlito5 - perl6 - my sub

fglock · Oct 15, 2013 · 890d83b · 890d83b
1 parent 68a48a3
commit 890d83b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -12811,12 +12811,20 @@ package Perlito5::AST::Sub;
             if defined($self->{'block'});
         return(['op' => 'prefix:<sub>', @parts])
             if !$self->{'name'};
+        my $is_our = 1;
+        $is_our = 0
+            if $self->{'decl'} eq 'my';
         my $name = $self->{'name'};
         if ($Perlito5::PKG_NAME ne $self->{'namespace'}) {
             $name = $self->{'namespace'} . '::' . $name;
+            $is_our = 0
+        }
+        if ($is_our) {
+            return(['stmt' => ['keyword' => 'our'], ['keyword' => 'sub'], ['bareword' => $name], @parts])
+        }
+        else {
             return(['stmt' => ['keyword' => 'sub'], ['bareword' => $name], @parts])
         }
-        return(['stmt' => ['keyword' => 'our'], ['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
@@ -678,14 +678,21 @@ package Perlito5::AST::Sub;
             if defined $self->{block};
         return [ op => 'prefix:<sub>', @parts ] if !$self->{name};
 
-        # TODO - 'my' subroutines
+        my $is_our = 1; # our is default in perl5
+        $is_our = 0 if $self->{decl} eq 'my';
 
         my $name = $self->{name};
         if ( $Perlito5::PKG_NAME ne $self->{namespace} ) {
             $name = $self->{namespace} . "::" . $name;
+            $is_our = 0;
+        }
+
+        if ($is_our) {
+            return [ stmt => [ keyword => 'our' ], [ keyword => 'sub' ], [ bareword => $name ], @parts ];
+        }
+        else {
             return [ stmt => [ keyword => 'sub' ], [ bareword => $name ], @parts ];
         }
-        return [ stmt => [ keyword => 'our' ], [ keyword => 'sub' ], [ bareword => $name ], @parts ];
     }
 }