Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:perl6/roast
  • Loading branch information
dagurval committed May 10, 2013
2 parents 899d9a7 + 1b01fdd commit 7057702
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions S04-declarations/our.t
Expand Up @@ -67,23 +67,23 @@ our $c = 42; #OK not used
eval_dies_ok('$d1', 'our() variable not yet visible outside its package');
}

#?rakudo 4 todo 'RT #100560, #102876'
# RT #100560, #102876
{
lives_ok { our @e1 = 1..3 }, 'we can declare and initialize an our-scoped array';
lives_ok { our %e2 = a => 1 }, 'we can declare and initialize an our-scoped hash';
is(@OUR::e1[1], 2, 'our-scoped array has correct value' );
is(%OUR::e2<a>, 1, 'our-scoped hash has correct value' );
}

#?rakudo 2 todo 'RT #117083'
# RT #117083
{
our @f1;
our %f2;
ok(@f1 ~~ Array, 'our-declared @-sigil var is an Array');
ok(%f2 ~~ Hash, 'our-declared %-sigil var is a Hash');
}

#?rakudo 2 todo 'RT #117775'
# RT #117775
{
package Gee {
our $msg;
Expand Down
8 changes: 4 additions & 4 deletions S05-capture/caps.t
Expand Up @@ -55,12 +55,12 @@ is ca($0.chunks), '~:a|0:b|~:c', '.chunks on submatches';

# RT117831 separator captures
ok 'a;b,c,' ~~ m/(<.alpha>) +% (<.punct>)/, 'Regex matches';
is ca($/.caps), '0:a|1:;|0:b|1:,|0:c', '.caps on submatches';
is ca($/.chunks), '0:a|1:;|0:b|1:,|0:c', '.chunks on submatches';
is ca($/.caps), '0:a|1:;|0:b|1:,|0:c', '.caps on % separator';
is ca($/.chunks), '0:a|1:;|0:b|1:,|0:c', '.chunks on % separator';

ok 'a;b,c,' ~~ m/(<.alpha>) +%% (<.punct>)/, 'Regex matches';
is ca($/.caps), '0:a|1:;|0:b|1:,|0:c|1:,', '.caps on submatches';
is ca($/.chunks), '0:a|1:;|0:b|1:,|0:c|1:,', '.chunks on submatches';
is ca($/.caps), '0:a|1:;|0:b|1:,|0:c|1:,', '.caps on %% separator';
is ca($/.chunks), '0:a|1:;|0:b|1:,|0:c|1:,', '.chunks on %% separator';

done;

Expand Down
1 change: 1 addition & 0 deletions S05-mass/properties-general.t
Expand Up @@ -23,6 +23,7 @@ plan 596;
ok 'a' ~~ /<:L>/, 'a is a letter';
# RT #117889
nok '' ~~ /<:L>/, 'empty string has no letter';
#?pugs todo
ok("\x[846D]" ~~ m/^<:L>$/, q{Match <:L> (Letter)} );
ok(!( "\x[846D]" ~~ m/^<:!L>$/ ), q{Don't match negated <L> (Letter)} );
ok(!( "\x[846D]" ~~ m/^<-:L>$/ ), q{Don't match inverted <L> (Letter)} );
Expand Down

0 comments on commit 7057702

Please sign in to comment.