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
aaad38f7
Commit
aaad38f7
authored
May 27, 2019
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix C++ division when true division is enabled.
This fixes Github issue #1950.
parent
3844d1e1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+2
-2
tests/run/cpp_operators.pyx
tests/run/cpp_operators.pyx
+6
-4
No files found.
Cython/Compiler/ExprNodes.py
View file @
aaad38f7
...
@@ -11559,7 +11559,7 @@ class DivNode(NumBinopNode):
...
@@ -11559,7 +11559,7 @@ class DivNode(NumBinopNode):
self
.
operand2
=
self
.
operand2
.
coerce_to_simple
(
env
)
self
.
operand2
=
self
.
operand2
.
coerce_to_simple
(
env
)
def
compute_c_result_type
(
self
,
type1
,
type2
):
def
compute_c_result_type
(
self
,
type1
,
type2
):
if
self
.
operator
==
'/'
and
self
.
ctruedivision
:
if
self
.
operator
==
'/'
and
self
.
ctruedivision
and
not
self
.
is_cpp_operation
()
:
if
not
type1
.
is_float
and
not
type2
.
is_float
:
if
not
type1
.
is_float
and
not
type2
.
is_float
:
widest_type
=
PyrexTypes
.
widest_numeric_type
(
type1
,
PyrexTypes
.
c_double_type
)
widest_type
=
PyrexTypes
.
widest_numeric_type
(
type1
,
PyrexTypes
.
c_double_type
)
widest_type
=
PyrexTypes
.
widest_numeric_type
(
type2
,
widest_type
)
widest_type
=
PyrexTypes
.
widest_numeric_type
(
type2
,
widest_type
)
...
@@ -11650,7 +11650,7 @@ class DivNode(NumBinopNode):
...
@@ -11650,7 +11650,7 @@ class DivNode(NumBinopNode):
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
def
calculate_result_code
(
self
):
def
calculate_result_code
(
self
):
if
self
.
type
.
is_complex
:
if
self
.
type
.
is_complex
or
self
.
is_cpp_operation
()
:
return
NumBinopNode
.
calculate_result_code
(
self
)
return
NumBinopNode
.
calculate_result_code
(
self
)
elif
self
.
type
.
is_float
and
self
.
operator
==
'//'
:
elif
self
.
type
.
is_float
and
self
.
operator
==
'//'
:
return
"floor(%s / %s)"
%
(
return
"floor(%s / %s)"
%
(
...
...
tests/run/cpp_operators.pyx
View file @
aaad38f7
# mode: run
# mode: run
# tag: cpp, werror
# tag: cpp, werror
from
__future__
import
division
from
cython
cimport
typeof
from
cython
cimport
typeof
cimport
cython.operator
cimport
cython.operator
...
...
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