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
f1ce1111
Commit
f1ce1111
authored
4 years ago
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cast NULL optional arg to optional struct type only in C++
parent
56f5bad1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+14
-5
No files found.
Cython/Compiler/ExprNodes.py
View file @
f1ce1111
...
...
@@ -5661,6 +5661,14 @@ class SimpleCallNode(CallNode):
# wrapper_call bool used internally
# has_optional_args bool used internally
# nogil bool used internally
#
# analysed bool used internally
# overflowcheck bool used internally
# explicit_cpp_self bool used internally
# rlocked bool used internally
# wlocked bool used internally
# tracked_state bool used internally
# is_in_cpp bool used internally
subexprs
=
[
'self'
,
'coerced_self'
,
'function'
,
'args'
,
'arg_tuple'
]
...
...
@@ -5676,6 +5684,7 @@ class SimpleCallNode(CallNode):
rlocked
=
False
wlocked
=
False
tracked_state
=
True
# Something random, anything that is not None
is_in_cpp
=
False
def
compile_time_value
(
self
,
denv
):
function
=
self
.
function
.
compile_time_value
(
denv
)
...
...
@@ -5706,6 +5715,7 @@ class SimpleCallNode(CallNode):
return
self
.
args
,
None
def
analyse_types
(
self
,
env
):
self
.
is_in_cpp
=
env
.
is_cpp
()
if
self
.
analyse_as_type_constructor
(
env
):
return
self
if
self
.
analysed
:
...
...
@@ -6066,12 +6076,11 @@ class SimpleCallNode(CallNode):
if
func_type
.
optional_arg_count
:
if
expected_nargs
==
actual_nargs
:
# Cast NULL to optional struct type to avoid ambiguous calls
opt_struct_type
=
func_type
.
op_arg_struct
.
base_type
if
opt_struct_type
.
typedef_flag
:
optional_args
=
'(%s *)NULL'
%
opt_struct_type
.
cname
# Cast NULL to optional struct type to avoid ambiguous calls in C++
if
self
.
is_in_cpp
:
optional_args
=
'(%s *)NULL'
%
func_type
.
op_arg_struct
.
base_type
.
cname
else
:
optional_args
=
'
(%s %s *)NULL'
%
(
opt_struct_type
.
kind
,
opt_struct_type
.
cname
)
optional_args
=
'
NULL'
else
:
optional_args
=
"&%s"
%
self
.
opt_arg_struct
arg_list_code
.
append
(
optional_args
)
...
...
This diff is collapsed.
Click to expand it.
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