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
8b642621
Commit
8b642621
authored
Aug 23, 2016
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Infer common parent of C++ classes for spanning type of pointers.
parent
e98f32aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
0 deletions
+49
-0
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+24
-0
tests/run/cpp_type_inference.pyx
tests/run/cpp_type_inference.pyx
+25
-0
No files found.
Cython/Compiler/PyrexTypes.py
View file @
8b642621
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
from
__future__
import
absolute_import
from
__future__
import
absolute_import
import
collections
import
copy
import
copy
import
re
import
re
...
@@ -12,6 +13,7 @@ try:
...
@@ -12,6 +13,7 @@ try:
except
NameError
:
except
NameError
:
from
functools
import
reduce
from
functools
import
reduce
from
Cython.Utils
import
cached_function
from
.Code
import
UtilityCode
,
LazyUtilityCode
,
TempitaUtilityCode
from
.Code
import
UtilityCode
,
LazyUtilityCode
,
TempitaUtilityCode
from
.
import
StringEncoding
from
.
import
StringEncoding
from
.
import
Naming
from
.
import
Naming
...
@@ -4219,6 +4221,10 @@ def _spanning_type(type1, type2):
...
@@ -4219,6 +4221,10 @@ def _spanning_type(type1, type2):
return
py_object_type
return
py_object_type
return
type2
return
type2
elif
type1
.
is_ptr
and
type2
.
is_ptr
:
elif
type1
.
is_ptr
and
type2
.
is_ptr
:
if
type1
.
base_type
.
is_cpp_class
and
type2
.
base_type
.
is_cpp_class
:
common_base
=
widest_cpp_type
(
type1
.
base_type
,
type2
.
base_type
)
if
common_base
:
return
CPtrType
(
common_base
)
# incompatible pointers, void* will do as a result
# incompatible pointers, void* will do as a result
return
c_void_ptr_type
return
c_void_ptr_type
else
:
else
:
...
@@ -4236,6 +4242,24 @@ def widest_extension_type(type1, type2):
...
@@ -4236,6 +4242,24 @@ def widest_extension_type(type1, type2):
if
type1
is
None
or
type2
is
None
:
if
type1
is
None
or
type2
is
None
:
return
py_object_type
return
py_object_type
def
widest_cpp_type
(
type1
,
type2
):
@
cached_function
def
bases
(
type
):
all
=
set
()
for
base
in
type
.
base_classes
:
all
.
add
(
base
)
all
.
update
(
bases
(
base
))
return
all
common_bases
=
bases
(
type1
).
intersection
(
bases
(
type2
))
common_bases_bases
=
reduce
(
set
.
union
,
[
bases
(
b
)
for
b
in
common_bases
],
set
())
candidates
=
[
b
for
b
in
common_bases
if
b
not
in
common_bases_bases
]
if
len
(
candidates
)
==
1
:
return
candidates
[
0
]
else
:
# Fall back to void* for now.
return
None
def
simple_c_type
(
signed
,
longness
,
name
):
def
simple_c_type
(
signed
,
longness
,
name
):
# Find type descriptor for simple type given name and modifiers.
# Find type descriptor for simple type given name and modifiers.
# Returns None if arguments don't make sense.
# Returns None if arguments don't make sense.
...
...
tests/run/cpp_type_inference.pyx
View file @
8b642621
# mode: run
# mode: run
# tag: cpp, werror
# tag: cpp, werror
cdef
extern
from
"shapes.h"
namespace
"shapes"
:
cdef
cppclass
Shape
:
float
area
()
cdef
cppclass
Circle
(
Shape
):
int
radius
Circle
(
int
)
cdef
cppclass
Square
(
Shape
):
Square
(
int
)
from
cython
cimport
typeof
from
cython
cimport
typeof
from
cython.operator
cimport
dereference
as
d
from
cython.operator
cimport
dereference
as
d
...
@@ -23,3 +34,17 @@ def test_reversed_vector_iteration(L):
...
@@ -23,3 +34,17 @@ def test_reversed_vector_iteration(L):
incr
(
it
)
incr
(
it
)
print
(
'%s: %s'
%
(
typeof
(
a
),
a
))
print
(
'%s: %s'
%
(
typeof
(
a
),
a
))
print
(
typeof
(
a
))
print
(
typeof
(
a
))
def
test_derived_types
(
int
size
,
bint
round
):
"""
>>> test_derived_types(5, True)
Shape *
>>> test_derived_types(5, False)
Shape *
"""
if
round
:
ptr
=
new
Circle
(
size
)
else
:
ptr
=
new
Square
(
size
)
print
typeof
(
ptr
)
del
ptr
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