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
Boxiang Sun
cython
Commits
112e74e4
Commit
112e74e4
authored
Sep 03, 2008
by
Dag Sverre Seljebotn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicitly disallow assigning default values to struct/union members
Earlier, the compiler would crash in this situation.
parent
7e871646
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
19 deletions
+26
-19
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/ParseTreeTransforms.py
+19
-17
tests/errors/e_cdefassign.pyx
tests/errors/e_cdefassign.pyx
+6
-1
tests/errors/extclassattrsetting.pyx
tests/errors/extclassattrsetting.pyx
+1
-1
No files found.
Cython/Compiler/ParseTreeTransforms.py
View file @
112e74e4
...
@@ -80,7 +80,7 @@ class NormalizeTree(CythonTransform):
...
@@ -80,7 +80,7 @@ class NormalizeTree(CythonTransform):
class
PostParseError
(
CompileError
):
pass
class
PostParseError
(
CompileError
):
pass
# error strings checked by unit tests, so define them
# error strings checked by unit tests, so define them
ERR_CDEF_INCLASS
=
'Cannot assign default value to
cdef class attribute
s'
ERR_CDEF_INCLASS
=
'Cannot assign default value to
fields in cdef classes, structs or union
s'
ERR_BUF_LOCALONLY
=
'Buffer types only allowed as function local variables'
ERR_BUF_LOCALONLY
=
'Buffer types only allowed as function local variables'
ERR_BUF_DEFAULTS
=
'Invalid buffer defaults specification (see docs)'
ERR_BUF_DEFAULTS
=
'Invalid buffer defaults specification (see docs)'
ERR_INVALID_SPECIALATTR_TYPE
=
'Special attributes must not have a type declared'
ERR_INVALID_SPECIALATTR_TYPE
=
'Special attributes must not have a type declared'
...
@@ -130,31 +130,33 @@ class PostParse(CythonTransform):
...
@@ -130,31 +130,33 @@ class PostParse(CythonTransform):
def
visit_ModuleNode
(
self
,
node
):
def
visit_ModuleNode
(
self
,
node
):
self
.
scope_type
=
'module'
self
.
scope_type
=
'module'
self
.
scope_node
=
node
self
.
visitchildren
(
node
)
self
.
visitchildren
(
node
)
return
node
return
node
def
visit_
ClassDefNode
(
self
,
nod
e
):
def
visit_
scope
(
self
,
node
,
scope_typ
e
):
prev
=
self
.
scope_type
prev
=
self
.
scope_type
,
self
.
scope_node
self
.
scope_type
=
'class'
self
.
scope_type
=
scope_type
self
.
class
node
=
node
self
.
scope_
node
=
node
self
.
visitchildren
(
node
)
self
.
visitchildren
(
node
)
self
.
scope_type
=
prev
self
.
scope_type
,
self
.
scope_node
=
prev
del
self
.
classnode
return
node
return
node
def
visit_ClassDefNode
(
self
,
node
):
return
self
.
visit_scope
(
node
,
'class'
)
def
visit_FuncDefNode
(
self
,
node
):
def
visit_FuncDefNode
(
self
,
node
):
prev
=
self
.
scope_type
return
self
.
visit_scope
(
node
,
'function'
)
self
.
scope_type
=
'function'
self
.
visitchildren
(
node
)
def
visit_CStructOrUnionDefNode
(
self
,
node
):
self
.
scope_type
=
prev
return
self
.
visit_scope
(
node
,
'struct'
)
return
node
# cdef variables
# cdef variables
def
handle_bufferdefaults
(
self
,
decl
):
def
handle_bufferdefaults
(
self
,
decl
):
if
not
isinstance
(
decl
.
default
,
DictNode
):
if
not
isinstance
(
decl
.
default
,
DictNode
):
raise
PostParseError
(
decl
.
pos
,
ERR_BUF_DEFAULTS
)
raise
PostParseError
(
decl
.
pos
,
ERR_BUF_DEFAULTS
)
self
.
class
node
.
buffer_defaults_node
=
decl
.
default
self
.
scope_
node
.
buffer_defaults_node
=
decl
.
default
self
.
class
node
.
buffer_defaults_pos
=
decl
.
pos
self
.
scope_
node
.
buffer_defaults_pos
=
decl
.
pos
def
visit_CVarDefNode
(
self
,
node
):
def
visit_CVarDefNode
(
self
,
node
):
# This assumes only plain names and pointers are assignable on
# This assumes only plain names and pointers are assignable on
...
@@ -171,8 +173,8 @@ class PostParse(CythonTransform):
...
@@ -171,8 +173,8 @@ class PostParse(CythonTransform):
declbase
=
declbase
.
base
declbase
=
declbase
.
base
if
isinstance
(
declbase
,
CNameDeclaratorNode
):
if
isinstance
(
declbase
,
CNameDeclaratorNode
):
if
declbase
.
default
is
not
None
:
if
declbase
.
default
is
not
None
:
if
self
.
scope_type
==
'class'
:
if
self
.
scope_type
in
(
'class'
,
'struct'
)
:
if
isinstance
(
self
.
class
node
,
CClassDefNode
):
if
isinstance
(
self
.
scope_
node
,
CClassDefNode
):
handler
=
self
.
specialattribute_handlers
.
get
(
decl
.
name
)
handler
=
self
.
specialattribute_handlers
.
get
(
decl
.
name
)
if
handler
:
if
handler
:
if
decl
is
not
declbase
:
if
decl
is
not
declbase
:
...
...
tests/errors/e_cdefassign.pyx
View file @
112e74e4
cdef
class
A
:
cdef
class
A
:
cdef
int
value
=
3
cdef
int
value
=
3
cdef
extern
from
*
:
cdef
struct
B
:
int
value
=
3
_ERRORS
=
u"""
_ERRORS
=
u"""
2:13: Cannot assign default value to cdef class attributes
2:13: Cannot assign default value to fields in cdef classes, structs or unions
6:12: Cannot assign default value to fields in cdef classes, structs or unions
"""
"""
tests/errors/extclassattrsetting.pyx
View file @
112e74e4
...
@@ -13,5 +13,5 @@ cdef class ExtClass:
...
@@ -13,5 +13,5 @@ cdef class ExtClass:
_attribute
=
5
# FIXME: this is not currently handled!!!
_attribute
=
5
# FIXME: this is not currently handled!!!
_ERRORS
=
u"""
_ERRORS
=
u"""
8:13: Cannot assign default value to
cdef class attribute
s
8:13: Cannot assign default value to
fields in cdef classes, structs or union
s
"""
"""
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