STRING_ord takes chars, not bytes. local var thinko.

Raku · Oct 30, 2013 · 6421e06 · 6421e06
1 parent de1e094
commit 6421e06
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/vm/parrot/ops/nqp.ops b/src/vm/parrot/ops/nqp.ops
@@ -3744,19 +3744,18 @@ inline op nqp_string_equal_at(out INT, in STR, in STR, in INT) {
     String_iter hay_iter;
     String_iter needle_iter;
 
-    if (0 && ($3)->strlen == 1) {
-        STRING_ITER_INIT(interp, &hay_iter);
-        STRING_iter_skip(interp, $2, &hay_iter, offset);
-        $1 = (STRING_ord(interp, $3, 0) == STRING_ord(interp, $2, hay_iter.bytepos));
-    } else {
-        offset = (INTVAL)($4);
+    offset = (INTVAL)($4);
 
+    if (offset < 0) {
+        offset += ($2)->strlen;
         if (offset < 0) {
-            offset += ($2)->strlen;
-            if (offset < 0) {
-                offset = 0;
-            }
+            offset = 0;
         }
+    }
+
+    if (($3)->strlen == 1) {
+        $1 = (STRING_ord(interp, $3, 0) == STRING_ord(interp, $2, offset));
+    } else {
 
         if (($2)->encoding == ($3)->encoding) {
             STRING_ITER_INIT(interp, &hay_iter);