fixed conflicts

Author: FROGGS

S03-smartmatch/any-hash.t

@@ -9,15 +9,12 @@ plan 6;
     sub notautoquoted_a { 'a' };
     sub notautoquoted_c { 'c' };
 
-    #?rakudo todo 'nom regression'
     #?niecza todo
     ok  (%h ~~ .{'c'}),     '%hash ~~ .{true"}';
     ok !(%h ~~ .{'b'}),     '%hash ~~ .{false"}';
     ok !(%h ~~ .{notautoquoted_a}), '~~. {notautoquoted_a}';
-    #?rakudo todo 'nom regression'
     #?niecza todo
     ok  (%h ~~ .{notautoquoted_c}), '~~. {notautoquoted_c}';
-    #?rakudo todo 'nom regression'
     #?niecza todo
     ok  (%h ~~ .<c>),     '%hash ~~ .<true"}';
     ok !(%h ~~ .<b>),     '%hash ~~ .<false"}';

S03-smartmatch/array-array.t

@@ -12,67 +12,51 @@ plan 36;
     ok(!([1] ~~ []), "array smartmatch boundary conditions");
     ok(([] ~~ []), "array smartmatch boundary conditions");
     ok(([1] ~~ [1]), "array smartmatch boundary conditions");
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*), 'array smartmatch dwims * at end');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*,*), 'array smartmatch dwims * at end (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,4), 'array smartmatch dwims * at start');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,*,4), 'array smartmatch dwims * at start (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*,3,4), 'array smartmatch dwims * 1 elem');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*,*,3,4), 'array smartmatch dwims * 1 elem (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*,4), 'array smartmatch dwims * many elems');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,*,*,4), 'array smartmatch dwims * many elems (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,3,*), 'array smartmatch dwims * at start and end');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,*,3,*,*), 'array smartmatch dwims * at start and end (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,1,2,3,4), 'array smartmatch dwims * can match nothing at start');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (*,*,1,2,3,4), 'array smartmatch dwims * can match nothing at start (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,2,*,3,4), 'array smartmatch dwims * can match nothing in middle');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,2,*,*,3,4), 'array smartmatch dwims * can match nothing in middle (many *s)');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,2,3,4,*), 'array smartmatch dwims * can match nothing at end');
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok((1,2,3,4) ~~ (1,2,3,4,*,*), 'array smartmatch dwims * can match nothing at end (many *s)');
@@ -88,13 +72,11 @@ plan 36;
     ok (@a ~~  @a), 'Basic smartmatching on arrays (positive)';
     ok (@a !~~ @b), 'Basic smartmatching on arrays (negative)';
     ok (@b !~~ @a), 'Basic smartmatching on arrays (negative)';
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok (@a ~~  @m), 'Whatever dwimminess in arrays';
     ok (@a ~~ (1, 2, 3)), 'smartmatch Array ~~ List';
     ok ((1, 2, 3) ~~ @a), 'smartmatch List ~~ Array';
-    #?rakudo todo 'nom regression'
     #?niecza todo
     #?pugs todo
     ok ((1, 2, 3) ~~ @m), 'smartmatch List ~~ Array with dwim';

S04-statements/gather.t

@@ -141,7 +141,7 @@ plan 28;
         'take with multiple arguments .flat tens out';
 }
 
-#?rakudo skip 'nom regression (loops)'
+#?rakudo skip 'RT #117635 (infinite loop)'
 {
     my sub grep-div(@a, $n) {
         gather for @a {

S11-modules/require.t

@@ -7,6 +7,7 @@ plan 11;
 
 lives_ok { require "t/spec/S11-modules/InnerModule.pm"; },
          'can load InnerModule from a path at run time';
+#?pugs skip 'parsefail'
 is GLOBAL::InnerModule::EXPORT::DEFAULT::<&bar>(), 'Inner::bar', 'can call our-sub from required module';
 
 my $name = 't/spec/S11-modules/InnerModule.pm';

S32-io/io-path.t

@@ -1,13 +1,22 @@
 use v6;
 use Test;
 
-plan 6;
+plan 12;
 
 my $path = '/foo/bar.txt'.path;
-isa_ok $path, IO::Path;
-is $path.directory, '/foo', 'directory';
-is $path.basename, 'bar.txt', 'basename';
+isa_ok $path, IO::Path, "Str.path returns an IO::Path";
+#?rakudo 1 try '.volume NYI'
+is $path.volume,    '',        'volume';
+is $path.directory, '/foo',    'directory';
+is $path.basename,  'bar.txt', 'basename';
+#?rakudo 2 try '.parent NYI'
+is $path.parent,    '/foo',    'parent';
+is $path.parent.parent, '/',   'parent of parent';
+#?rakudo 2 try '.is-absolute, .is-relative NYI'
+is $path.is-absolute, True,    'is-absolute';
+is $path.is-relative, False,   'is-relative';
 
-is '/'.path.path, '/', '.path.path roundtrips';
-is '///.'.path.path, '///.', '... even for weird cases';
-is 'foo.bar'.path.path, 'foo.bar', 'roundtrips for base names only';
+isa_ok $path.path, IO::Path, 'IO::Path.path returns IO::Path';
+is '/'.path.Str,        '/',       '.path.Str roundtrips';
+is '///.'.path.Str,     '///.',    '... even for weird cases';
+is 'foo/bar'.path.Str,  'foo/bar', 'roundtrips entire path';

S32-list/map_function_return_values.t

@@ -9,7 +9,6 @@ my %ret;
 
 # XXX depends on the Pair stringification which is likely going to change
 
-#?rakudo skip "Awaiting p6l clarification on Hash composer/block"
 {
     %ret = map { $_ => uc $_; }, $text.comb;
     is ~%ret.sort, "a\tA b\tB c\tC", "=> works in a map block";

S32-num/stringify.t

@@ -74,7 +74,6 @@ Rat_str_test 1/1, '1/1', '1', '1.0';
 Rat_str_test 13/39, '1/3', '0.333333', '<1/3>';
 Rat_str_test 1000001/10000, '1000001/10000', '100.0001';
 Rat_str_test -1000001/10000, '-1000001/10000', '-100.0001';
-#?rakudo skip 'big stuff'
 Rat_str_test 555555555555555555555555555555555555555555555/5,
              '555555555555555555555555555555555555555555555/5',
              '111111111111111111111111111111111111111111111',