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
e406de9e
Commit
e406de9e
authored
Jul 03, 2014
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0.20.x'
Conflicts: CHANGES.rst
parents
ba625742
82ca1aff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
CHANGES.rst
CHANGES.rst
+2
-0
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/ParseTreeTransforms.py
+2
-5
tests/run/unop_extras.pyx
tests/run/unop_extras.pyx
+5
-3
No files found.
CHANGES.rst
View file @
e406de9e
...
@@ -64,6 +64,8 @@ Bugs fixed
...
@@ -64,6 +64,8 @@ Bugs fixed
* Syntax highlighting in ``cython-mode.el`` for Emacs no longer
* Syntax highlighting in ``cython-mode.el`` for Emacs no longer
incorrectly highlights keywords found as part of longer names.
incorrectly highlights keywords found as part of longer names.
* Correctly handle `from cython.submodule comport name``.
Other changes
Other changes
-------------
-------------
...
...
Cython/Compiler/ParseTreeTransforms.py
View file @
e406de9e
...
@@ -778,10 +778,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
...
@@ -778,10 +778,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
# from cython.parallel cimport parallel, prange, ...
# from cython.parallel cimport parallel, prange, ...
self
.
parallel_directives
[
as_name
or
name
]
=
qualified_name
self
.
parallel_directives
[
as_name
or
name
]
=
qualified_name
elif
self
.
is_cython_directive
(
full_name
):
elif
self
.
is_cython_directive
(
full_name
):
if
as_name
is
None
:
self
.
directive_names
[
as_name
or
name
]
=
full_name
as_name
=
full_name
self
.
directive_names
[
as_name
]
=
full_name
if
kind
is
not
None
:
if
kind
is
not
None
:
self
.
context
.
nonfatal_error
(
PostParseError
(
pos
,
self
.
context
.
nonfatal_error
(
PostParseError
(
pos
,
"Compiler directive imports must be plain imports"
))
"Compiler directive imports must be plain imports"
))
...
@@ -1689,7 +1686,7 @@ if VALUE is not None:
...
@@ -1689,7 +1686,7 @@ if VALUE is not None:
return
None
return
None
else
:
else
:
return
self
.
visit_ClassDefNode
(
node
)
return
self
.
visit_ClassDefNode
(
node
)
def
visit_CStructOrUnionDefNode
(
self
,
node
):
def
visit_CStructOrUnionDefNode
(
self
,
node
):
# Create a wrapper node if needed.
# Create a wrapper node if needed.
# We want to use the struct type information (so it can't happen
# We want to use the struct type information (so it can't happen
...
...
tests/run/unop_extras.pyx
View file @
e406de9e
cimport
cython.operator
cimport
cython.operator
from
cython.operator
cimport
dereference
from
cython.operator
cimport
dereference
as
deref
def
test_deref
(
int
x
):
def
test_deref
(
int
x
):
"""
"""
>>> test_deref(3)
>>> test_deref(3)
3
(3, 3, 3)
>>> test_deref(5)
>>> test_deref(5)
5
(5, 5, 5)
"""
"""
cdef
int
*
x_ptr
=
&
x
cdef
int
*
x_ptr
=
&
x
return
cython
.
operator
.
dereference
(
x_ptr
)
return
cython
.
operator
.
dereference
(
x_ptr
)
,
dereference
(
x_ptr
),
deref
(
x_ptr
)
def
increment_decrement
(
int
x
):
def
increment_decrement
(
int
x
):
"""
"""
...
...
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