Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
7ce2a0d4
Commit
7ce2a0d4
authored
Apr 18, 2009
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
cfa43a5a
4b5babd8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
71 additions
and
10 deletions
+71
-10
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+19
-9
tests/bugs.txt
tests/bugs.txt
+0
-1
tests/errors/e_bufaccess2.pyx
tests/errors/e_bufaccess2.pyx
+27
-0
tests/run/bufaccess.pyx
tests/run/bufaccess.pyx
+15
-0
tests/run/cdef_setitem_T284.pyx
tests/run/cdef_setitem_T284.pyx
+10
-0
No files found.
Cython/Compiler/ExprNodes.py
View file @
7ce2a0d4
...
...
@@ -1745,7 +1745,6 @@ class IndexNode(ExprNode):
else
:
self
.
index
=
self
.
index
.
coerce_to_pyobject
(
env
)
self
.
type
=
py_object_type
self
.
gil_check
(
env
)
self
.
is_temp
=
1
else
:
if
self
.
base
.
type
.
is_ptr
or
self
.
base
.
type
.
is_array
:
...
...
@@ -1762,9 +1761,21 @@ class IndexNode(ExprNode):
error
(
self
.
pos
,
"Invalid index type '%s'"
%
self
.
index
.
type
)
self
.
gil_check
(
env
)
gil_message
=
"Indexing Python object"
def
gil_check
(
self
,
env
):
if
self
.
is_buffer_access
and
env
.
nogil
:
if
env
.
directives
[
'boundscheck'
]:
error
(
self
.
pos
,
"Cannot check buffer index bounds without gil; use boundscheck(False) directive"
)
return
elif
self
.
type
.
is_pyobject
:
error
(
self
.
pos
,
"Cannot access buffer with object dtype without gil"
)
return
super
(
IndexNode
,
self
).
gil_check
(
env
)
def
check_const_addr
(
self
):
self
.
base
.
check_const_addr
()
self
.
index
.
check_const
()
...
...
@@ -1856,14 +1867,13 @@ class IndexNode(ExprNode):
index_code
=
self
.
index
.
py_result
()
if
self
.
base
.
type
is
dict_type
:
function
=
"PyDict_SetItem"
elif
self
.
base
.
type
is
list_type
:
function
=
"PyList_SetItem"
# don't use PyTuple_SetItem(), as we'd normally get a
# TypeError when changing a tuple, while PyTuple_SetItem()
# would allow updates
#
#elif self.base.type is tuple_type:
# function = "PyTuple_SetItem"
# It would seem that we could specalized lists/tuples, but that
# shouldn't happen here.
# Both PyList_SetItem PyTuple_SetItem and a Py_ssize_t as input,
# not a PyObject*, and bad conversion here would give the wrong
# exception. Also, tuples are supposed to be immutable, and raise
# TypeErrors when trying to set their entries (PyTuple_SetItem
# is for creating new tuples from).
else
:
function
=
"PyObject_SetItem"
code
.
putln
(
...
...
tests/bugs.txt
View file @
7ce2a0d4
...
...
@@ -14,4 +14,3 @@ large_consts_T237
bad_c_struct_T252
missing_baseclass_in_predecl_T262
ifelseexpr_T267
cdef_setitem_T284
tests/errors/e_bufaccess2.pyx
View file @
7ce2a0d4
cimport
e_bufaccess_pxd
# was needed to provoke a bug involving ErrorType
import
cython
def
f
():
cdef
object
[
e_bufaccess_pxd
.
T
]
buf
def
withnogil_access_fail
():
cdef
object
[
int
]
buf
=
None
with
nogil
:
buf
[
2
]
=
2
@
cython
.
boundscheck
(
False
)
def
withnogil_access_ok
():
cdef
object
[
int
]
buf
=
None
with
nogil
:
buf
[
2
]
=
2
# No error should be triggered here
@
cython
.
boundscheck
(
False
)
def
withnogil_access_fail_2
():
cdef
object
[
object
]
buf
=
None
with
nogil
:
buf
[
2
]
=
2
# Not OK as dtype is object
def
withnogil_acquire
(
x
):
cdef
object
[
int
]
buf
with
nogil
:
buf
=
x
_ERRORS
=
u"""
3:9: 'nothing' is not a type identifier
10:11: Cannot check buffer index bounds without gil; use boundscheck(False) directive
22:11: Cannot access buffer with object dtype without gil
22:11: Assignment of Python object not allowed without gil
27:12: Assignment of Python object not allowed without gil
"""
tests/run/bufaccess.pyx
View file @
7ce2a0d4
...
...
@@ -1449,3 +1449,18 @@ def complex_struct_inplace(object[LongComplex] buf):
buf
[
0
].
imag
+=
2
print
buf
[
0
].
real
,
buf
[
0
].
imag
#
# Nogil
#
@
testcase
@
cython
.
boundscheck
(
False
)
def
buffer_nogil
():
"""
>>> buffer_nogil()
10
"""
cdef
object
[
int
]
buf
=
IntMockBuffer
(
None
,
[
1
,
2
,
3
])
with
nogil
:
buf
[
1
]
=
10
return
buf
[
1
]
tests/run/cdef_setitem_T284.pyx
View file @
7ce2a0d4
__doc__
=
u'''
>>> no_cdef()
>>> with_cdef()
>>> test_list(range(11), -2, None)
[0, 1, 2, 3, 4, 5, 6, 7, 8, None, 10]
>>> test_list(range(11), "invalid index", None)
Traceback (most recent call last):
...
TypeError: list indices must be integers
'''
def
no_cdef
():
lst
=
range
(
11
)
...
...
@@ -15,3 +21,7 @@ def with_cdef():
lst
[
ob
]
=
-
10
cdef
dict
dd
=
{}
dd
[
ob
]
=
-
10
def
test_list
(
list
L
,
object
i
,
object
a
):
L
[
i
]
=
a
return
L
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment