Skip to content
Browse files

Fix build and one of the test files

  • Loading branch information...
1 parent 9e66671 commit bf9cf97406df530c1e5aca3284f81ef5023feb69 @tadzik tadzik committed Aug 5, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 lib/Yapsi.pm
  2. +1 −1 t/compiler.t
View
4 lib/Yapsi.pm
@@ -25,7 +25,7 @@ grammar Yapsi::Perl6::Grammar {
{ push @blockstack,
FUTURE::Block.new( :name(unique-block()) ) }
<.ws> <statementlist> <.ws> '}' }
- regex statementlist { <statement> ** <eat_terminator> }
+ regex statementlist { <statement> +% <eat_terminator> }
token statement { <statement_control> || <expression> || '' }
# RAKUDO: <?after '}'> NYRI [perl #76894]
regex eat_terminator { <?{ $/.CURSOR.pos > 0
@@ -144,7 +144,7 @@ sub traverse-top-down(Match $m, :$key = "TOP", :&action, :@skip) {
next if $key eq any @skip;
given $m{$key} {
when Match { traverse-top-down($_, :$key, :&action, :@skip) }
- when Array { traverse-top-down($_, :$key, :&action, :@skip)
+ when Positional { traverse-top-down($_, :$key, :&action, :@skip)
for .list }
default { die "Unknown thing $_.WHAT() in parse tree!" }
}
View
2 t/compiler.t
@@ -88,7 +88,7 @@ for @programs-that-don't-compile -> $pair { # '
$c.compile($program);
$can-compile = True;
}
- ok !$can-compile && defined $!.index($expected-error),
+ ok !$can-compile && $!.Str.index($expected-error).defined,
"'{escape $program}' gives error '$expected-error'";
}

0 comments on commit bf9cf97

Please sign in to comment.
Something went wrong with that request. Please try again.