Fixes #391 (#1534)

* Fixes #391 Add overload that takes a tuple * Add simple test * Fix typo
IronLanguages · Nov 6, 2016 · d1fe8f1 · d1fe8f1
1 parent 3e86f91
commit d1fe8f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Languages/IronPython/IronPython/Runtime/Operations/ArrayOps.cs b/Languages/IronPython/IronPython/Runtime/Operations/ArrayOps.cs
@@ -122,6 +122,12 @@ public static object GetItem(Array data, Slice slice) {
             return GetSlice(data, data.Length, slice);
         }
 
+        [SpecialName]
+        public static object GetItem(Array data, PythonTuple tuple) {
+            if (data == null) throw PythonOps.TypeError("expected Array, got None");
+            return GetItem(data, tuple.ToArray());
+        }
+
         [SpecialName]
         public static object GetItem(Array data, params object[] indices) {
             if (indices == null || indices.Length < 1) throw PythonOps.TypeError("__getitem__ requires at least 1 parameter");

diff --git a/Languages/IronPython/Tests/test_array.py b/Languages/IronPython/Tests/test_array.py
@@ -233,5 +233,10 @@ def silly(): a_multi[0:][1:0]
     type_helper(str, " ")
     type_helper(str, "abc")
 
+def test_tuple_indexer():
+    array1 = System.Array.CreateInstance(int, 20, 20)
+    array1[0,0] = 5
+    AreEqual(array1[0,0], array1[(0,0)])
+
 #--MAIN------------------------------------------------------------------------
 run_test(__name__)