Merge branch 'str-index' of github.com:xbe/micropython into xbe-str-index

2 files changed, 156 insertions, 0 deletions

diff --git a/tests/basics/string_index.py b/tests/basics/string_index.py
new file mode 100644
index 0000000000..31f6900e6c
--- /dev/null
+++ b/tests/basics/string_index.py
@@ -0,0 +1,78 @@
+print("hello world".index("ll"))
+print("hello world".index("ll", None))
+print("hello world".index("ll", 1))
+print("hello world".index("ll", 1, None))
+print("hello world".index("ll", None, None))
+print("hello world".index("ll", 1, -1))
+
+try:
+    print("hello world".index("ll", 1, 1))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("hello world".index("ll", 1, 2))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("hello world".index("ll", 1, 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+print("hello world".index("ll", 1, 4))
+print("hello world".index("ll", 1, 5))
+print("hello world".index("ll", -100))
+print("0000".index('0'))
+print("0000".index('0', 0))
+print("0000".index('0', 1))
+print("0000".index('0', 2))
+print("0000".index('0', 3))
+
+try:
+    print("0000".index('0', 4))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".index('0', 5))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".index('-1', 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".index('1', 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".index('1', 4))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".index('1', 5))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
diff --git a/tests/basics/string_rindex.py b/tests/basics/string_rindex.py
new file mode 100644
index 0000000000..25acd37f6f
--- /dev/null
+++ b/tests/basics/string_rindex.py
@@ -0,0 +1,78 @@
+print("hello world".rindex("ll"))
+print("hello world".rindex("ll", None))
+print("hello world".rindex("ll", 1))
+print("hello world".rindex("ll", 1, None))
+print("hello world".rindex("ll", None, None))
+print("hello world".rindex("ll", 1, -1))
+
+try:
+    print("hello world".rindex("ll", 1, 1))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("hello world".rindex("ll", 1, 2))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("hello world".rindex("ll", 1, 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+print("hello world".rindex("ll", 1, 4))
+print("hello world".rindex("ll", 1, 5))
+print("hello world".rindex("ll", -100))
+print("0000".rindex('0'))
+print("0000".rindex('0', 0))
+print("0000".rindex('0', 1))
+print("0000".rindex('0', 2))
+print("0000".rindex('0', 3))
+
+try:
+    print("0000".rindex('0', 4))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".rindex('0', 5))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".rindex('-1', 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".rindex('1', 3))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".rindex('1', 4))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
+try:
+    print("0000".rindex('1', 5))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")