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
de3f9a33
Commit
de3f9a33
authored
May 11, 2012
by
Mark
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #121 from scoder/_minor_fused_cleanup
minor fused cleanups
parents
761fbb3f
b1ece04a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
24 deletions
+11
-24
Cython/Compiler/FusedNode.py
Cython/Compiler/FusedNode.py
+10
-24
Cython/Compiler/Symtab.py
Cython/Compiler/Symtab.py
+1
-0
No files found.
Cython/Compiler/FusedNode.py
View file @
de3f9a33
...
...
@@ -238,19 +238,11 @@ class FusedCFuncDefNode(StatListNode):
for
specialized_type
in
normal_types
:
# all_numeric = all_numeric and specialized_type.is_numeric
py_type_name
=
specialized_type
.
py_type_name
()
# in the case of long, unicode or bytes we need to instance
# check for long_, unicode_, bytes_ (long = long is no longer
# valid code with control flow analysis)
specialized_check_name
=
py_type_name
if
py_type_name
in
(
'long'
,
'unicode'
,
'bytes'
):
specialized_check_name
+=
'_'
specialized_type_name
=
specialized_type
.
specialization_string
pyx_code
.
context
.
update
(
locals
())
pyx_code
.
put_chunk
(
u"""
{{if_}} isinstance(arg, {{
specialized_check
_name}}):
{{if_}} isinstance(arg, {{
py_type
_name}}):
dest_sig[{{dest_sig_idx}}] = '{{specialized_type_name}}'
"""
)
if_
=
'elif'
...
...
@@ -539,17 +531,7 @@ class FusedCFuncDefNode(StatListNode):
pyx_code
.
put_chunk
(
u"""
def __pyx_fused_cpdef(signatures, args, kwargs, defaults):
import sys
if sys.version_info >= (3, 0):
long_ = int
unicode_ = str
bytes_ = bytes
else:
long_ = long
unicode_ = unicode
bytes_ = str
dest_sig = [None] * {{n_fused}}
dest_sig = [{{for _ in range(n_fused)}}None,{{endfor}}]
if kwargs is None:
kwargs = {}
...
...
@@ -594,10 +576,14 @@ class FusedCFuncDefNode(StatListNode):
u"""
candidates = []
for sig in signatures:
match_found =
filter(None, dest_sig)
match_found =
False
for src_type, dst_type in zip(sig.strip('()').split(', '), dest_sig):
if dst_type is not None and match_found:
match_found = src_type == dst_type
if dst_type is not None:
if src_type == dst_type:
match_found = True
else:
match_found = False
break
if match_found:
candidates.append(sig)
...
...
Cython/Compiler/Symtab.py
View file @
de3f9a33
...
...
@@ -183,6 +183,7 @@ class Entry(object):
fused_cfunction = None
is_fused_specialized = False
utility_code_definition = None
needs_property = False
in_with_gil_block = 0
from_cython_utility_code = None
error_on_uninitialized = False
...
...
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