From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 29 Oct 2010 15:17:39 +0000 (+0200)
Subject: Index: Cython/Compiler/Parsing.py
X-Git-Tag: 0.14.alpha0~284
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=305e7ba8b5fb93c80f31937652b620c726d869d8;p=cython.git

Index: Cython/Compiler/Parsing.py
---

diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
index 8c331b76..4903bd6b 100644
--- a/Cython/Compiler/Parsing.py
+++ b/Cython/Compiler/Parsing.py
@@ -497,20 +497,16 @@ def p_subscript(s):
     # 1, 2 or 3 ExprNodes, depending on how
     # many slice elements were encountered.
     pos = s.position()
-    if s.sy == '.':
-        expect_ellipsis(s)
-        return [ExprNodes.EllipsisNode(pos)]
-    else:
-        start = p_slice_element(s, (':',))
-        if s.sy != ':':
-            return [start]
-        s.next()
-        stop = p_slice_element(s, (':', ',', ']'))
-        if s.sy != ':':
-            return [start, stop]
-        s.next()
-        step = p_slice_element(s, (':', ',', ']'))
-        return [start, stop, step]
+    start = p_slice_element(s, (':',))
+    if s.sy != ':':
+        return [start]
+    s.next()
+    stop = p_slice_element(s, (':', ',', ']'))
+    if s.sy != ':':
+        return [start, stop]
+    s.next()
+    step = p_slice_element(s, (':', ',', ']'))
+    return [start, stop, step]
 
 def p_slice_element(s, follow_set):
     # Simple expression which may be missing iff
@@ -569,6 +565,9 @@ def p_atom(s):
         return p_dict_or_set_maker(s)
     elif sy == '`':
         return p_backquote_expr(s)
+    elif sy == '.':
+        expect_ellipsis(s)
+        return ExprNodes.EllipsisNode(pos)
     elif sy == 'INT':
         value = s.systring
         s.next()
diff --git a/tests/compile/ellipsis_T488.pyx b/tests/compile/ellipsis_T488.pyx
new file mode 100644
index 00000000..a745112e
--- /dev/null
+++ b/tests/compile/ellipsis_T488.pyx
@@ -0,0 +1,6 @@
+#from ... import foo
+
+print ...
+def test():
+    x = ...
+    assert x is Ellipsis
diff --git a/tests/run/ellipsis_T488.pyx b/tests/run/ellipsis_T488.pyx
new file mode 100644
index 00000000..909ee608
--- /dev/null
+++ b/tests/run/ellipsis_T488.pyx
@@ -0,0 +1,20 @@
+"""
+>>> test()
+"""
+def test():
+    x = ...
+    assert x is Ellipsis
+
+    d = {}
+    d[...] = 1
+    assert d[...] == 1
+    del d[...]
+    assert ... not in d
+
+    d[..., ...] = 1
+    assert d[..., ...] == 1
+    assert d[..., Ellipsis] == 1
+    assert (Ellipsis, Ellipsis) in d
+    del d[..., ...]
+    assert (Ellipsis, Ellipsis) not in d
+