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
26634fc5
Commit
26634fc5
authored
Oct 13, 2007
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
merged in changes from Cython 0.9.6.7
parents
df831940
997ac5b6
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
396 additions
and
112 deletions
+396
-112
Cython/Compiler/Code.py
Cython/Compiler/Code.py
+2
-1
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+125
-45
Cython/Compiler/ModuleNode.py
Cython/Compiler/ModuleNode.py
+7
-1
Cython/Compiler/Naming.py
Cython/Compiler/Naming.py
+5
-0
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+114
-14
Cython/Compiler/Parsing.py
Cython/Compiler/Parsing.py
+20
-11
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+0
-2
Cython/Compiler/Scanning.py
Cython/Compiler/Scanning.py
+1
-1
Cython/Compiler/Symtab.py
Cython/Compiler/Symtab.py
+119
-35
Cython/Compiler/TypeSlots.py
Cython/Compiler/TypeSlots.py
+2
-1
Cython/Compiler/Version.py
Cython/Compiler/Version.py
+1
-1
No files found.
Cython/Compiler/Code.py
View file @
26634fc5
...
...
@@ -85,7 +85,8 @@ class CCodeWriter:
try
:
return
self
.
input_file_contents
[
file
]
except
KeyError
:
F
=
open
(
file
).
readlines
()
F
=
[
line
.
replace
(
'*/'
,
'*[inserted by cython to avoid comment closer]/'
)
for
line
in
open
(
file
).
readlines
()]
self
.
input_file_contents
[
file
]
=
F
return
F
...
...
Cython/Compiler/ExprNodes.py
View file @
26634fc5
This diff is collapsed.
Click to expand it.
Cython/Compiler/ModuleNode.py
View file @
26634fc5
...
...
@@ -125,6 +125,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code
.
putln
(
""
)
code
.
putln
(
"/* Implementation of %s */"
%
env
.
qualified_name
)
self
.
generate_const_definitions
(
env
,
code
)
self
.
generate_interned_num_decls
(
env
,
code
)
self
.
generate_interned_name_decls
(
env
,
code
)
self
.
generate_py_string_decls
(
env
,
code
)
self
.
generate_cached_builtins_decls
(
env
,
code
)
...
...
@@ -995,7 +996,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
"static struct PyMethodDef %s[] = {"
%
env
.
method_table_cname
)
for
entry
in
env
.
pyfunc_entries
:
code
.
put_pymethoddef
(
entry
,
","
)
code
.
put_pymethoddef
(
entry
,
","
)
code
.
putln
(
"{0, 0, 0, 0}"
)
code
.
putln
(
...
...
@@ -1238,6 +1239,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code
.
error_goto
(
self
.
pos
)));
def
generate_intern_code
(
self
,
env
,
code
):
for
entry
in
env
.
pynum_entries
:
code
.
putln
(
"%s = PyInt_FromLong(%s); %s;"
%
(
entry
.
cname
,
entry
.
init
,
code
.
error_goto_if_null
(
entry
.
cname
,
self
.
pos
)))
if
env
.
intern_map
:
env
.
use_utility_code
(
Nodes
.
init_intern_tab_utility_code
);
code
.
putln
(
...
...
Cython/Compiler/Naming.py
View file @
26634fc5
...
...
@@ -21,6 +21,7 @@ pymethdef_prefix = pyrex_prefix + "mdef_"
methtab_prefix
=
pyrex_prefix
+
"methods_"
memtab_prefix
=
pyrex_prefix
+
"members_"
interned_prefix
=
pyrex_prefix
+
"n_"
interned_num_prefix
=
pyrex_prefix
+
"num_"
objstruct_prefix
=
pyrex_prefix
+
"obj_"
typeptr_prefix
=
pyrex_prefix
+
"ptype_"
prop_set_prefix
=
pyrex_prefix
+
"setprop_"
...
...
@@ -56,3 +57,7 @@ c_api_tab_cname = pyrex_prefix + "c_api_tab"
gilstate_cname
=
pyrex_prefix
+
"state"
extern_c_macro
=
pyrex_prefix
.
upper
()
+
"EXTERN_C"
def
py_version_hex
(
major
,
minor
=
0
,
micro
=
0
,
release_level
=
0
,
release_serial
=
0
):
return
(
major
<<
24
)
|
(
minor
<<
16
)
|
(
micro
<<
8
)
|
(
release_level
<<
4
)
|
(
release_serial
)
Cython/Compiler/Nodes.py
View file @
26634fc5
This diff is collapsed.
Click to expand it.
Cython/Compiler/Parsing.py
View file @
26634fc5
...
...
@@ -1209,13 +1209,21 @@ def p_statement(s, level, cdef_flag = 0, visibility = 'private'):
if
level
not
in
(
'module'
,
'module_pxd'
):
s
.
error
(
"ctypedef statement not allowed here"
)
return
p_ctypedef_statement
(
s
,
level
,
visibility
)
overridable
=
0
if
s
.
sy
==
'cdef'
:
cdef_flag
=
1
s
.
next
()
if
s
.
sy
==
'rdef'
:
cdef_flag
=
1
overridable
=
1
s
.
next
()
if
cdef_flag
:
if
level
not
in
(
'module'
,
'module_pxd'
,
'function'
,
'c_class'
,
'c_class_pxd'
):
s
.
error
(
'cdef statement not allowed here'
)
return
p_cdef_statement
(
s
,
level
,
visibility
)
return
p_cdef_statement
(
s
,
level
,
visibility
,
overridable
=
overridable
)
# elif s.sy == 'rdef':
# s.next()
# return p_c_func_or_var_declaration(s, level, s.position(), visibility = visibility, overridable = True)
elif
s
.
sy
==
'def'
:
if
level
not
in
(
'module'
,
'class'
,
'c_class'
,
'property'
):
s
.
error
(
'def statement not allowed here'
)
...
...
@@ -1234,8 +1242,6 @@ def p_statement(s, level, cdef_flag = 0, visibility = 'private'):
if
level
in
(
'c_class'
,
'c_class_pxd'
):
if
s
.
sy
==
'pass'
:
return
p_pass_statement
(
s
,
with_newline
=
1
)
else
:
s
.
error
(
"Executable statement not allowed here"
)
if
s
.
sy
==
'if'
:
return
p_if_statement
(
s
)
elif
s
.
sy
==
'while'
:
...
...
@@ -1572,8 +1578,10 @@ def p_c_arg_decl(s, in_pyfunc, cmethod_flag = 0, kw_only = 0):
default
=
default
,
kw_only
=
kw_only
)
def
p_cdef_statement
(
s
,
level
,
visibility
=
'private'
):
def
p_cdef_statement
(
s
,
level
,
visibility
=
'private'
,
overridable
=
False
):
pos
=
s
.
position
()
if
overridable
and
level
not
in
(
'c_class'
,
'c_class_pxd'
):
error
(
pos
,
"Overridable cdef function not allowed here"
)
visibility
=
p_visibility
(
s
,
visibility
)
if
visibility
==
'extern'
and
s
.
sy
in
(
'from'
,
':'
):
return
p_cdef_extern_block
(
s
,
level
,
pos
)
...
...
@@ -1595,7 +1603,7 @@ def p_cdef_statement(s, level, visibility = 'private'):
s
.
expect_newline
(
'Expected a newline'
)
return
node
else
:
return
p_c_func_or_var_declaration
(
s
,
level
,
pos
,
visibility
)
return
p_c_func_or_var_declaration
(
s
,
level
,
pos
,
visibility
,
overridable
)
def
p_cdef_extern_block
(
s
,
level
,
pos
):
include_file
=
None
...
...
@@ -1700,13 +1708,13 @@ def p_visibility(s, prev_visibility):
return
visibility
def
p_c_modifiers
(
s
):
if
s
.
sy
string
in
(
'inline'
,
):
modifier
=
s
.
systring
.
upper
()
# uppercase is macro defined for various compilers
if
s
.
sy
==
'IDENT'
and
s
.
systring
in
(
'inline'
,
):
modifier
=
s
.
systring
s
.
next
()
return
modifier
+
' '
+
p_c_modifiers
(
s
)
return
""
return
[
modifier
]
+
p_c_modifiers
(
s
)
return
[]
def
p_c_func_or_var_declaration
(
s
,
level
,
pos
,
visibility
=
'private'
):
def
p_c_func_or_var_declaration
(
s
,
level
,
pos
,
visibility
=
'private'
,
overridable
=
False
):
cmethod_flag
=
level
in
(
'c_class'
,
'c_class_pxd'
)
modifiers
=
p_c_modifiers
(
s
)
base_type
=
p_c_base_type
(
s
)
...
...
@@ -1720,7 +1728,8 @@ def p_c_func_or_var_declaration(s, level, pos, visibility = 'private'):
base_type
=
base_type
,
declarator
=
declarator
,
body
=
suite
,
modifiers
=
modifiers
)
modifiers
=
modifiers
,
overridable
=
overridable
)
else
:
if
level
==
'module_pxd'
and
visibility
<>
'extern'
:
error
(
pos
,
...
...
Cython/Compiler/PyrexTypes.py
View file @
26634fc5
...
...
@@ -346,8 +346,6 @@ class CIntType(CNumericType):
class
CBIntType
(
CIntType
):
# TODO: this should be a macro "(__ ? Py_True : Py_False)"
# and no error checking should be needed (just an incref).
to_py_function
=
"__Pyx_PyBool_FromLong"
from_py_function
=
"__Pyx_PyObject_IsTrue"
exception_check
=
0
...
...
Cython/Compiler/Scanning.py
View file @
26634fc5
...
...
@@ -138,7 +138,7 @@ reserved_words = [
"raise"
,
"import"
,
"exec"
,
"try"
,
"except"
,
"finally"
,
"while"
,
"if"
,
"elif"
,
"else"
,
"for"
,
"in"
,
"assert"
,
"and"
,
"or"
,
"not"
,
"is"
,
"in"
,
"lambda"
,
"from"
,
"NULL"
,
"cimport"
,
"by"
,
"with"
"NULL"
,
"cimport"
,
"by"
,
"with"
,
"rdef"
]
function_contexts
=
[
# allowed arguments to the "with" option
...
...
Cython/Compiler/Symtab.py
View file @
26634fc5
...
...
@@ -30,6 +30,7 @@ class Entry:
# or class attribute during
# class construction
# is_special boolean Is a special class method
# is_member boolean Is an assigned class member
# is_variable boolean Is a variable
# is_cfunction boolean Is a C function
# is_cmethod boolean Is a C method of an extension type
...
...
@@ -72,6 +73,7 @@ class Entry:
is_cglobal
=
0
is_pyglobal
=
0
is_special
=
0
is_member
=
0
is_variable
=
0
is_cfunction
=
0
is_cmethod
=
0
...
...
@@ -121,6 +123,7 @@ class Scope:
# free_temp_entries [Entry] Temp variables currently unused
# temp_counter integer Counter for naming temp vars
# cname_to_entry {string : Entry} Temp cname to entry mapping
# int_to_entry {int : Entry} Temp cname to entry mapping
# pow_function_used boolean The C pow() function is used
# return_type PyrexType or None Return type of function owning scope
# is_py_class_scope boolean Is a Python class scope
...
...
@@ -167,6 +170,7 @@ class Scope:
self
.
cname_to_entry
=
{}
self
.
pow_function_used
=
0
self
.
string_to_entry
=
{}
self
.
num_to_entry
=
{}
self
.
pystring_entries
=
[]
def
__str__
(
self
):
...
...
@@ -392,6 +396,28 @@ class Scope:
entry
.
pystring_cname
=
entry
.
cname
+
"p"
self
.
pystring_entries
.
append
(
entry
)
self
.
global_scope
().
all_pystring_entries
.
append
(
entry
)
def
add_py_num
(
self
,
value
):
# Add an entry for an int constant.
cname
=
"%s%s"
%
(
Naming
.
interned_num_prefix
,
value
)
cname
=
cname
.
replace
(
'-'
,
'neg_'
).
replace
(
'.'
,
'_'
)
entry
=
Entry
(
""
,
cname
,
c_long_type
,
init
=
value
)
entry
.
used
=
1
entry
.
is_interned
=
1
self
.
const_entries
.
append
(
entry
)
self
.
interned_nums
.
append
(
entry
)
return
entry
def
get_py_num
(
self
,
value
):
# Get entry for int constant. Returns an existing
# one if possible, otherwise creates a new one.
genv
=
self
.
global_scope
()
entry
=
genv
.
num_to_entry
.
get
(
value
)
if
not
entry
:
entry
=
genv
.
add_py_num
(
value
)
genv
.
num_to_entry
[
value
]
=
entry
genv
.
pynum_entries
.
append
(
entry
)
return
entry
def
new_const_cname
(
self
):
# Create a new globally-unique name for a constant.
...
...
@@ -606,8 +632,10 @@ class ModuleScope(Scope):
self
.
cimported_modules
=
[]
self
.
intern_map
=
{}
self
.
interned_names
=
[]
self
.
interned_nums
=
[]
self
.
all_pystring_entries
=
[]
self
.
types_imported
=
{}
self
.
pynum_entries
=
[]
def
qualifying_scope
(
self
):
return
self
.
parent_module
...
...
@@ -1052,45 +1080,58 @@ class CClassScope(ClassScope):
def
declare_var
(
self
,
name
,
type
,
pos
,
cname
=
None
,
visibility
=
'private'
,
is_cdef
=
0
):
# Add an entry for an attribute.
if
self
.
defined
:
error
(
pos
,
"C attributes cannot be added in implementation part of"
" extension type"
)
if
get_special_method_signature
(
name
):
error
(
pos
,
"The name '%s' is reserved for a special method."
%
name
)
if
not
cname
:
cname
=
name
entry
=
self
.
declare
(
name
,
cname
,
type
,
pos
)
entry
.
visibility
=
visibility
entry
.
is_variable
=
1
self
.
var_entries
.
append
(
entry
)
if
type
.
is_pyobject
:
self
.
has_pyobject_attrs
=
1
if
visibility
not
in
(
'private'
,
'public'
,
'readonly'
):
error
(
pos
,
"Attribute of extension type cannot be declared %s"
%
visibility
)
if
visibility
in
(
'public'
,
'readonly'
):
if
type
.
pymemberdef_typecode
:
self
.
public_attr_entries
.
append
(
entry
)
if
name
==
"__weakref__"
:
error
(
pos
,
"Special attribute __weakref__ cannot be exposed to Python"
)
else
:
if
is_cdef
:
# Add an entry for an attribute.
if
self
.
defined
:
error
(
pos
,
"C attribute of type '%s' cannot be accessed from Python"
%
type
)
if
visibility
==
'public'
and
type
.
is_extension_type
:
error
(
pos
,
"Non-generic Python attribute cannot be exposed for writing from Python"
)
return
entry
"C attributes cannot be added in implementation part of"
" extension type"
)
if
get_special_method_signature
(
name
):
error
(
pos
,
"The name '%s' is reserved for a special method."
%
name
)
if
not
cname
:
cname
=
name
entry
=
self
.
declare
(
name
,
cname
,
type
,
pos
)
entry
.
visibility
=
visibility
entry
.
is_variable
=
1
self
.
var_entries
.
append
(
entry
)
if
type
.
is_pyobject
:
self
.
has_pyobject_attrs
=
1
if
visibility
not
in
(
'private'
,
'public'
,
'readonly'
):
error
(
pos
,
"Attribute of extension type cannot be declared %s"
%
visibility
)
if
visibility
in
(
'public'
,
'readonly'
):
if
type
.
pymemberdef_typecode
:
self
.
public_attr_entries
.
append
(
entry
)
if
name
==
"__weakref__"
:
error
(
pos
,
"Special attribute __weakref__ cannot be exposed to Python"
)
else
:
error
(
pos
,
"C attribute of type '%s' cannot be accessed from Python"
%
type
)
if
visibility
==
'public'
and
type
.
is_extension_type
:
error
(
pos
,
"Non-generic Python attribute cannot be exposed for writing from Python"
)
return
entry
else
:
# Add an entry for a class attribute.
entry
=
Scope
.
declare_var
(
self
,
name
,
type
,
pos
,
cname
,
visibility
,
is_cdef
)
entry
.
is_member
=
1
entry
.
is_pyglobal
=
1
# xxx: is_pyglobal changes behaviour in so many places that
# I keep it in for now. is_member should be enough
# later on
entry
.
namespace_cname
=
"(PyObject *)%s"
%
self
.
parent_type
.
typeptr_cname
if
Options
.
intern_names
:
entry
.
interned_cname
=
self
.
intern
(
name
)
return
entry
def
declare_pyfunction
(
self
,
name
,
pos
):
# Add an entry for a method.
if
name
in
(
'__eq__'
,
'__ne__'
,
'__lt__'
,
'__gt__'
,
'__le__'
,
'__ge__'
):
error
(
pos
,
"Special method %s must be implemented via __richcmp__"
%
name
)
entry
=
self
.
declare
(
name
,
name
,
py_object_type
,
pos
)
error
(
pos
,
"Special method %s must be implemented via __richcmp__"
%
name
)
entry
=
self
.
declare_var
(
name
,
py_object_type
,
pos
)
special_sig
=
get_special_method_signature
(
name
)
if
special_sig
:
# Special methods get put in the method table with a particular
...
...
@@ -1168,8 +1209,29 @@ class CClassScope(ClassScope):
entry
=
self
.
add_cfunction
(
base_entry
.
name
,
base_entry
.
type
,
None
,
adapt
(
base_entry
.
cname
),
base_entry
.
visibility
)
entry
.
is_inherited
=
1
def
allocate_temp
(
self
,
type
):
return
Scope
.
allocate_temp
(
self
.
global_scope
(),
type
)
def
release_temp
(
self
,
cname
):
return
Scope
.
release_temp
(
self
.
global_scope
(),
cname
)
def
lookup
(
self
,
name
):
if
name
==
"classmethod"
:
# We don't want to use the builtin classmethod here 'cause it won't do the
# right thing in this scope (as the class memebers aren't still functions).
# Don't want to add a cfunction to this scope 'cause that would mess with
# the type definition, so we just return the right entry.
self
.
use_utility_code
(
classmethod_utility_code
)
entry
=
Entry
(
"classmethod"
,
"__Pyx_Method_ClassMethod"
,
CFuncType
(
py_object_type
,
[
CFuncTypeArg
(
""
,
py_object_type
,
None
)],
0
,
0
))
entry
.
is_cfunction
=
1
return
entry
else
:
return
Scope
.
lookup
(
self
,
name
)
class
PropertyScope
(
Scope
):
# Scope holding the __get__, __set__ and __del__ methods for
# a property of an extension type.
...
...
@@ -1188,3 +1250,25 @@ class PropertyScope(Scope):
error
(
pos
,
"Only __get__, __set__ and __del__ methods allowed "
"in a property declaration"
)
return
None
# Should this go elsewhere (and then get imported)?
#------------------------------------------------------------------------------------
classmethod_utility_code
=
[
"""
#include "descrobject.h"
static PyObject* __Pyx_Method_ClassMethod(PyObject *method); /*proto*/
"""
,
"""
static PyObject* __Pyx_Method_ClassMethod(PyObject *method) {
/* It appears that PyMethodDescr_Type is not anywhere exposed in the Python/C API */
/* if (!PyObject_TypeCheck(method, &PyMethodDescr_Type)) { */
if (strcmp(method->ob_type->tp_name, "method_descriptor") != 0) {
PyErr_Format(PyExc_TypeError, "Extension type classmethod() can only be called on a method_descriptor.");
return NULL;
}
PyMethodDescrObject *descr = (PyMethodDescrObject *)method;
return PyDescr_NewClassMethod(descr->d_type, descr->d_method);
}
"""
]
Cython/Compiler/TypeSlots.py
View file @
26634fc5
...
...
@@ -5,6 +5,7 @@
import
Naming
import
PyrexTypes
import
sys
class
Signature
:
# Method slot signature descriptor.
...
...
@@ -163,7 +164,7 @@ class GCDependentSlot(SlotDescriptor):
# the type participates in GC.
def
__init__
(
self
,
slot_name
,
no_gc_value
,
gc_value
,
dynamic
=
0
):
SlotDescriptor
.
__init__
(
self
,
slot_name
,
dynamic
)
SlotDescriptor
.
__init__
(
self
,
slot_name
,
dynamic
=
dynamic
)
self
.
no_gc_value
=
no_gc_value
self
.
gc_value
=
gc_value
...
...
Cython/Compiler/Version.py
View file @
26634fc5
version
=
'0.9.6.
6
'
version
=
'0.9.6.
7
'
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