Perlito5 - perl6 - our sub

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

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -12813,9 +12813,11 @@ package Perlito5::AST::Sub;
         return(['op' => 'prefix:<sub>', @parts])
             if !$self->{'name'};
         my $name = $self->{'name'};
-        $name = $self->{'namespace'} . '::' . $name
-            if $Perlito5::PKG_NAME ne $self->{'namespace'};
-        return(['stmt' => ['keyword' => 'sub'], ['bareword' => $name], @parts])
+        if ($Perlito5::PKG_NAME ne $self->{'namespace'}) {
+            $name = $self->{'namespace'} . '::' . $name;
+            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
@@ -673,11 +673,14 @@ package Perlito5::AST::Sub;
             if defined $self->{block};
         return [ op => 'prefix:<sub>', @parts ] if !$self->{name};
 
-        my $name = $self->{name};
-        $name = $self->{namespace} . "::" . $name
-            if $Perlito5::PKG_NAME ne $self->{namespace};
+        # TODO - 'my' subroutines
 
-        return [ stmt => [ keyword => 'sub' ], [ bareword => $name ], @parts ];
+        my $name = $self->{name};
+        if ( $Perlito5::PKG_NAME ne $self->{namespace} ) {
+            $name = $self->{namespace} . "::" . $name;
+            return [ stmt => [ keyword => 'sub' ], [ bareword => $name ], @parts ];
+        }
+        return [ stmt => [ keyword => 'our' ], [ keyword => 'sub' ], [ bareword => $name ], @parts ];
     }
 }