revert jvm index semantics, plus new tests

Raku · Mar 9, 2015 · 986c397 · 986c397
1 parent 832c331
commit 986c397
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java
@@ -3548,17 +3548,14 @@ public static SixModelObject split(String delimiter, String string, ThreadContex
     }
 
     public static long indexfrom(String string, String pattern, long fromIndex) {
-        if (pattern.length() == 0) return -1;
         return string.indexOf(pattern, (int)fromIndex);
     }
 
     public static long rindexfromend(String string, String pattern) {
-        if (pattern.length() == 0) return -1;
         return string.lastIndexOf(pattern);
     }
 
     public static long rindexfrom(String string, String pattern, long fromIndex) {
-        if (pattern.length() == 0) return -1;
         return string.lastIndexOf(pattern, (int)fromIndex);
     }
 

diff --git a/t/nqp/59-nqpop.t b/t/nqp/59-nqpop.t
@@ -2,7 +2,7 @@
 
 # Test nqp::op pseudo-functions.
 
-plan(120);
+plan(126);
 
 
 ok( nqp::add_i(5,2) == 7, 'nqp::add_i');
@@ -27,7 +27,10 @@ ok( nqp::index('Hello World', 'l', 0) == 2, 'nqp::index with third argument, fir
 ok( nqp::index('Hello World', 'l', 2) == 2, 'nqp::index with third argument, first match (2)');
 ok( nqp::index('Hello World', 'l', 3) == 3, 'nqp::index with third argument, second match');
 ok( nqp::index('Hello World', 'l', 4) == 9, 'nqp::index with third argument, third match');
-ok( nqp::index('Hello World', '') == -1, 'nqp::index with empty match returns -1');
+ok( nqp::index('Hello World', '') == 0, 'nqp::index with empty match returns 0');
+ok( nqp::index('Hello World', '', 1) == 1, 'nqp::index with empty match at offset returns offset');
+ok( nqp::index('Hello World', '', 11) == 11, 'nqp::index with empty match at end returns length');
+ok( nqp::index('Hello World', '', 100) == -1, 'nqp::index with empty match at offset outside string returns -1');
 
 ok( nqp::rindex('rakudo', 'do') == 4, 'nqp::rindex found');
 ok( nqp::rindex('rakudo', 'dont') == -1, 'nqp::rindex not found');
@@ -37,7 +40,10 @@ ok( nqp::rindex('Hello World', 'l', 10) == 9, 'nqp::rindex with third argument,
 ok( nqp::rindex('Hello World', 'l', 9) == 9, 'nqp::rindex with third argument, first match (2)');
 ok( nqp::rindex('Hello World', 'l', 8) == 3, 'nqp::rindex with third argument, second match');
 ok( nqp::rindex('Hello World', 'l', 2) == 2, 'nqp::rindex with third argument, third match');
-ok( nqp::rindex('Hello World', '') == -1, 'nqp::rindex with empty match returns -1');
+ok( nqp::rindex('Hello World', '') == 11, 'nqp::rindex with empty match returns length');
+ok( nqp::rindex('Hello World', '', 1) == 1, 'nqp::rindex with empty match at offset returns offset');
+ok( nqp::rindex('Hello World', '', 11) == 11, 'nqp::rindex with empty match at end returns length');
+ok( nqp::index('Hello World', '', 100) == -1, 'nqp::rindex with empty match at offset outside string returns -1');
 
 ok( nqp::chr(120) eq 'x', 'nqp::chr');
 ok( nqp::ord('xyz') eq 120, 'nqp::ord');