Changeset 21203

Timestamp:

07/04/08 06:31:30 (5 months ago)

Author:

lwall

Message:

[STD] user-oriented message on detection of unless-else suggested by moritz++
[gimme5] a|b bug discovered by pmurias++

Location:

src/perl6

Files:

• STD.pm (modified) (2 diffs)
• gimme5 (modified) (2 diffs)

src/perl6/STD.pm

@@ -8 +8 @@
 # random rule for debugging, please ignore
 regex foo {
-   .*? X
+   a|b
 }
 
@@ -575 +575 @@
     <EXPR>                           {*}                        #= expr
     <pblock>                         {*}                        #= block
+    [ <!before 'else'> || <.panic: "unless does not take \"else\" in Perl 6; please rewrite using \"if\""> ]
     {*}
 }

src/perl6/gimme5

@@ -2300 +2300 @@
             }
             my $result = <<"END";
-do { my \@result = eval {
+do {
+  my \@result = eval {
     my \$trystate;
     my (\$C, \$tag, \$try, \$relex) = \$C->cursor_fate('${PKG}', '$altname', \$retree, \$trystate);
@@ -2338 +2339 @@
     }
     @gather;
-};
-return @result if @result;
-if ($@) {
+  };
+  if (@result) {
+    @result;
+  }
+  elsif ($@) {
     my ($first) = $@ =~ /(^.*)/;
     $self->deb("CAUGHT $first") if $::DEBUG & DEBUG::trace_call;
     die $@ if $@ !~ /^ABORTBRANCH/;
-}
-();
+    ();
+  }
+  else {
+    ();
+  }
 }
 END