Unicode index() now considers the last character. Fixes dop251#59.

profer · Jan 2, 2018 · 034fb74 · 034fb74
1 parent f24d0f0
commit 034fb74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/runtime_test.go b/runtime_test.go
@@ -185,12 +185,10 @@ func TestIndexOf(t *testing.T) {
 
 func TestUnicodeIndexOf(t *testing.T) {
 	const SCRIPT = `
-
-	"абвгд".indexOf("вг", 1)
-
+	"абвгд".indexOf("вг", 1) === 2 && '中国'.indexOf('国') === 1
 	`
 
-	testScript1(SCRIPT, intToValue(2), t)
+	testScript1(SCRIPT, valueTrue, t)
 }
 
 func TestLastIndexOf(t *testing.T) {

diff --git a/string_unicode.go b/string_unicode.go
@@ -236,7 +236,7 @@ func (s unicodeString) index(substr valueString, start int64) int64 {
 
 	// TODO: optimise
 	end := int64(len(s) - len(ss))
-	for start < end {
+	for start <= end {
 		for i := int64(0); i < int64(len(ss)); i++ {
 			if s[start+i] != ss[i] {
 				goto nomatch