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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
83593960
Commit
83593960
authored
Jul 28, 2020
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disallow cypclass method overloading with narrower or larger arguments
parent
45c48863
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
3 deletions
+30
-3
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+26
-0
Cython/Compiler/Symtab.py
Cython/Compiler/Symtab.py
+4
-3
No files found.
Cython/Compiler/PyrexTypes.py
View file @
83593960
...
@@ -3046,6 +3046,32 @@ class CFuncType(CType):
...
@@ -3046,6 +3046,32 @@ class CFuncType(CType):
return
0
return
0
return
1
return
1
def
narrower_or_larger_arguments_than
(
self
,
other_type
,
as_cmethod
=
0
):
return
self
.
narrower_or_larger_arguments_than_resolved_type
(
other_type
.
resolve
(),
as_cmethod
)
def
narrower_or_larger_arguments_than_resolved_type
(
self
,
other_type
,
as_cmethod
):
if
other_type
is
error_type
:
return
1
if
not
other_type
.
is_cfunction
:
return
0
nargs
=
len
(
self
.
args
)
if
nargs
!=
len
(
other_type
.
args
):
return
0
for
i
in
range
(
as_cmethod
,
nargs
):
if
not
self
.
args
[
i
].
type
.
subtype_of_resolved_type
(
other_type
.
args
[
i
].
type
):
if
not
other_type
.
args
[
i
].
type
.
subtype_of_resolved_type
(
self
.
args
[
i
].
type
):
return
0
else
:
other_type
.
args
[
i
].
needs_type_test
=
True
else
:
self
.
args
[
i
].
needs_type_test
=
other_type
.
args
[
i
].
needs_type_test
\
or
not
self
.
args
[
i
].
type
.
same_as
(
other_type
.
args
[
i
].
type
)
if
self
.
has_varargs
!=
other_type
.
has_varargs
:
return
0
if
self
.
optional_arg_count
!=
other_type
.
optional_arg_count
:
return
0
return
1
def
narrower_arguments_than
(
self
,
other_type
,
as_cmethod
=
0
):
def
narrower_arguments_than
(
self
,
other_type
,
as_cmethod
=
0
):
return
self
.
narrower_arguments_than_resolved_type
(
other_type
.
resolve
(),
as_cmethod
)
return
self
.
narrower_arguments_than_resolved_type
(
other_type
.
resolve
(),
as_cmethod
)
...
...
Cython/Compiler/Symtab.py
View file @
83593960
...
@@ -571,7 +571,7 @@ class Scope(object):
...
@@ -571,7 +571,7 @@ class Scope(object):
alt_declarator_str
=
alt_type
.
declarator_code
(
name
,
for_display
=
1
).
strip
()
alt_declarator_str
=
alt_type
.
declarator_code
(
name
,
for_display
=
1
).
strip
()
new_declarator_str
=
type
.
declarator_code
(
name
,
for_display
=
1
).
strip
()
new_declarator_str
=
type
.
declarator_code
(
name
,
for_display
=
1
).
strip
()
if
new_declarator_str
!=
alt_declarator_str
:
if
new_declarator_str
!=
alt_declarator_str
:
error
(
pos
,
(
"Fal
lacious
override:
\
n
"
error
(
pos
,
(
"Fal
se
override:
\
n
"
"Cypclass method
\
n
"
"Cypclass method
\
n
"
">> %s
\
n
"
">> %s
\
n
"
"has compatible arguments with inherited method
\
n
"
"has compatible arguments with inherited method
\
n
"
...
@@ -598,8 +598,9 @@ class Scope(object):
...
@@ -598,8 +598,9 @@ class Scope(object):
# if an overloaded alternative has narrower argument types than another, then the method
# if an overloaded alternative has narrower argument types than another, then the method
# actually called will depend on the static type of the arguments
# actually called will depend on the static type of the arguments
elif
type
.
narrower_arguments_than
(
alt_type
)
or
alt_type
.
narrower_arguments_than
(
type
):
# we actually also disallow methods where each argument is either narrower or larger
error
(
pos
,
"Cypclass overloaded method with narrower arguments"
)
elif
type
.
narrower_or_larger_arguments_than
(
alt_type
):
error
(
pos
,
"Cypclass overloaded method with narrower or larger arguments"
)
if
alt_entry
.
pos
is
not
None
:
if
alt_entry
.
pos
is
not
None
:
error
(
alt_entry
.
pos
,
"Conflicting method is defined here"
)
error
(
alt_entry
.
pos
,
"Conflicting method is defined here"
)
...
...
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