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
0f20d105
Commit
0f20d105
authored
May 26, 2009
by
Dag Sverre Seljebotn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert previous fix of #303
parent
8125f966
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
27 deletions
+11
-27
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+8
-15
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/ParseTreeTransforms.py
+3
-12
No files found.
Cython/Compiler/Nodes.py
View file @
0f20d105
...
...
@@ -801,25 +801,18 @@ class CVarDefNode(StatNode):
self
.
dest_scope
=
dest_scope
base_type
=
self
.
base_type
.
analyse
(
env
)
need_property
=
False
# If the field is an external typedef, we cannot be sure about the type,
# so do conversion ourself rather than rely on the CPython mechanism (through
# a property; made in AnalyseDeclarationsTransform).
if
(
dest_scope
.
is_c_class_scope
and
self
.
visibility
==
'public'
and
base_type
.
is_pyobject
and
(
base_type
.
is_builtin_type
or
base_type
.
is_extension_type
)):
# If the field is settable and extension type, then the CPython mechanism does
# not do enough type-checking for us.
need_property
=
True
elif
(
base_type
.
is_typedef
and
base_type
.
typedef_is_external
and
(
self
.
visibility
in
(
'public'
,
'readonly'
))):
# If the field is an external typedef, we cannot be sure about the type,
# so do conversion ourself rather than rely on the CPython mechanism (through
# a property; made in AnalyseDeclarationsTransform).
and
self
.
visibility
==
'public'
and
base_type
.
is_pyobject
and
(
base_type
.
is_builtin_type
or
base_type
.
is_extension_type
)):
self
.
need_properties
=
[]
need_property
=
True
if
need_property
:
visibility
=
'private'
self
.
need_properties
=
[]
else
:
need_property
=
False
visibility
=
self
.
visibility
for
declarator
in
self
.
declarators
:
...
...
Cython/Compiler/ParseTreeTransforms.py
View file @
0f20d105
...
...
@@ -625,12 +625,6 @@ property NAME:
ATTR = value
"""
,
level
=
'c_class'
)
readonly_property
=
TreeFragment
(
u"""
property NAME:
def __get__(self):
return ATTR
"""
,
level
=
'c_class'
)
def
__call__
(
self
,
root
):
self
.
env_stack
=
[
root
.
scope
]
# needed to determine if a cdef var is declared after it's used.
...
...
@@ -707,7 +701,7 @@ property NAME:
# mechanism for them.
stats
=
[]
for
entry
in
node
.
need_properties
:
property
=
self
.
create_Property
(
entry
,
node
.
visibility
==
'readonly'
)
property
=
self
.
create_Property
(
entry
)
property
.
analyse_declarations
(
node
.
dest_scope
)
self
.
visit
(
property
)
stats
.
append
(
property
)
...
...
@@ -715,11 +709,8 @@ property NAME:
else
:
return
None
def
create_Property
(
self
,
entry
,
readonly
):
if
readonly
:
template
=
self
.
readonly_property
else
:
template
=
self
.
basic_property
def
create_Property
(
self
,
entry
):
template
=
self
.
basic_property
property
=
template
.
substitute
({
u"ATTR"
:
AttributeNode
(
pos
=
entry
.
pos
,
obj
=
NameNode
(
pos
=
entry
.
pos
,
name
=
"self"
),
...
...
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