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
Gwenaël Samain
cython
Commits
55c6aaa9
Commit
55c6aaa9
authored
Nov 27, 2008
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some code cleanup
parent
72d55eda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
Cython/Compiler/Buffer.py
Cython/Compiler/Buffer.py
+6
-9
No files found.
Cython/Compiler/Buffer.py
View file @
55c6aaa9
...
@@ -293,17 +293,15 @@ def put_assign_to_buffer(lhs_cname, rhs_cname, buffer_aux, buffer_type,
...
@@ -293,17 +293,15 @@ def put_assign_to_buffer(lhs_cname, rhs_cname, buffer_aux, buffer_type,
# Acquire
# Acquire
retcode_cname
=
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
c_int_type
)
retcode_cname
=
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
c_int_type
)
code
.
putln
(
"%s = %s;"
%
(
retcode_cname
,
getbuffer
%
rhs_cname
))
code
.
putln
(
"%s = %s;"
%
(
retcode_cname
,
getbuffer
%
rhs_cname
))
code
.
putln
(
'if (%s) '
%
(
code
.
unlikely
(
"%s < 0"
%
retcode_cname
)))
code
.
putln
(
'if (%s)
{
'
%
(
code
.
unlikely
(
"%s < 0"
%
retcode_cname
)))
# If acquisition failed, attempt to reacquire the old buffer
# If acquisition failed, attempt to reacquire the old buffer
# before raising the exception. A failure of reacquisition
# before raising the exception. A failure of reacquisition
# will cause the reacquisition exception to be reported, one
# will cause the reacquisition exception to be reported, one
# can consider working around this later.
# can consider working around this later.
code
.
begin_block
()
type
,
value
,
tb
=
[
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
py_object_type
)
type
,
value
,
tb
=
[
code
.
funcstate
.
allocate_temp
(
PyrexTypes
.
py_object_type
)
for
i
in
range
(
3
)]
for
i
in
range
(
3
)]
code
.
putln
(
'PyErr_Fetch(&%s, &%s, &%s);'
%
(
type
,
value
,
tb
))
code
.
putln
(
'PyErr_Fetch(&%s, &%s, &%s);'
%
(
type
,
value
,
tb
))
code
.
put
(
'if (%s) '
%
code
.
unlikely
(
"%s == -1"
%
(
getbuffer
%
lhs_cname
)))
code
.
putln
(
'if (%s) {'
%
code
.
unlikely
(
"%s == -1"
%
(
getbuffer
%
lhs_cname
)))
code
.
begin_block
()
code
.
putln
(
'Py_XDECREF(%s); Py_XDECREF(%s); Py_XDECREF(%s);'
%
(
type
,
value
,
tb
))
code
.
putln
(
'Py_XDECREF(%s); Py_XDECREF(%s); Py_XDECREF(%s);'
%
(
type
,
value
,
tb
))
code
.
globalstate
.
use_utility_code
(
raise_buffer_fallback_code
)
code
.
globalstate
.
use_utility_code
(
raise_buffer_fallback_code
)
code
.
putln
(
'__Pyx_RaiseBufferFallbackError();'
)
code
.
putln
(
'__Pyx_RaiseBufferFallbackError();'
)
...
@@ -311,9 +309,9 @@ def put_assign_to_buffer(lhs_cname, rhs_cname, buffer_aux, buffer_type,
...
@@ -311,9 +309,9 @@ def put_assign_to_buffer(lhs_cname, rhs_cname, buffer_aux, buffer_type,
code
.
putln
(
'PyErr_Restore(%s, %s, %s);'
%
(
type
,
value
,
tb
))
code
.
putln
(
'PyErr_Restore(%s, %s, %s);'
%
(
type
,
value
,
tb
))
for
t
in
(
type
,
value
,
tb
):
for
t
in
(
type
,
value
,
tb
):
code
.
funcstate
.
release_temp
(
t
)
code
.
funcstate
.
release_temp
(
t
)
code
.
end_block
()
code
.
putln
(
'}'
)
code
.
putln
(
'}'
)
# Unpack indices
# Unpack indices
code
.
end_block
()
put_unpack_buffer_aux_into_scope
(
buffer_aux
,
buffer_type
.
mode
,
code
)
put_unpack_buffer_aux_into_scope
(
buffer_aux
,
buffer_type
.
mode
,
code
)
code
.
putln
(
code
.
error_goto_if_neg
(
retcode_cname
,
pos
))
code
.
putln
(
code
.
error_goto_if_neg
(
retcode_cname
,
pos
))
code
.
funcstate
.
release_temp
(
retcode_cname
)
code
.
funcstate
.
release_temp
(
retcode_cname
)
...
@@ -374,11 +372,10 @@ def put_buffer_lookup_code(entry, index_signeds, index_cnames, options, pos, cod
...
@@ -374,11 +372,10 @@ def put_buffer_lookup_code(entry, index_signeds, index_cnames, options, pos, cod
code
.
unlikely
(
"%s >= %s"
%
(
cname
,
shape
.
cname
)),
code
.
unlikely
(
"%s >= %s"
%
(
cname
,
shape
.
cname
)),
tmp_cname
,
dim
))
tmp_cname
,
dim
))
code
.
globalstate
.
use_utility_code
(
raise_indexerror_code
)
code
.
globalstate
.
use_utility_code
(
raise_indexerror_code
)
code
.
put
(
"if (%s) "
%
code
.
unlikely
(
"%s != -1"
%
tmp_cname
))
code
.
putln
(
"if (%s) {"
%
code
.
unlikely
(
"%s != -1"
%
tmp_cname
))
code
.
begin_block
()
code
.
putln
(
'__Pyx_RaiseBufferIndexError(%s);'
%
tmp_cname
)
code
.
putln
(
'__Pyx_RaiseBufferIndexError(%s);'
%
tmp_cname
)
code
.
putln
(
code
.
error_goto
(
pos
))
code
.
putln
(
code
.
error_goto
(
pos
))
code
.
end_block
(
)
code
.
putln
(
'}'
)
code
.
funcstate
.
release_temp
(
tmp_cname
)
code
.
funcstate
.
release_temp
(
tmp_cname
)
elif
negative_indices
:
elif
negative_indices
:
# Only fix negative indices.
# Only fix negative indices.
...
...
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