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
fa0af82e
Commit
fa0af82e
authored
Oct 29, 2014
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test (discovered) broken in merge.
parent
0532e356
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+11
-0
Cython/Compiler/Symtab.py
Cython/Compiler/Symtab.py
+1
-1
No files found.
Cython/Compiler/PyrexTypes.py
View file @
fa0af82e
...
@@ -3336,6 +3336,17 @@ class CppClassType(CType):
...
@@ -3336,6 +3336,17 @@ class CppClassType(CType):
def
is_template_type
(
self
):
def
is_template_type
(
self
):
return
self
.
templates
is
not
None
and
self
.
template_type
is
None
return
self
.
templates
is
not
None
and
self
.
template_type
is
None
def
get_fused_types
(
self
,
result
=
None
,
seen
=
None
):
if
result
is
None
:
result
=
[]
seen
=
set
()
if
self
.
namespace
:
self
.
namespace
.
get_fused_types
(
result
,
seen
)
if
self
.
templates
:
for
T
in
self
.
templates
:
T
.
get_fused_types
(
result
,
seen
)
return
result
def
specialize_here
(
self
,
pos
,
template_values
=
None
):
def
specialize_here
(
self
,
pos
,
template_values
=
None
):
if
not
self
.
is_template_type
():
if
not
self
.
is_template_type
():
error
(
pos
,
"'%s' type is not a template"
%
self
)
error
(
pos
,
"'%s' type is not a template"
%
self
)
...
...
Cython/Compiler/Symtab.py
View file @
fa0af82e
...
@@ -2130,7 +2130,7 @@ class CppClassScope(Scope):
...
@@ -2130,7 +2130,7 @@ class CppClassScope(Scope):
entry
=
self
.
declare
(
name
,
cname
,
type
,
pos
,
visibility
)
entry
=
self
.
declare
(
name
,
cname
,
type
,
pos
,
visibility
)
entry
.
is_variable
=
1
entry
.
is_variable
=
1
if
type
.
is_cfunction
and
self
.
type
:
if
type
.
is_cfunction
and
self
.
type
:
if
not
self
.
type
.
templates
or
not
any
(
T
.
is_fused
for
T
in
self
.
type
.
templates
)
:
if
not
self
.
type
.
get_fused_types
:
entry
.
func_cname
=
"%s::%s"
%
(
self
.
type
.
empty_declaration_code
(),
cname
)
entry
.
func_cname
=
"%s::%s"
%
(
self
.
type
.
empty_declaration_code
(),
cname
)
if
name
!=
"this"
and
(
defining
or
name
!=
"<init>"
):
if
name
!=
"this"
and
(
defining
or
name
!=
"<init>"
):
self
.
var_entries
.
append
(
entry
)
self
.
var_entries
.
append
(
entry
)
...
...
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