From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 8 Sep 2010 07:21:19 +0000 (+0200)
Subject: infer type of slices for some builtin types
X-Git-Tag: 0.14.alpha0~345
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93ade469f511d129ee91cd68635b69944dc0707c;p=cython.git

infer type of slices for some builtin types
---

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index bbabac28..d12f48a8 100755
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -1942,8 +1942,12 @@ class IndexNode(ExprNode):
         return self.base.type_dependencies(env)
     
     def infer_type(self, env):
+        is_slice = isinstance(self.index, SliceNode)
         if isinstance(self.base, BytesNode):
-            return py_object_type
+            if is_slice:
+                return bytes_type
+            else:
+                return py_object_type # Py2/3 return different types
         base_type = self.base.infer_type(env)
         if base_type.is_ptr or base_type.is_array:
             return base_type.base_type
@@ -1957,7 +1961,10 @@ class IndexNode(ExprNode):
             # on a subsequent PyObject coercion.
             return PyrexTypes.c_py_unicode_type
         elif base_type in (str_type, unicode_type):
-            # these types will always return themselves on Python indexing
+            # these types will always return their own type on Python indexing/slicing
+            return base_type
+        elif is_slice and base_type in (bytes_type, list_type, tuple_type):
+            # slicing these returns the same type
             return base_type
         else:
             # TODO: Handle buffers (hopefully without too much redundancy).
diff --git a/tests/run/type_inference.pyx b/tests/run/type_inference.pyx
index c567c128..49549871 100644
--- a/tests/run/type_inference.pyx
+++ b/tests/run/type_inference.pyx
@@ -68,10 +68,14 @@ def slicing():
     assert typeof(L) == "list object", typeof(L)
     L1 = L[1:2]
     assert typeof(L1) == "list object", typeof(L1)
+    L2 = L[1:2:2]
+    assert typeof(L2) == "list object", typeof(L2)
     t = (4,5,6)
     assert typeof(t) == "tuple object", typeof(t)
     t1 = t[1:2]
     assert typeof(t1) == "tuple object", typeof(t1)
+    t2 = t[1:2:2]
+    assert typeof(t2) == "tuple object", typeof(t2)
 
 def indexing():
     """