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
21cdfb99
Commit
21cdfb99
authored
Nov 11, 2010
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
faster equality check for unicode strings (speeds up the parser)
parent
ea3993e2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
75 additions
and
3 deletions
+75
-3
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+75
-3
No files found.
Cython/Compiler/ExprNodes.py
View file @
21cdfb99
...
@@ -5982,6 +5982,8 @@ class CmpNode(object):
...
@@ -5982,6 +5982,8 @@ class CmpNode(object):
# Mixin class containing code common to PrimaryCmpNodes
# Mixin class containing code common to PrimaryCmpNodes
# and CascadedCmpNodes.
# and CascadedCmpNodes.
special_bool_cmp_function
=
None
def
infer_type
(
self
,
env
):
def
infer_type
(
self
,
env
):
# TODO: Actually implement this (after merging with -unstable).
# TODO: Actually implement this (after merging with -unstable).
return
py_object_type
return
py_object_type
...
@@ -6140,6 +6142,7 @@ class CmpNode(object):
...
@@ -6140,6 +6142,7 @@ class CmpNode(object):
def
is_python_result
(
self
):
def
is_python_result
(
self
):
return
((
self
.
has_python_operands
()
and
return
((
self
.
has_python_operands
()
and
self
.
special_bool_cmp_function
is
None
and
self
.
operator
not
in
(
'is'
,
'is_not'
,
'in'
,
'not_in'
)
and
self
.
operator
not
in
(
'is'
,
'is_not'
,
'in'
,
'not_in'
)
and
not
self
.
is_c_string_contains
()
and
not
self
.
is_c_string_contains
()
and
not
self
.
is_ptr_contains
())
not
self
.
is_ptr_contains
())
...
@@ -6158,6 +6161,16 @@ class CmpNode(object):
...
@@ -6158,6 +6161,16 @@ class CmpNode(object):
return
(
container_type
.
is_ptr
or
container_type
.
is_array
)
\
return
(
container_type
.
is_ptr
or
container_type
.
is_array
)
\
and
not
container_type
.
is_string
and
not
container_type
.
is_string
def
find_special_bool_compare_function
(
self
,
env
):
if
self
.
operator
in
(
'=='
,
'!='
):
type1
,
type2
=
self
.
operand1
.
type
,
self
.
operand2
.
type
if
type1
.
is_pyobject
and
type2
.
is_pyobject
:
if
type1
is
Builtin
.
unicode_type
or
type2
is
Builtin
.
unicode_type
:
env
.
use_utility_code
(
pyunicode_equals_utility_code
)
self
.
special_bool_cmp_function
=
"__Pyx_PyUnicode_Equals"
return
True
return
False
def
generate_operation_code
(
self
,
code
,
result_code
,
def
generate_operation_code
(
self
,
code
,
result_code
,
operand1
,
op
,
operand2
):
operand1
,
op
,
operand2
):
if
self
.
type
.
is_pyobject
:
if
self
.
type
.
is_pyobject
:
...
@@ -6168,7 +6181,23 @@ class CmpNode(object):
...
@@ -6168,7 +6181,23 @@ class CmpNode(object):
negation
=
"!"
negation
=
"!"
else
:
else
:
negation
=
""
negation
=
""
if
op
==
'in'
or
op
==
'not_in'
:
if
self
.
special_bool_cmp_function
:
if
operand1
.
type
.
is_pyobject
:
result1
=
operand1
.
py_result
()
else
:
result1
=
operand1
.
result
()
if
operand2
.
type
.
is_pyobject
:
result2
=
operand2
.
py_result
()
else
:
result2
=
operand2
.
result
()
code
.
putln
(
"%s = %s(%s, %s, %s); %s"
%
(
result_code
,
self
.
special_bool_cmp_function
,
result1
,
result2
,
richcmp_constants
[
op
],
code
.
error_goto_if_neg
(
result_code
,
self
.
pos
)))
elif
op
==
'in'
or
op
==
'not_in'
:
code
.
globalstate
.
use_utility_code
(
contains_utility_code
)
code
.
globalstate
.
use_utility_code
(
contains_utility_code
)
if
self
.
type
.
is_pyobject
:
if
self
.
type
.
is_pyobject
:
coerce_result
=
"__Pyx_PyBoolOrNull_FromLong"
coerce_result
=
"__Pyx_PyBoolOrNull_FromLong"
...
@@ -6202,7 +6231,6 @@ class CmpNode(object):
...
@@ -6202,7 +6231,6 @@ class CmpNode(object):
error_clause
(
result_code
,
self
.
pos
)))
error_clause
(
result_code
,
self
.
pos
)))
if
operand2
.
type
is
dict_type
:
if
operand2
.
type
is
dict_type
:
code
.
putln
(
"}"
)
code
.
putln
(
"}"
)
elif
(
operand1
.
type
.
is_pyobject
elif
(
operand1
.
type
.
is_pyobject
and
op
not
in
(
'is'
,
'is_not'
)):
and
op
not
in
(
'is'
,
'is_not'
)):
code
.
putln
(
"%s = PyObject_RichCompare(%s, %s, %s); %s"
%
(
code
.
putln
(
"%s = PyObject_RichCompare(%s, %s, %s); %s"
%
(
...
@@ -6291,6 +6319,46 @@ static CYTHON_INLINE int __Pyx_UnicodeContains(PyObject* unicode, Py_UNICODE cha
...
@@ -6291,6 +6319,46 @@ static CYTHON_INLINE int __Pyx_UnicodeContains(PyObject* unicode, Py_UNICODE cha
}
}
"""
)
"""
)
pyunicode_equals_utility_code
=
UtilityCode
(
proto
=
"""
static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals); /*proto*/
"""
,
impl
=
"""
static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals) {
if (s1 == s2) { /* as done by PyObject_RichCompareBool() */
return (equals == Py_EQ);
} else if (PyUnicode_CheckExact(s1) & PyUnicode_CheckExact(s2)) {
if (PyUnicode_GET_SIZE(s1) != PyUnicode_GET_SIZE(s2)) {
return (equals == Py_NE);
} else if (PyUnicode_GET_SIZE(s1) == 1) {
if (equals == Py_EQ)
return (PyUnicode_AS_UNICODE(s1)[0] == PyUnicode_AS_UNICODE(s2)[0]);
else
return (PyUnicode_AS_UNICODE(s1)[0] != PyUnicode_AS_UNICODE(s2)[0]);
} else {
int result = PyUnicode_Compare(s1, s2);
if ((result == -1) && unlikely(PyErr_Occurred()))
return -1;
return (equals == Py_EQ) ? (result == 0) : (result != 0);
}
} else if ((s1 == Py_None) & (s2 == Py_None)) {
return (equals == Py_EQ);
} else if ((s1 == Py_None) & PyUnicode_CheckExact(s2)) {
return (equals == Py_NE);
} else if ((s2 == Py_None) & PyUnicode_CheckExact(s1)) {
return (equals == Py_NE);
} else {
int result;
PyObject* py_result = PyObject_RichCompare(s1, s2, equals);
if (!py_result)
return -1;
result = __Pyx_PyObject_IsTrue(py_result);
Py_DECREF(py_result);
return result;
}
}
"""
)
class
PrimaryCmpNode
(
ExprNode
,
CmpNode
):
class
PrimaryCmpNode
(
ExprNode
,
CmpNode
):
# Non-cascaded comparison or first comparison of
# Non-cascaded comparison or first comparison of
...
@@ -6361,6 +6429,10 @@ class PrimaryCmpNode(ExprNode, CmpNode):
...
@@ -6361,6 +6429,10 @@ class PrimaryCmpNode(ExprNode, CmpNode):
else
:
else
:
common_type
=
py_object_type
common_type
=
py_object_type
self
.
is_pycmp
=
True
self
.
is_pycmp
=
True
elif
self
.
find_special_bool_compare_function
(
env
):
common_type
=
None
# if coercion needed, the method call above has already done it
self
.
is_pycmp
=
False
# result is bint
self
.
is_temp
=
True
# must check for error return
else
:
else
:
common_type
=
self
.
find_common_type
(
env
,
self
.
operator
,
self
.
operand1
)
common_type
=
self
.
find_common_type
(
env
,
self
.
operator
,
self
.
operand1
)
self
.
is_pycmp
=
common_type
.
is_pyobject
self
.
is_pycmp
=
common_type
.
is_pyobject
...
...
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