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
Gwenaël Samain
cython
Commits
4c11531e
Commit
4c11531e
authored
15 years ago
by
Dag Sverre Seljebotn
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
a865879e
fa9cca20
No related merge requests found
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
290 additions
and
11 deletions
+290
-11
Cython/Compiler/AnalysedTreeTransforms.py
Cython/Compiler/AnalysedTreeTransforms.py
+79
-0
Cython/Compiler/DebugFlags.py
Cython/Compiler/DebugFlags.py
+1
-1
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+40
-2
Cython/Compiler/Main.py
Cython/Compiler/Main.py
+2
-0
Cython/Compiler/Options.py
Cython/Compiler/Options.py
+6
-0
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/ParseTreeTransforms.py
+26
-8
Cython/Compiler/Visitor.py
Cython/Compiler/Visitor.py
+34
-0
tests/errors/e_doctesthack.pyx
tests/errors/e_doctesthack.pyx
+9
-0
tests/run/doctesthack.pyx
tests/run/doctesthack.pyx
+69
-0
tests/run/doctesthack_skip.pyx
tests/run/doctesthack_skip.pyx
+24
-0
No files found.
Cython/Compiler/AnalysedTreeTransforms.py
0 → 100644
View file @
4c11531e
from
Cython.Compiler.Visitor
import
VisitorTransform
,
ScopeTrackingTransform
,
TreeVisitor
from
Nodes
import
StatListNode
,
SingleAssignmentNode
from
ExprNodes
import
(
DictNode
,
DictItemNode
,
NameNode
,
UnicodeNode
,
NoneNode
,
ExprNode
,
AttributeNode
,
ModuleRefNode
,
DocstringRefNode
)
from
PyrexTypes
import
py_object_type
from
Builtin
import
dict_type
from
StringEncoding
import
EncodedString
import
Naming
class
DoctestHackTransform
(
ScopeTrackingTransform
):
# Handles doctesthack directive
def
visit_ModuleNode
(
self
,
node
):
self
.
scope_type
=
'module'
self
.
scope_node
=
node
if
self
.
current_directives
[
'doctesthack'
]:
assert
isinstance
(
node
.
body
,
StatListNode
)
# First see if __test__ is already created
if
u'__test__'
in
node
.
scope
.
entries
:
# Do nothing
return
node
pos
=
node
.
pos
self
.
tests
=
[]
self
.
testspos
=
node
.
pos
test_dict_entry
=
node
.
scope
.
declare_var
(
EncodedString
(
u'__test__'
),
py_object_type
,
pos
,
visibility
=
'public'
)
create_test_dict_assignment
=
SingleAssignmentNode
(
pos
,
lhs
=
NameNode
(
pos
,
name
=
EncodedString
(
u'__test__'
),
entry
=
test_dict_entry
),
rhs
=
DictNode
(
pos
,
key_value_pairs
=
self
.
tests
))
self
.
visitchildren
(
node
)
node
.
body
.
stats
.
append
(
create_test_dict_assignment
)
return
node
def
add_test
(
self
,
testpos
,
name
,
func_ref_node
):
# func_ref_node must evaluate to the function object containing
# the docstring, BUT it should not be the function itself (which
# would lead to a new *definition* of the function)
pos
=
self
.
testspos
keystr
=
u'%s (line %d)'
%
(
name
,
testpos
[
1
])
key
=
UnicodeNode
(
pos
,
value
=
EncodedString
(
keystr
))
value
=
DocstringRefNode
(
pos
,
func_ref_node
)
self
.
tests
.
append
(
DictItemNode
(
pos
,
key
=
key
,
value
=
value
))
def
visit_FuncDefNode
(
self
,
node
):
if
node
.
doc
:
pos
=
self
.
testspos
if
self
.
scope_type
==
'module'
:
parent
=
ModuleRefNode
(
pos
)
name
=
node
.
entry
.
name
elif
self
.
scope_type
in
(
'pyclass'
,
'cclass'
):
mod
=
ModuleRefNode
(
pos
)
if
self
.
scope_type
==
'pyclass'
:
clsname
=
self
.
scope_node
.
name
else
:
clsname
=
self
.
scope_node
.
class_name
parent
=
AttributeNode
(
pos
,
obj
=
mod
,
attribute
=
clsname
,
type
=
py_object_type
,
is_py_attr
=
True
,
is_temp
=
True
)
name
=
"%s.%s"
%
(
clsname
,
node
.
entry
.
name
)
getfunc
=
AttributeNode
(
pos
,
obj
=
parent
,
attribute
=
node
.
entry
.
name
,
type
=
py_object_type
,
is_py_attr
=
True
,
is_temp
=
True
)
self
.
add_test
(
node
.
pos
,
name
,
getfunc
)
return
node
This diff is collapsed.
Click to expand it.
Cython/Compiler/DebugFlags.py
View file @
4c11531e
...
...
@@ -10,7 +10,7 @@ debug_temp_code_comments = 0
debug_trace_code_generation
=
0
# Do not replace exceptions with user-friendly error messages
debug_no_exception_intercept
=
0
debug_no_exception_intercept
=
1
# Print a message each time a new stage in the pipeline is entered
debug_verbose_pipeline
=
0
This diff is collapsed.
Click to expand it.
Cython/Compiler/ExprNodes.py
View file @
4c11531e
...
...
@@ -3501,6 +3501,8 @@ class DictNode(ExprNode):
# obj_conversion_errors [PyrexError] used internally
subexprs
=
[
'key_value_pairs'
]
is_temp
=
1
type
=
dict_type
def
calculate_constant_result
(
self
):
self
.
constant_result
=
dict
([
...
...
@@ -3516,12 +3518,10 @@ class DictNode(ExprNode):
def
analyse_types
(
self
,
env
):
hold_errors
()
self
.
type
=
dict_type
for
item
in
self
.
key_value_pairs
:
item
.
analyse_types
(
env
)
self
.
obj_conversion_errors
=
held_errors
()
release_errors
(
ignore
=
True
)
self
.
is_temp
=
1
def
coerce_to
(
self
,
dst_type
,
env
):
if
dst_type
.
is_pyobject
:
...
...
@@ -5484,6 +5484,44 @@ class CloneNode(CoercionNode):
pass
class
ModuleRefNode
(
ExprNode
):
# Simple returns the module object
type
=
py_object_type
is_temp
=
False
subexprs
=
[]
def
analyse_types
(
self
,
env
):
pass
def
calculate_result_code
(
self
):
return
Naming
.
module_cname
def
generate_result_code
(
self
,
code
):
pass
class
DocstringRefNode
(
ExprNode
):
# Extracts the docstring of the body element
subexprs
=
[
'body'
]
type
=
py_object_type
is_temp
=
True
def
__init__
(
self
,
pos
,
body
):
ExprNode
.
__init__
(
self
,
pos
)
assert
body
.
type
.
is_pyobject
self
.
body
=
body
def
analyse_types
(
self
,
env
):
pass
def
generate_result_code
(
self
,
code
):
code
.
putln
(
'%s = __Pyx_GetAttrString(%s, "__doc__");'
%
(
self
.
result
(),
self
.
body
.
result
()))
code
.
put_gotref
(
self
.
result
())
#------------------------------------------------------------------------------------
#
# Runtime support code
...
...
This diff is collapsed.
Click to expand it.
Cython/Compiler/Main.py
View file @
4c11531e
...
...
@@ -88,6 +88,7 @@ class Context(object):
from
ParseTreeTransforms
import
CreateClosureClasses
,
MarkClosureVisitor
,
DecoratorTransform
from
ParseTreeTransforms
import
InterpretCompilerDirectives
,
TransformBuiltinMethods
from
ParseTreeTransforms
import
AlignFunctionDefinitions
,
GilCheck
from
AnalysedTreeTransforms
import
DoctestHackTransform
from
AutoDocTransforms
import
EmbedSignature
from
Optimize
import
FlattenInListTransform
,
SwitchTransform
,
IterationTransform
from
Optimize
import
OptimizeBuiltinCalls
,
ConstantFolding
,
FinalOptimizePhase
...
...
@@ -126,6 +127,7 @@ class Context(object):
WithTransform
(
self
),
DecoratorTransform
(
self
),
AnalyseDeclarationsTransform
(
self
),
DoctestHackTransform
(
self
),
EmbedSignature
(
self
),
TransformBuiltinMethods
(
self
),
IntroduceBufferAuxiliaryVars
(
self
),
...
...
This diff is collapsed.
Click to expand it.
Cython/Compiler/Options.py
View file @
4c11531e
...
...
@@ -68,6 +68,7 @@ option_defaults = {
'c99_complex'
:
False
,
# Don't use macro wrappers for complex arith, not sure what to name this...
'callspec'
:
""
,
'profile'
:
False
,
'doctesthack'
:
False
}
# Override types possibilities above, if needed
...
...
@@ -77,6 +78,11 @@ for key, val in option_defaults.items():
if
key
not
in
option_types
:
option_types
[
key
]
=
type
(
val
)
option_scopes
=
{
# defaults to available everywhere
# 'module', 'function', 'class', 'with statement'
'doctesthack'
:
(
'module'
,)
}
def
parse_option_value
(
name
,
value
):
"""
Parses value as an option value for the given name and returns
...
...
This diff is collapsed.
Click to expand it.
Cython/Compiler/ParseTreeTransforms.py
View file @
4c11531e
...
...
@@ -338,14 +338,26 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
self
.
cython_module_names
=
set
()
self
.
option_names
=
{}
def
check_directive_scope
(
self
,
pos
,
directive
,
scope
):
legal_scopes
=
Options
.
option_scopes
.
get
(
directive
,
None
)
if
legal_scopes
and
scope
not
in
legal_scopes
:
self
.
context
.
nonfatal_error
(
PostParseError
(
pos
,
'The %s compiler directive '
'is not allowed in %s scope'
%
(
directive
,
scope
)))
return
False
else
:
return
True
# Set up processing and handle the cython: comments.
def
visit_ModuleNode
(
self
,
node
):
options
=
copy
.
copy
(
Options
.
option_defaults
)
for
key
,
value
in
self
.
compilation_option_overrides
.
iteritems
():
if
not
self
.
check_directive_scope
(
node
.
pos
,
key
,
'module'
):
self
.
wrong_scope_error
(
node
.
pos
,
key
,
'module'
)
del
self
.
compilation_option_overrides
[
key
]
continue
if
key
in
node
.
option_comments
and
node
.
option_comments
[
key
]
!=
value
:
warning
(
node
.
pos
,
"Compiler directive differs between environment and file header; this will change "
"in Cython 0.12. See http://article.gmane.org/gmane.comp.python.cython.devel/5233"
,
2
)
break
options
.
update
(
node
.
option_comments
)
options
.
update
(
self
.
compilation_option_overrides
)
self
.
options
=
options
...
...
@@ -465,7 +477,6 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
# Handle decorators
def
visit_FuncDefNode
(
self
,
node
):
options
=
[]
if
node
.
decorators
:
# Split the decorators into two lists -- real decorators and options
realdecs
=
[]
...
...
@@ -485,6 +496,9 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
options
.
reverse
()
# Decorators coming first take precedence
for
option
in
options
:
name
,
value
=
option
legal_scopes
=
Options
.
option_scopes
.
get
(
name
,
None
)
if
not
self
.
check_directive_scope
(
node
.
pos
,
name
,
'function'
):
continue
if
name
in
optdict
and
isinstance
(
optdict
[
name
],
dict
):
# only keywords can be merged, everything else
# overrides completely
...
...
@@ -503,7 +517,9 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
if
option
is
not
None
and
option
[
0
]
==
u'locals'
:
node
.
directive_locals
=
option
[
1
]
else
:
raise
PostParseError
(
dec
.
pos
,
"Cdef functions can only take cython.locals() decorator."
)
self
.
context
.
nonfatal_error
(
PostParseError
(
dec
.
pos
,
"Cdef functions can only take cython.locals() decorator."
))
continue
return
node
# Handle with statements
...
...
@@ -511,10 +527,12 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
option
=
self
.
try_to_parse_option
(
node
.
manager
)
if
option
is
not
None
:
if
node
.
target
is
not
None
:
raise
PostParseError
(
node
.
pos
,
"Compiler option with statements cannot contain 'as'"
)
self
.
context
.
nonfatal_error
(
PostParseError
(
node
.
pos
,
"Compiler option with statements cannot contain 'as'"
))
else
:
name
,
value
=
option
if
self
.
check_directive_scope
(
node
.
pos
,
name
,
'with statement'
):
return
self
.
visit_with_options
(
node
.
body
,
{
name
:
value
})
else
:
return
self
.
visit_Node
(
node
)
class
WithTransform
(
CythonTransform
,
SkipDeclarations
):
...
...
This diff is collapsed.
Click to expand it.
Cython/Compiler/Visitor.py
View file @
4c11531e
...
...
@@ -250,6 +250,9 @@ class VisitorTransform(TreeVisitor):
class
CythonTransform
(
VisitorTransform
):
"""
Certain common conventions and utilitues for Cython transforms.
- Sets up the context of the pipeline in self.context
- Tracks directives in effect in self.current_directives
"""
def
__init__
(
self
,
context
):
super
(
CythonTransform
,
self
).
__init__
()
...
...
@@ -272,6 +275,37 @@ class CythonTransform(VisitorTransform):
self
.
visitchildren
(
node
)
return
node
class
ScopeTrackingTransform
(
CythonTransform
):
# Keeps track of type of scopes
scope_type
=
None
# can be either of 'module', 'function', 'cclass', 'pyclass'
scope_node
=
None
def
visit_ModuleNode
(
self
,
node
):
self
.
scope_type
=
'module'
self
.
scope_node
=
node
self
.
visitchildren
(
node
)
return
node
def
visit_scope
(
self
,
node
,
scope_type
):
prev
=
self
.
scope_type
,
self
.
scope_node
self
.
scope_type
=
scope_type
self
.
scope_node
=
node
self
.
visitchildren
(
node
)
self
.
scope_type
,
self
.
scope_node
=
prev
return
node
def
visit_CClassDefNode
(
self
,
node
):
return
self
.
visit_scope
(
node
,
'cclass'
)
def
visit_PyClassDefNode
(
self
,
node
):
return
self
.
visit_scope
(
node
,
'pyclass'
)
def
visit_FuncDefNode
(
self
,
node
):
return
self
.
visit_scope
(
node
,
'function'
)
def
visit_CStructOrUnionDefNode
(
self
,
node
):
return
self
.
visit_scope
(
node
,
'struct'
)
...
...
This diff is collapsed.
Click to expand it.
tests/errors/e_doctesthack.pyx
0 → 100644
View file @
4c11531e
cimport
cython
@
cython
.
doctesthack
(
False
)
def
foo
():
pass
_ERRORS
=
u"""
4:0: The doctesthack compiler directive is not allowed in function scope
"""
This diff is collapsed.
Click to expand it.
tests/run/doctesthack.pyx
0 → 100644
View file @
4c11531e
#cython: doctesthack=True
"""
Tests doctesthack compiler directive.
The doctests are actually run as part of this test;
which makes the test flow a bit untraditional. Both
module test and individual tests are run; finally,
all_tests_run() is executed which does final validation.
>>> items = __test__.items()
>>> items.sort()
>>> for key, value in items:
... print key, ';', value
MyCdefClass.method (line 67) ; >>> add_log("cdef class method")
MyClass.method (line 57) ; >>> add_log("class method")
doc_without_test (line 39) ; Some docs
mycpdeffunc (line 45) ; >>> add_log("cpdef")
myfunc (line 36) ; >>> add_log("def")
"""
log
=
[]
def
all_tests_run
():
log
.
sort
()
assert
log
==
[
u'cdef class method'
,
u'class method'
,
u'cpdef'
,
u'def'
],
log
def
add_log
(
s
):
log
.
append
(
unicode
(
s
))
if
len
(
log
)
==
len
(
__test__
):
# Final per-function doctest executed
all_tests_run
()
def
myfunc
():
""">>> add_log("def")"""
def
doc_without_test
():
"""Some docs"""
def
nodocstring
():
pass
cpdef
mycpdeffunc
():
""">>> add_log("cpdef")"""
class
MyClass
:
"""
Needs no hack
>>> True
True
"""
def
method
(
self
):
""">>> add_log("class method")"""
cdef
class
MyCdefClass
:
"""
Needs no hack
>>> True
True
"""
def
method
(
self
):
""">>> add_log("cdef class method")"""
This diff is collapsed.
Click to expand it.
tests/run/doctesthack_skip.pyx
0 → 100644
View file @
4c11531e
#cython: doctesthack=True
"""
Tests that doctesthack doesn't come into effect when
a __test__ is defined manually.
If this doesn't work, then the function doctest should fail.
>>> True
True
"""
def
func
():
"""
>>> True
False
"""
__test__
=
{
u"one"
:
"""
>>> True
True
"""
}
This diff is collapsed.
Click to expand it.
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