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
31d83cc3
Commit
31d83cc3
authored
Sep 16, 2020
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve handling of self argument in cypclass methods
parent
f410b12d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+10
-6
No files found.
Cython/Compiler/Nodes.py
View file @
31d83cc3
...
...
@@ -672,13 +672,17 @@ class CFuncDeclaratorNode(CDeclaratorNode):
type
=
other_type
if
name_declarator
.
cname
:
error
(
self
.
pos
,
"Function argument cannot have C name specification"
)
if
i
==
0
and
(
env
.
is_c_class_scope
or
env
.
is_cyp_class_scope
)
and
type
.
is_unspecified
:
if
env
.
is_cyp_class_scope
:
if
i
==
0
and
type
.
is_unspecified
:
if
env
.
is_c_class_scope
:
# fix the type of self
type
=
env
.
parent_type
elif
env
.
is_cyp_class_scope
:
# XXX is this different from 'env.parent_type' ?
type
=
env
.
lookup_here
(
"this"
).
type
if
self
.
is_const_method
:
type
=
PyrexTypes
.
cyp_class_const_type
(
type
)
self
.
skipped_self
=
(
name
,
type
,
arg_node
.
pos
,
arg_node
)
continue
# fix the type of self
type
=
env
.
parent_type
# Turn *[] argument into **
if
type
.
is_array
:
type
=
PyrexTypes
.
c_ptr_type
(
type
.
base_type
)
...
...
@@ -1029,6 +1033,7 @@ class CSimpleBaseTypeNode(CBaseTypeNode):
elif
self
.
name
is
None
:
if
self
.
is_self_arg
and
(
env
.
is_c_class_scope
or
env
.
is_cyp_class_scope
):
#print "CSimpleBaseTypeNode.analyse: defaulting to parent type" ###
# For cypclass methods, the type of 'self' is always determined in CFuncDeclaratorNode
type
=
env
.
parent_type
if
env
.
is_c_class_scope
else
PyrexTypes
.
unspecified_type
## elif self.is_type_arg and env.is_c_class_scope:
## type = Builtin.type_type
...
...
@@ -1061,6 +1066,7 @@ class CSimpleBaseTypeNode(CBaseTypeNode):
pass
elif
could_be_name
:
if
self
.
is_self_arg
and
(
env
.
is_c_class_scope
or
env
.
is_cyp_class_scope
):
# For cypclass methods, the type of 'self' is always determined in CFuncDeclaratorNode
type
=
env
.
parent_type
if
env
.
is_c_class_scope
else
PyrexTypes
.
unspecified_type
## elif self.is_type_arg and env.is_c_class_scope:
## type = Builtin.type_type
...
...
@@ -2733,8 +2739,6 @@ class CFuncDefNode(FuncDefNode):
if
declarator
.
skipped_self
:
_name
,
_type
,
_pos
,
_
=
declarator
.
skipped_self
_cname
=
"this"
if
self
.
is_const_method
:
_type
=
PyrexTypes
.
cyp_class_const_type
(
_type
)
entry
=
self
.
local_scope
.
declare
(
_name
,
_cname
,
_type
,
_pos
,
'private'
)
entry
.
is_variable
=
1
entry
.
is_self_arg
=
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