Changeset 21600 for perl5

Timestamp:

07/28/08 22:20:34 (4 months ago)

Author:

fglock

Message:

[v6.pm] added bare sigils

Location:

perl5/Pugs-Compiler-Perl6/lib/Pugs

Files:

• Emitter/Perl6/Perl5.pm (modified) (1 diff)
• Grammar/Expression.pm (modified) (1 diff)
• Grammar/Term.pm (modified) (4 diffs)

perl5/Pugs-Compiler-Perl6/lib/Pugs/Emitter/Perl6/Perl5.pm

@@ -384 +384 @@
             map { exists $_->{null}
                 ? ()
+                : exists $_->{bare_sigil}
+                ? 'undef'
                 : _emit( $_ )
             } @{$n->{list}}

perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/Expression.pm

@@ -456 +456 @@
         $m = undef;
         if ( $m1 && $m2 ) {
-            if ( $m1->to < $m2->to ) {
+            if ( exists $m2->()->{bare_sigil} && $m2->tail =~ /^[\,\)]/ ) {
                 $m = $m2
             }
             else {
-                $m = $m1
+                if ( $m1->to < $m2->to ) {
+                    $m = $m2
+                }
+                else {
+                    $m = $m1
+                }
             }
         }

perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/Term.pm

@@ -276 +276 @@
                         },   
                   } 
+                | { return { bare_sigil => '$' ,} }
             ),
         '$.' => q(
@@ -315 +316 @@
                 <?Pugs::Grammar::Term.ident>
                 { return { array => "\@" . $_[0]->() ,} }
+            | { return { bare_sigil => '@' ,} }
             ),
         '::' => q(
@@ -335 +337 @@
                 <?Pugs::Grammar::Term.ident>
                 { return { hash  => "\%" . $_[0]->() ,} }
+              | { return { bare_sigil => '%' ,} }
             ),
         '%()' => q(
@@ -351 +354 @@
                 <?Pugs::Grammar::Term.ident>
                 { return { code  => "\&" . $_[0]->() ,} }
+              | { return { bare_sigil => '&' ,} }
             ),
         '(' => q(