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
ef83d2ab
Commit
ef83d2ab
authored
Oct 08, 2008
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
struct to object via dict
parent
820e1291
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
57 additions
and
5 deletions
+57
-5
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+4
-3
Cython/Compiler/Naming.py
Cython/Compiler/Naming.py
+1
-0
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+42
-1
Cython/Compiler/Symtab.py
Cython/Compiler/Symtab.py
+10
-1
No files found.
Cython/Compiler/ExprNodes.py
View file @
ef83d2ab
...
@@ -3351,7 +3351,8 @@ class TypecastNode(ExprNode):
...
@@ -3351,7 +3351,8 @@ class TypecastNode(ExprNode):
if
from_py
and
not
to_py
and
self
.
operand
.
is_ephemeral
()
and
not
self
.
type
.
is_numeric
:
if
from_py
and
not
to_py
and
self
.
operand
.
is_ephemeral
()
and
not
self
.
type
.
is_numeric
:
error
(
self
.
pos
,
"Casting temporary Python object to non-numeric non-Python type"
)
error
(
self
.
pos
,
"Casting temporary Python object to non-numeric non-Python type"
)
if
to_py
and
not
from_py
:
if
to_py
and
not
from_py
:
if
self
.
operand
.
type
.
to_py_function
:
if
(
self
.
operand
.
type
.
to_py_function
and
self
.
operand
.
type
.
create_convert_utility_code
(
env
)):
self
.
result_ctype
=
py_object_type
self
.
result_ctype
=
py_object_type
self
.
operand
=
self
.
operand
.
coerce_to_pyobject
(
env
)
self
.
operand
=
self
.
operand
.
coerce_to_pyobject
(
env
)
else
:
else
:
...
@@ -4388,7 +4389,7 @@ class CoerceToPyTypeNode(CoercionNode):
...
@@ -4388,7 +4389,7 @@ class CoerceToPyTypeNode(CoercionNode):
self
.
type
=
py_object_type
self
.
type
=
py_object_type
self
.
gil_check
(
env
)
self
.
gil_check
(
env
)
self
.
is_temp
=
1
self
.
is_temp
=
1
if
not
arg
.
type
.
to_py_function
:
if
not
arg
.
type
.
to_py_function
or
not
arg
.
type
.
create_convert_utility_code
(
env
)
:
error
(
arg
.
pos
,
error
(
arg
.
pos
,
"Cannot convert '%s' to Python object"
%
arg
.
type
)
"Cannot convert '%s' to Python object"
%
arg
.
type
)
...
...
Cython/Compiler/Naming.py
View file @
ef83d2ab
...
@@ -42,6 +42,7 @@ vtable_prefix = pyrex_prefix + "vtable_"
...
@@ -42,6 +42,7 @@ vtable_prefix = pyrex_prefix + "vtable_"
vtabptr_prefix
=
pyrex_prefix
+
"vtabptr_"
vtabptr_prefix
=
pyrex_prefix
+
"vtabptr_"
vtabstruct_prefix
=
pyrex_prefix
+
"vtabstruct_"
vtabstruct_prefix
=
pyrex_prefix
+
"vtabstruct_"
opt_arg_prefix
=
pyrex_prefix
+
"opt_args_"
opt_arg_prefix
=
pyrex_prefix
+
"opt_args_"
convert_func_prefix
=
pyrex_prefix
+
"convert_"
args_cname
=
pyrex_prefix
+
"args"
args_cname
=
pyrex_prefix
+
"args"
pykwdlist_cname
=
pyrex_prefix
+
"pyargnames"
pykwdlist_cname
=
pyrex_prefix
+
"pyargnames"
...
...
Cython/Compiler/PyrexTypes.py
View file @
ef83d2ab
...
@@ -405,6 +405,9 @@ class CType(PyrexType):
...
@@ -405,6 +405,9 @@ class CType(PyrexType):
exception_value
=
None
exception_value
=
None
exception_check
=
1
exception_check
=
1
def
create_convert_utility_code
(
self
,
env
):
return
True
def
error_condition
(
self
,
result_code
):
def
error_condition
(
self
,
result_code
):
conds
=
[]
conds
=
[]
if
self
.
is_string
:
if
self
.
is_string
:
...
@@ -932,6 +935,41 @@ class CStructOrUnionType(CType):
...
@@ -932,6 +935,41 @@ class CStructOrUnionType(CType):
self
.
scope
=
scope
self
.
scope
=
scope
self
.
typedef_flag
=
typedef_flag
self
.
typedef_flag
=
typedef_flag
self
.
is_struct
=
kind
==
'struct'
self
.
is_struct
=
kind
==
'struct'
if
self
.
is_struct
:
self
.
to_py_function
=
"%s_to_py_%s"
%
(
Naming
.
convert_func_prefix
,
self
.
cname
)
self
.
exception_check
=
True
self
.
_convert_code
=
None
def
create_convert_utility_code
(
self
,
env
):
if
env
.
outer_scope
is
None
:
return
False
if
self
.
_convert_code
is
None
:
import
Code
code
=
Code
.
CCodeWriter
()
header
=
"static PyObject* %s(%s)"
%
(
self
.
to_py_function
,
self
.
declaration_code
(
's'
))
code
.
putln
(
"%s {"
%
header
)
code
.
putln
(
"PyObject* res;"
)
code
.
putln
(
"PyObject* member;"
)
code
.
putln
(
"res = PyDict_New(); if (res == NULL) return NULL;"
)
for
member
in
self
.
scope
.
var_entries
:
if
member
.
type
.
to_py_function
and
member
.
type
.
create_convert_utility_code
(
env
):
code
.
putln
(
"member = %s(s.%s); if (member == NULL) goto bad;"
%
(
member
.
type
.
to_py_function
,
member
.
cname
))
code
.
putln
(
"if (PyDict_SetItem(res, %s, member) < 0) goto bad;"
%
member
.
py_name
.
pystring_cname
)
code
.
putln
(
"Py_DECREF(member);"
)
else
:
self
.
to_py_function
=
None
return
False
code
.
putln
(
"return res;"
)
code
.
putln
(
"bad:"
)
code
.
putln
(
"Py_XDECREF(member);"
)
code
.
putln
(
"Py_DECREF(res);"
)
code
.
putln
(
"return NULL;"
)
code
.
putln
(
"}"
)
self
.
_convert_code
=
self
.
declaration_code
(
''
)
+
';
\
n
'
+
header
+
";"
,
code
.
buffer
.
getvalue
()
env
.
use_utility_code
(
self
.
_convert_code
)
return
True
def
__repr__
(
self
):
def
__repr__
(
self
):
return
"<CStructOrUnionType %s %s%s>"
%
(
self
.
name
,
self
.
cname
,
return
"<CStructOrUnionType %s %s%s>"
%
(
self
.
name
,
self
.
cname
,
...
@@ -1076,6 +1114,9 @@ class ErrorType(PyrexType):
...
@@ -1076,6 +1114,9 @@ class ErrorType(PyrexType):
from_py_function
=
"dummy"
from_py_function
=
"dummy"
typestring
=
None
typestring
=
None
def
create_convert_utility_code
(
self
,
env
):
return
True
def
declaration_code
(
self
,
entity_code
,
def
declaration_code
(
self
,
entity_code
,
for_display
=
0
,
dll_linkage
=
None
,
pyrex
=
0
):
for_display
=
0
,
dll_linkage
=
None
,
pyrex
=
0
):
return
"<error>"
return
"<error>"
...
...
Cython/Compiler/Symtab.py
View file @
ef83d2ab
...
@@ -359,6 +359,8 @@ class Scope:
...
@@ -359,6 +359,8 @@ class Scope:
self.type_entries.append(entry)
self.type_entries.append(entry)
if not scope and not entry.type.scope:
if not scope and not entry.type.scope:
self.check_for_illegal_incomplete_ctypedef(typedef_flag, pos)
self.check_for_illegal_incomplete_ctypedef(typedef_flag, pos)
if scope and self.outer_scope:
scope.module_scope = self
return entry
return entry
def check_previous_typedef_flag(self, entry, typedef_flag, pos):
def check_previous_typedef_flag(self, entry, typedef_flag, pos):
...
@@ -959,6 +961,7 @@ class ModuleScope(Scope):
...
@@ -959,6 +961,7 @@ class ModuleScope(Scope):
return "
%
s
%
s
%
d
" % (Naming.const_prefix, prefix, n)
return "
%
s
%
s
%
d
" % (Naming.const_prefix, prefix, n)
def use_utility_code(self, new_code, name=None):
def use_utility_code(self, new_code, name=None):
if new_code is not None:
self.utility_code_list.append((new_code, name))
self.utility_code_list.append((new_code, name))
def declare_c_class(self, name, pos, defining = 0, implementing = 0,
def declare_c_class(self, name, pos, defining = 0, implementing = 0,
...
@@ -1204,6 +1207,8 @@ class GeneratorLocalScope(LocalScope):
...
@@ -1204,6 +1207,8 @@ class GeneratorLocalScope(LocalScope):
class StructOrUnionScope(Scope):
class StructOrUnionScope(Scope):
# Namespace of a C struct or union.
# Namespace of a C struct or union.
module_scope = None
def __init__(self, name="?"):
def __init__(self, name="?"):
Scope.__init__(self, name, None, None)
Scope.__init__(self, name, None, None)
...
@@ -1216,6 +1221,10 @@ class StructOrUnionScope(Scope):
...
@@ -1216,6 +1221,10 @@ class StructOrUnionScope(Scope):
type = PyrexTypes.CPtrType(type)
type = PyrexTypes.CPtrType(type)
entry = self.declare(name, cname, type, pos, visibility)
entry = self.declare(name, cname, type, pos, visibility)
entry.is_variable = 1
entry.is_variable = 1
if self.module_scope:
py_name = self.module_scope.get_string_const(name, identifier=True)
self.module_scope.add_py_string(py_name)
entry.py_name = py_name
self.var_entries.append(entry)
self.var_entries.append(entry)
if type.is_pyobject and not allow_pyobject:
if type.is_pyobject and not allow_pyobject:
error(pos,
error(pos,
...
...
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