lib: fix a bug with String::has_substring and related methods

Signed-off-by: Jean-Sebastien Gelinas <calestar@gmail.com>
Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/lib/standard/string.nit b/lib/standard/string.nit
index 20d0c9e..46f8422 100644 (file)
--- a/lib/standard/string.nit
+++ b/lib/standard/string.nit
@@ -72,10 +72,10 @@ special AbstractArrayRead[Char]
                var myitems = _items
                var itsitems = str._items
                if myindex > length or itsindex > myindex  then return false
-               while itsindex > 0 do
+               while itsindex >= 0 do
                        if myitems[myindex] != itsitems[itsindex] then return false
-                       myindex -= myindex
-                       itsindex -= itsindex
+                       myindex -= 1
+                       itsindex -= 1
                end
                return true
        end

diff --git a/tests/sav/test_substring.sav b/tests/sav/test_substring.sav
index 580b7ed..f40c047 100644 (file)
--- a/tests/sav/test_substring.sav
+++ b/tests/sav/test_substring.sav
@@ -7,3 +7,39 @@ has_prefix: true
 has_prefix: false
 has_suffix: true
 has_suffix: false
+test[0] == 't' => true
+test[1] == 'e' => true
+test[2] == 's' => true
+test[3] == 't' => true
+test.substring(0,1) == "t" => true
+test.substring(0,2) == "te" => true
+test.substring(0,3) == "tes" => true
+test.substring(0,4) == "test" => true
+test.has_substring("t", 0) => true
+test.has_substring("te", 0) => true
+test.has_substring("tes", 0) => true
+test.has_substring("test", 0) => true
+test.has_substring("e", 1) => true
+test.has_substring("es", 1) => true
+test.has_substring("est", 1) => true
+test.has_substring("s", 2) => true
+test.has_substring("st", 2) => true
+test.has_substring("t", 3) => true
+test.has_substring("z", 3) => false
+test.has_substring("ze", 0) => false
+test.has_substring("bas", 0) => false
+test.has_substring("foot", 0) => false
+test.has_prefix("t") => true
+test.has_prefix("te") => true
+test.has_prefix("tes") => true
+test.has_prefix("test") => true
+test.has_prefix("ze") => false
+test.has_prefix("bas") => false
+test.has_prefix("foot") => false
+test.has_suffix("t") => true
+test.has_suffix("st") => true
+test.has_suffix("est") => true
+test.has_suffix("test") => true
+test.has_suffix("bt") => false
+test.has_suffix("bat") => false
+test.has_suffix("foot") => false

diff --git a/tests/test_substring.nit b/tests/test_substring.nit
index ba8fdeb..28eb4f3 100644 (file)
--- a/tests/test_substring.nit
+++ b/tests/test_substring.nit
@@ -2,6 +2,7 @@
 #
 # Copyright 2006 Floréal Morandat <morandat@lirmm.fr>
 # Copyright 2008 Jean Privat <jean@pryen.org>
+# Copyright 2009 Jean-Sebastien Gelinas <calestar@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,3 +31,47 @@ print("has_prefix: {s.has_prefix(p)}")
 print("has_prefix: {s.has_prefix(e)}")
 print("has_suffix: {s.has_suffix(e)}")
 print("has_suffix: {s.has_suffix(p)}")
+
+var test = "test"
+
+print("test[0] == 't' => {test[0] == 't'}")
+print("test[1] == 'e' => {test[1] == 'e'}")
+print("test[2] == 's' => {test[2] == 's'}")
+print("test[3] == 't' => {test[3] == 't'}")
+
+print("test.substring(0,1) == \"t\" => {test.substring(0,1) == "t"}")
+print("test.substring(0,2) == \"te\" => {test.substring(0,2) == "te"}")
+print("test.substring(0,3) == \"tes\" => {test.substring(0,3) == "tes"}")
+print("test.substring(0,4) == \"test\" => {test.substring(0,4) == "test"}")
+
+print("test.has_substring(\"t\", 0) => {test.has_substring("t", 0)}")
+print("test.has_substring(\"te\", 0) => {test.has_substring("te", 0)}")
+print("test.has_substring(\"tes\", 0) => {test.has_substring("tes", 0)}")
+print("test.has_substring(\"test\", 0) => {test.has_substring("test", 0)}")
+print("test.has_substring(\"e\", 1) => {test.has_substring("e", 1)}")
+print("test.has_substring(\"es\", 1) => {test.has_substring("es", 1)}")
+print("test.has_substring(\"est\", 1) => {test.has_substring("est", 1)}")
+print("test.has_substring(\"s\", 2) => {test.has_substring("s", 2)}")
+print("test.has_substring(\"st\", 2) => {test.has_substring("st", 2)}")
+print("test.has_substring(\"t\", 3) => {test.has_substring("t", 3)}")
+print("test.has_substring(\"z\", 3) => {test.has_substring("z", 3)}")
+print("test.has_substring(\"ze\", 0) => {test.has_substring("ze", 0)}")
+print("test.has_substring(\"bas\", 0) => {test.has_substring("bas", 0)}")
+print("test.has_substring(\"foot\", 0) => {test.has_substring("foot", 0)}")
+
+print("test.has_prefix(\"t\") => {test.has_prefix("t")}")
+print("test.has_prefix(\"te\") => {test.has_prefix("te")}")
+print("test.has_prefix(\"tes\") => {test.has_prefix("tes")}")
+print("test.has_prefix(\"test\") => {test.has_prefix("test")}")
+print("test.has_prefix(\"ze\") => {test.has_prefix("ze")}")
+print("test.has_prefix(\"bas\") => {test.has_prefix("bas")}")
+print("test.has_prefix(\"foot\") => {test.has_prefix("foot")}")
+
+print("test.has_suffix(\"t\") => {test.has_suffix("t")}")
+print("test.has_suffix(\"st\") => {test.has_suffix("st")}")
+print("test.has_suffix(\"est\") => {test.has_suffix("est")}")
+print("test.has_suffix(\"test\") => {test.has_suffix("test")}")
+print("test.has_suffix(\"bt\") => {test.has_suffix("bt")}")
+print("test.has_suffix(\"bat\") => {test.has_suffix("bat")}")
+print("test.has_suffix(\"foot\") => {test.has_suffix("foot")}")
+