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
Xavier Thompson
cython
Commits
ec5df1e0
Commit
ec5df1e0
authored
Dec 17, 2014
by
Lars Buitinck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
optimize sorted([a,b,c]) into PyList_Sort call
parent
16f809e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
8 deletions
+36
-8
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+9
-0
Cython/Compiler/Optimize.py
Cython/Compiler/Optimize.py
+5
-0
tests/bugs.txt
tests/bugs.txt
+0
-1
tests/run/builtin_sorted.pyx
tests/run/builtin_sorted.pyx
+22
-7
No files found.
Cython/Compiler/ExprNodes.py
View file @
ec5df1e0
...
@@ -6556,6 +6556,12 @@ class TupleNode(SequenceNode):
...
@@ -6556,6 +6556,12 @@ class TupleNode(SequenceNode):
else
:
else
:
return
SequenceNode
.
coerce_to
(
self
,
dst_type
,
env
)
return
SequenceNode
.
coerce_to
(
self
,
dst_type
,
env
)
def
as_list
(
self
):
t
=
ListNode
(
self
.
pos
,
args
=
self
.
args
,
mult_factor
=
self
.
mult_factor
)
if
isinstance
(
self
.
constant_result
,
tuple
):
t
.
constant_result
=
list
(
self
.
constant_result
)
return
t
def
is_simple
(
self
):
def
is_simple
(
self
):
# either temp or constant => always simple
# either temp or constant => always simple
return
True
return
True
...
@@ -6685,6 +6691,9 @@ class ListNode(SequenceNode):
...
@@ -6685,6 +6691,9 @@ class ListNode(SequenceNode):
error
(
self
.
pos
,
"Cannot coerce list to type '%s'"
%
dst_type
)
error
(
self
.
pos
,
"Cannot coerce list to type '%s'"
%
dst_type
)
return
self
return
self
def
as_list
(
self
):
# dummy for compatibility with TupleNode
return
self
def
as_tuple
(
self
):
def
as_tuple
(
self
):
t
=
TupleNode
(
self
.
pos
,
args
=
self
.
args
,
mult_factor
=
self
.
mult_factor
)
t
=
TupleNode
(
self
.
pos
,
args
=
self
.
args
,
mult_factor
=
self
.
mult_factor
)
if
isinstance
(
self
.
constant_result
,
list
):
if
isinstance
(
self
.
constant_result
,
list
):
...
...
Cython/Compiler/Optimize.py
View file @
ec5df1e0
...
@@ -1508,6 +1508,11 @@ class EarlyReplaceBuiltinCalls(Visitor.EnvTransform):
...
@@ -1508,6 +1508,11 @@ class EarlyReplaceBuiltinCalls(Visitor.EnvTransform):
expr_scope
=
gen_expr_node
.
expr_scope
,
expr_scope
=
gen_expr_node
.
expr_scope
,
has_local_scope
=
True
)
has_local_scope
=
True
)
append_node
.
target
=
listcomp_node
append_node
.
target
=
listcomp_node
elif
isinstance
(
pos_args
[
0
],
(
ExprNodes
.
ListNode
,
ExprNodes
.
TupleNode
)):
# sorted([a, b, c]) or sorted((a, b, c)). The result of the latter
# is a list in CPython, so change it into one.
expr
=
pos_args
[
0
].
as_list
()
listcomp_node
=
loop_node
=
expr
else
:
else
:
return
node
return
node
...
...
tests/bugs.txt
View file @
ec5df1e0
...
@@ -48,5 +48,4 @@ pyregr.test_tuple
...
@@ -48,5 +48,4 @@ pyregr.test_tuple
# Inlined generators
# Inlined generators
all
all
any
any
builtin_sorted
inlined_generator_expressions
inlined_generator_expressions
tests/run/builtin_sorted.pyx
View file @
ec5df1e0
cimport
cython
cimport
cython
@
cython
.
test_fail_if_path_exists
(
"//GeneratorExpressionNode"
,
#
@cython.test_fail_if_path_exists("//GeneratorExpressionNode",
"//ComprehensionNode//NoneCheckNode"
)
#
"//ComprehensionNode//NoneCheckNode")
@
cython
.
test_assert_path_exists
(
"//ComprehensionNode"
)
#
@cython.test_assert_path_exists("//ComprehensionNode")
def
sorted_genexp
():
def
sorted_genexp
():
"""
"""
>>> sorted_genexp()
>>> sorted_genexp()
...
@@ -11,10 +10,26 @@ def sorted_genexp():
...
@@ -11,10 +10,26 @@ def sorted_genexp():
"""
"""
return
sorted
(
i
*
i
for
i
in
range
(
10
,
0
,
-
1
))
return
sorted
(
i
*
i
for
i
in
range
(
10
,
0
,
-
1
))
@
cython
.
test_assert_path_exists
(
"//SimpleCallNode//SimpleCallNode"
)
#
@cython.test_assert_path_exists("//SimpleCallNode//SimpleCallNode")
def
sorted_list
():
def
sorted_list
_of_range
():
"""
"""
>>> sorted_list()
>>> sorted_list
_of_range
()
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
"""
"""
return
sorted
(
list
(
range
(
10
,
0
,
-
1
)))
return
sorted
(
list
(
range
(
10
,
0
,
-
1
)))
@
cython
.
test_fail_if_path_exists
(
"//SimpleCallNode"
)
def
sorted_list_literal
():
"""
>>> sorted_list_literal()
[1, 1, 2, 2, 3, 3]
"""
return
sorted
([
3
,
1
,
2
]
*
2
)
@
cython
.
test_fail_if_path_exists
(
"//SimpleCallNode"
)
def
sorted_tuple_literal
():
"""
>>> sorted_tuple_literal()
[1, 1, 2, 2, 3, 3]
"""
return
sorted
((
1
,
3
,
2
)
*
2
)
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