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
Kirill Smelkov
cython
Commits
c1690bf3
Commit
c1690bf3
authored
Dec 22, 2012
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support @cython.final decorator in override .pxd files
parent
2f609c41
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
10 deletions
+79
-10
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/ParseTreeTransforms.py
+11
-10
tests/run/final_in_pxd.srctree
tests/run/final_in_pxd.srctree
+68
-0
No files found.
Cython/Compiler/ParseTreeTransforms.py
View file @
c1690bf3
...
@@ -909,16 +909,17 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
...
@@ -909,16 +909,17 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
return
self
.
visit_with_directives
(
body
,
directives
)
return
self
.
visit_with_directives
(
body
,
directives
)
def
visit_CVarDefNode
(
self
,
node
):
def
visit_CVarDefNode
(
self
,
node
):
if
not
node
.
decorators
:
directives
=
self
.
_extract_directives
(
node
,
'function'
)
if
not
directives
:
return
node
return
node
for
dec
in
node
.
decorators
:
for
name
,
value
in
directives
.
iteritems
():
for
directive
in
self
.
try_to_parse_directives
(
dec
.
decorator
)
or
():
if
name
==
'locals'
:
if
directive
is
not
None
and
directive
[
0
]
==
u'locals'
:
node
.
directive_locals
=
value
node
.
directive_locals
=
directive
[
1
]
elif
name
!=
'final'
:
else
:
self
.
context
.
nonfatal_error
(
PostParseError
(
dec
.
pos
,
self
.
context
.
nonfatal_error
(
PostParseError
(
dec
.
pos
,
"Cdef functions can only take cython.locals() decorator."
))
"Cdef functions can only take cython.locals() or final decorators, got %s."
%
name
))
return
node
body
=
Nodes
.
StatListNode
(
node
.
pos
,
stats
=
[
node
])
return
self
.
visit_with_directives
(
body
,
directives
)
def
visit_CClassDefNode
(
self
,
node
):
def
visit_CClassDefNode
(
self
,
node
):
directives
=
self
.
_extract_directives
(
node
,
'cclass'
)
directives
=
self
.
_extract_directives
(
node
,
'cclass'
)
...
@@ -948,7 +949,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
...
@@ -948,7 +949,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
directives
.
append
(
directive
)
directives
.
append
(
directive
)
else
:
else
:
realdecs
.
append
(
dec
)
realdecs
.
append
(
dec
)
if
realdecs
and
isinstance
(
node
,
(
Nodes
.
CFuncDefNode
,
Nodes
.
CClassDefNode
)):
if
realdecs
and
isinstance
(
node
,
(
Nodes
.
CFuncDefNode
,
Nodes
.
CClassDefNode
,
Nodes
.
CVarDefNode
)):
raise
PostParseError
(
realdecs
[
0
].
pos
,
"Cdef functions/classes cannot take arbitrary decorators."
)
raise
PostParseError
(
realdecs
[
0
].
pos
,
"Cdef functions/classes cannot take arbitrary decorators."
)
else
:
else
:
node
.
decorators
=
realdecs
node
.
decorators
=
realdecs
...
...
tests/run/final_in_pxd.srctree
0 → 100644
View file @
c1690bf3
PYTHON -c "import a; assert a.__file__.rstrip('co').endswith('.py'), a.__file__; a.test()"
PYTHON setup.py build_ext --inplace
PYTHON -c "import a; assert not a.__file__.rstrip('co').endswith('.py'), a.__file__; a.test()"
######## setup.py ########
from Cython.Build.Dependencies import cythonize
from distutils.core import setup
setup(
ext_modules = cythonize("a.py"),
)
######## a.pxd ########
cimport cython
cdef class ExtType:
@cython.final
cdef int final_func(self)
@cython.final
cdef class FinalExtType:
cdef int func(self)
@cython.final
cdef class FinalExtSubType(ExtType):
cdef int func(self)
cdef class NonFinalSubType(ExtType):
cdef int func(self)
######## a.py ########
import cython
class ExtType(object):
@cython.test_assert_path_exists("//CFuncDefNode[@entry.is_final_cmethod=True]")
def final_func(self):
return 1
class FinalExtType(object):
@cython.test_assert_path_exists("//CFuncDefNode[@entry.is_final_cmethod=True]")
def func(self):
return 2
class FinalExtSubType(ExtType):
@cython.test_assert_path_exists("//CFuncDefNode[@entry.is_final_cmethod=True]")
def func(self):
return 3
class NonFinalSubType(ExtType):
@cython.test_assert_path_exists("//CFuncDefNode[@entry.is_final_cmethod=True]")
@cython.final
def func(self):
return 4
def test():
assert ExtType().final_func() == 1
assert FinalExtSubType().final_func() == 1
assert NonFinalSubType().final_func() == 1
assert FinalExtType().func() == 2
assert FinalExtSubType().func() == 3
assert NonFinalSubType().func() == 4
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