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
9607b544
Commit
9607b544
authored
Dec 31, 2007
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug for python targets in for...from loops, allow non-integer numeric arguments.
parent
39048dc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+2
-2
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+8
-4
Cython/Compiler/Version.py
Cython/Compiler/Version.py
+1
-1
No files found.
Cython/Compiler/ExprNodes.py
View file @
9607b544
...
@@ -2599,7 +2599,7 @@ class TypecastNode(ExprNode):
...
@@ -2599,7 +2599,7 @@ class TypecastNode(ExprNode):
error
(
self
.
pos
,
"Casting temporary Python object to non-Python type"
)
error
(
self
.
pos
,
"Casting temporary Python object to non-Python type"
)
if
to_py
and
not
from_py
:
if
to_py
and
not
from_py
:
self
.
result_ctype
=
py_object_type
self
.
result_ctype
=
py_object_type
self
.
is_temp
=
1
self
.
is_temp
=
1
def
check_const
(
self
):
def
check_const
(
self
):
self
.
operand
.
check_const
()
self
.
operand
.
check_const
()
...
@@ -2846,7 +2846,7 @@ class NumBinopNode(BinopNode):
...
@@ -2846,7 +2846,7 @@ class NumBinopNode(BinopNode):
"/"
:
"PyNumber_Divide"
,
"/"
:
"PyNumber_Divide"
,
"//"
:
"PyNumber_FloorDivide"
,
"//"
:
"PyNumber_FloorDivide"
,
"%"
:
"PyNumber_Remainder"
,
"%"
:
"PyNumber_Remainder"
,
"**"
:
"PyNumber_Power"
"**"
:
"PyNumber_Power"
}
}
...
...
Cython/Compiler/Nodes.py
View file @
9607b544
...
@@ -2532,8 +2532,12 @@ class ForFromStatNode(StatNode):
...
@@ -2532,8 +2532,12 @@ class ForFromStatNode(StatNode):
self
.
target
.
analyse_target_types
(
env
)
self
.
target
.
analyse_target_types
(
env
)
self
.
bound1
.
analyse_types
(
env
)
self
.
bound1
.
analyse_types
(
env
)
self
.
bound2
.
analyse_types
(
env
)
self
.
bound2
.
analyse_types
(
env
)
self
.
bound1
=
self
.
bound1
.
coerce_to
(
self
.
target
.
type
,
env
)
if
self
.
target
.
type
.
is_numeric
:
self
.
bound2
=
self
.
bound2
.
coerce_to
(
self
.
target
.
type
,
env
)
self
.
bound1
=
self
.
bound1
.
coerce_to
(
self
.
target
.
type
,
env
)
self
.
bound2
=
self
.
bound2
.
coerce_to
(
self
.
target
.
type
,
env
)
else
:
self
.
bound1
=
self
.
bound1
.
coerce_to_integer
(
env
)
self
.
bound2
=
self
.
bound2
.
coerce_to_integer
(
env
)
if
self
.
step
is
not
None
:
if
self
.
step
is
not
None
:
if
isinstance
(
self
.
step
,
ExprNodes
.
UnaryMinusNode
):
if
isinstance
(
self
.
step
,
ExprNodes
.
UnaryMinusNode
):
warning
(
self
.
step
.
pos
,
"Probable infinite loop in for-from-by statment. Consider switching the directions of the relations."
,
2
)
warning
(
self
.
step
.
pos
,
"Probable infinite loop in for-from-by statment. Consider switching the directions of the relations."
,
2
)
...
@@ -2542,14 +2546,14 @@ class ForFromStatNode(StatNode):
...
@@ -2542,14 +2546,14 @@ class ForFromStatNode(StatNode):
if
not
(
self
.
bound2
.
is_name
or
self
.
bound2
.
is_literal
):
if
not
(
self
.
bound2
.
is_name
or
self
.
bound2
.
is_literal
):
self
.
bound2
=
self
.
bound2
.
coerce_to_temp
(
env
)
self
.
bound2
=
self
.
bound2
.
coerce_to_temp
(
env
)
target_type
=
self
.
target
.
type
target_type
=
self
.
target
.
type
if
not
(
target_type
.
is_pyobject
or
target_type
.
is_
int
):
if
not
(
target_type
.
is_pyobject
or
target_type
.
is_
numeric
):
error
(
self
.
target
.
pos
,
error
(
self
.
target
.
pos
,
"Integer for-loop variable must be of type int or Python object"
)
"Integer for-loop variable must be of type int or Python object"
)
#if not (target_type.is_pyobject
#if not (target_type.is_pyobject
# or target_type.assignable_from(PyrexTypes.c_int_type)):
# or target_type.assignable_from(PyrexTypes.c_int_type)):
# error(self.target.pos,
# error(self.target.pos,
# "Cannot assign integer to variable of type '%s'" % target_type)
# "Cannot assign integer to variable of type '%s'" % target_type)
if
target_type
.
is_
int
:
if
target_type
.
is_
numeric
:
self
.
is_py_target
=
0
self
.
is_py_target
=
0
self
.
loopvar_name
=
self
.
target
.
entry
.
cname
self
.
loopvar_name
=
self
.
target
.
entry
.
cname
self
.
py_loopvar_node
=
None
self
.
py_loopvar_node
=
None
...
...
Cython/Compiler/Version.py
View file @
9607b544
version
=
'0.9.6.10'
version
=
'0.9.6.10
.1
'
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