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
81cff8ec
Commit
81cff8ec
authored
Mar 28, 2010
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
4bb2ef8e
ab7bd194
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
199 additions
and
29 deletions
+199
-29
Cython/Compiler/Optimize.py
Cython/Compiler/Optimize.py
+103
-25
Cython/Compiler/UtilNodes.py
Cython/Compiler/UtilNodes.py
+25
-1
tests/run/inop.pyx
tests/run/inop.pyx
+71
-3
No files found.
Cython/Compiler/Optimize.py
View file @
81cff8ec
...
...
@@ -526,12 +526,12 @@ class SwitchTransform(Visitor.VisitorTransform):
if
is_common_value
(
cond
.
operand1
,
cond
.
operand1
):
if
cond
.
operand2
.
is_literal
:
return
cond
.
operand1
,
[
cond
.
operand2
]
elif
hasattr
(
cond
.
operand2
,
'entry'
)
and
cond
.
operand2
.
entry
and
cond
.
operand2
.
entry
.
is_const
:
elif
getattr
(
cond
.
operand2
,
'entry'
,
None
)
and
cond
.
operand2
.
entry
.
is_const
:
return
cond
.
operand1
,
[
cond
.
operand2
]
if
is_common_value
(
cond
.
operand2
,
cond
.
operand2
):
if
cond
.
operand1
.
is_literal
:
return
cond
.
operand2
,
[
cond
.
operand1
]
elif
hasattr
(
cond
.
operand1
,
'entry'
)
and
cond
.
operand1
.
entry
and
cond
.
operand1
.
entry
.
is_const
:
elif
getattr
(
cond
.
operand1
,
'entry'
,
None
)
and
cond
.
operand1
.
entry
.
is_const
:
return
cond
.
operand2
,
[
cond
.
operand1
]
elif
(
isinstance
(
cond
,
ExprNodes
.
BoolBinopNode
)
and
cond
.
operator
==
'or'
):
...
...
@@ -540,34 +540,101 @@ class SwitchTransform(Visitor.VisitorTransform):
if
is_common_value
(
t1
,
t2
):
return
t1
,
c1
+
c2
return
None
,
None
def
extract_common_conditions
(
self
,
common_var
,
condition
):
var
,
conditions
=
self
.
extract_conditions
(
condition
)
if
var
is
None
:
return
None
,
None
elif
common_var
is
not
None
and
not
is_common_value
(
var
,
common_var
):
return
None
,
None
elif
not
var
.
type
.
is_int
or
sum
([
not
cond
.
type
.
is_int
for
cond
in
conditions
]):
return
None
,
None
return
var
,
conditions
def
visit_IfStatNode
(
self
,
node
):
self
.
visitchildren
(
node
)
common_var
=
None
case_count
=
0
cases
=
[]
for
if_clause
in
node
.
if_clauses
:
var
,
conditions
=
self
.
extract_conditions
(
if_clause
.
condition
)
if
var
is
None
:
return
node
elif
common_var
is
not
None
and
not
is_common_value
(
var
,
common_var
):
common_var
,
conditions
=
self
.
extract_common_conditions
(
common_var
,
if_clause
.
condition
)
if
common_var
is
None
:
return
node
elif
not
var
.
type
.
is_int
or
sum
([
not
cond
.
type
.
is_int
for
cond
in
conditions
]):
return
node
else
:
common_var
=
var
case_count
+=
len
(
conditions
)
cases
.
append
(
Nodes
.
SwitchCaseNode
(
pos
=
if_clause
.
pos
,
conditions
=
conditions
,
body
=
if_clause
.
body
))
if
case_count
<
2
:
return
node
cases
.
append
(
Nodes
.
SwitchCaseNode
(
pos
=
if_clause
.
pos
,
conditions
=
conditions
,
body
=
if_clause
.
body
))
if
sum
([
len
(
case
.
conditions
)
for
case
in
cases
])
<
2
:
return
node
common_var
=
unwrap_node
(
common_var
)
switch_node
=
Nodes
.
SwitchStatNode
(
pos
=
node
.
pos
,
test
=
common_var
,
cases
=
cases
,
else_clause
=
node
.
else_clause
)
self
.
visitchildren
(
switch_node
)
return
switch_node
def
visit_CondExprNode
(
self
,
node
):
common_var
,
conditions
=
self
.
extract_common_conditions
(
None
,
node
.
test
)
if
common_var
is
None
:
return
node
if
len
(
conditions
)
<
2
:
return
node
result_ref
=
UtilNodes
.
ResultRefNode
(
node
)
true_body
=
Nodes
.
SingleAssignmentNode
(
node
.
pos
,
lhs
=
result_ref
,
rhs
=
node
.
true_val
,
first
=
True
)
false_body
=
Nodes
.
SingleAssignmentNode
(
node
.
pos
,
lhs
=
result_ref
,
rhs
=
node
.
false_val
,
first
=
True
)
cases
=
[
Nodes
.
SwitchCaseNode
(
pos
=
node
.
pos
,
conditions
=
conditions
,
body
=
true_body
)]
common_var
=
unwrap_node
(
common_var
)
return
Nodes
.
SwitchStatNode
(
pos
=
node
.
pos
,
test
=
common_var
,
cases
=
cases
,
else_clause
=
node
.
else_clause
)
switch_node
=
Nodes
.
SwitchStatNode
(
pos
=
node
.
pos
,
test
=
common_var
,
cases
=
cases
,
else_clause
=
false_body
)
self
.
visitchildren
(
switch_node
)
return
UtilNodes
.
TempResultFromStatNode
(
result_ref
,
switch_node
)
def
visit_BoolBinopNode
(
self
,
node
):
common_var
,
conditions
=
self
.
extract_common_conditions
(
None
,
node
)
if
common_var
is
None
:
return
node
if
len
(
conditions
)
<
2
:
return
node
result_ref
=
UtilNodes
.
ResultRefNode
(
node
)
true_body
=
Nodes
.
SingleAssignmentNode
(
node
.
pos
,
lhs
=
result_ref
,
rhs
=
ExprNodes
.
BoolNode
(
node
.
pos
,
value
=
True
),
first
=
True
)
false_body
=
Nodes
.
SingleAssignmentNode
(
node
.
pos
,
lhs
=
result_ref
,
rhs
=
ExprNodes
.
BoolNode
(
node
.
pos
,
value
=
False
),
first
=
True
)
cases
=
[
Nodes
.
SwitchCaseNode
(
pos
=
node
.
pos
,
conditions
=
conditions
,
body
=
true_body
)]
common_var
=
unwrap_node
(
common_var
)
switch_node
=
Nodes
.
SwitchStatNode
(
pos
=
node
.
pos
,
test
=
common_var
,
cases
=
cases
,
else_clause
=
false_body
)
self
.
visitchildren
(
switch_node
)
return
UtilNodes
.
TempResultFromStatNode
(
result_ref
,
switch_node
)
visit_Node
=
Visitor
.
VisitorTransform
.
recurse_to_children
...
...
@@ -591,7 +658,9 @@ class FlattenInListTransform(Visitor.VisitorTransform, SkipDeclarations):
else
:
return
node
if
not
isinstance
(
node
.
operand2
,
(
ExprNodes
.
TupleNode
,
ExprNodes
.
ListNode
)):
if
not
isinstance
(
node
.
operand2
,
(
ExprNodes
.
TupleNode
,
ExprNodes
.
ListNode
,
ExprNodes
.
SetNode
)):
return
node
args
=
node
.
operand2
.
args
...
...
@@ -939,6 +1008,15 @@ class OptimizeBuiltinCalls(Visitor.EnvTransform):
return
node
return
node
.
arg
def
visit_TypecastNode
(
self
,
node
):
"""
Drop redundant type casts.
"""
self
.
visitchildren
(
node
)
if
node
.
type
==
node
.
operand
.
type
:
return
node
.
operand
return
node
def
visit_CoerceToBooleanNode
(
self
,
node
):
"""Drop redundant conversion nodes after tree changes.
"""
...
...
Cython/Compiler/UtilNodes.py
View file @
81cff8ec
...
...
@@ -148,7 +148,8 @@ class ResultRefNode(AtomicExprNode):
def
generate_assignment_code
(
self
,
rhs
,
code
):
if
self
.
type
.
is_pyobject
:
rhs
.
make_owned_reference
(
code
)
code
.
put_decref
(
self
.
result
(),
self
.
ctype
())
if
not
self
.
lhs_of_first_assignment
:
code
.
put_decref
(
self
.
result
(),
self
.
ctype
())
code
.
putln
(
'%s = %s;'
%
(
self
.
result
(),
rhs
.
result_as
(
self
.
ctype
())))
rhs
.
generate_post_assignment_code
(
code
)
rhs
.
free_temps
(
code
)
...
...
@@ -250,3 +251,26 @@ class LetNode(Nodes.StatNode, LetNodeMixin):
self
.
setup_temp_expr
(
code
)
self
.
body
.
generate_execution_code
(
code
)
self
.
teardown_temp_expr
(
code
)
class
TempResultFromStatNode
(
ExprNodes
.
ExprNode
):
# An ExprNode wrapper around a StatNode that executes the StatNode
# body. Requires a ResultRefNode that it sets up to refer to its
# own temp result. The StatNode must assign a value to the result
# node, which then becomes the result of this node.
#
# This can only be used in/after type analysis.
#
subexprs
=
[]
child_attrs
=
[
'body'
]
def
__init__
(
self
,
result_ref
,
body
):
self
.
result_ref
=
result_ref
self
.
pos
=
body
.
pos
self
.
body
=
body
self
.
type
=
result_ref
.
type
self
.
is_temp
=
1
def
generate_result_code
(
self
,
code
):
self
.
result_ref
.
result_code
=
self
.
result
()
self
.
body
.
generate_execution_code
(
code
)
tests/run/inop.pyx
View file @
81cff8ec
cimport
cython
def
f
(
a
,
b
):
"""
>>> f(1,[1,2,3])
...
...
@@ -42,6 +45,7 @@ def j(b):
cdef
int
result
=
2
in
b
return
result
@
cython
.
test_fail_if_path_exists
(
"//SwitchStatNode"
)
def
k
(
a
):
"""
>>> k(1)
...
...
@@ -52,16 +56,80 @@ def k(a):
cdef
int
result
=
a
in
[
1
,
2
,
3
,
4
]
return
result
def
m
(
int
a
):
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
m_list
(
int
a
):
"""
>>> m(2)
>>> m
_list
(2)
1
>>> m(5)
>>> m
_list
(5)
0
"""
cdef
int
result
=
a
in
[
1
,
2
,
3
,
4
]
return
result
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
m_tuple
(
int
a
):
"""
>>> m_tuple(2)
1
>>> m_tuple(5)
0
"""
cdef
int
result
=
a
in
(
1
,
2
,
3
,
4
)
return
result
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
m_set
(
int
a
):
"""
>>> m_set(2)
1
>>> m_set(5)
0
"""
cdef
int
result
=
a
in
{
1
,
2
,
3
,
4
}
return
result
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
conditional_int
(
int
a
):
"""
>>> conditional_int(1)
1
>>> conditional_int(0)
2
>>> conditional_int(5)
2
"""
return
1
if
a
in
(
1
,
2
,
3
,
4
)
else
2
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
conditional_object
(
int
a
):
"""
>>> conditional_object(1)
1
>>> conditional_object(0)
'2'
>>> conditional_object(5)
'2'
"""
return
1
if
a
in
(
1
,
2
,
3
,
4
)
else
'2'
@
cython
.
test_assert_path_exists
(
"//SwitchStatNode"
)
@
cython
.
test_fail_if_path_exists
(
"//BoolBinopNode"
,
"//PrimaryCmpNode"
)
def
conditional_none
(
int
a
):
"""
>>> conditional_none(1)
>>> conditional_none(0)
1
>>> conditional_none(5)
1
"""
return
None
if
a
in
{
1
,
2
,
3
,
4
}
else
1
def
n
(
a
):
"""
>>> n('d *')
...
...
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