Changeset 21606 for perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/Expression.pm

Timestamp:

07/29/08 11:36:12 (5 months ago)

Author:

fglock

Message:

[v6.pm] fixed bare_sigil

Files:

• perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/Expression.pm (modified) (2 diffs)

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

@@ -208 +208 @@
             $m2 = Pugs::Grammar::Quote->parse( $match, { p => $pos } )
                 unless $m2;
+                
+            my $cap = $m2->();
+            #print Dumper($cap);
+            if ( ref($cap) && exists $cap->{bare_sigil} ) {
+                unless (  $m2->tail =~ /^\s*[\,\)\}\]]/s 
+                       || $m2->tail =~ /^\s*$/s
+                       ) {
+                    undef $m2
+                }
+            }
+
         }
         # print "Lexer: m1 = " . Dumper($m1) . "m2 = " . Dumper($m2);
@@ -456 +467 @@
         $m = undef;
         if ( $m1 && $m2 ) {
-            if ( exists $m2->()->{bare_sigil} && $m2->tail =~ /^\s*[\,\)\}\]]/ ) {
-                $m = $m2
+            if ( exists $m2->()->{bare_sigil} ) {
+                if (  $m2->tail =~ /^\s*[\,\)\}\]]/s 
+                   || $m2->tail =~ /^\s*$/s
+                   ) {
+                    $m = $m2
+                }
+                else {
+                    $m = $m1
+                }
             }
             else {