Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f645451d
Commit
f645451d
authored
Apr 25, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #11856: Speed up parsing of JSON numbers.
parent
54afa550
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
15 deletions
+33
-15
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_json.c
Modules/_json.c
+31
-15
No files found.
Misc/NEWS
View file @
f645451d
...
...
@@ -113,6 +113,8 @@ Core and Builtins
Library
-------
-
Issue
#
11856
:
Speed
up
parsing
of
JSON
numbers
.
-
Issue
#
11005
:
threading
.
RLock
().
_release_save
()
raises
a
RuntimeError
if
the
lock
was
not
acquired
.
...
...
Modules/_json.c
View file @
f645451d
...
...
@@ -842,7 +842,8 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
Py_ssize_t
idx
=
start
;
int
is_float
=
0
;
PyObject
*
rval
;
PyObject
*
numstr
;
PyObject
*
numstr
=
NULL
;
PyObject
*
custom_func
;
/* read a sign if it's there, make sure it's not the end of the string */
if
(
str
[
idx
]
==
'-'
)
{
...
...
@@ -895,22 +896,37 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
}
}
/* copy the section we determined to be a number */
numstr
=
PyUnicode_FromUnicode
(
&
str
[
start
],
idx
-
start
);
if
(
numstr
==
NULL
)
return
NULL
;
if
(
is_float
)
{
/* parse as a float using a fast path if available, otherwise call user defined method */
if
(
s
->
parse_float
!=
(
PyObject
*
)
&
PyFloat_Type
)
{
rval
=
PyObject_CallFunctionObjArgs
(
s
->
parse_float
,
numstr
,
NULL
);
}
else
{
rval
=
PyFloat_FromString
(
numstr
);
}
if
(
is_float
&&
s
->
parse_float
!=
(
PyObject
*
)
&
PyFloat_Type
)
custom_func
=
s
->
parse_float
;
else
if
(
!
is_float
&&
s
->
parse_int
!=
(
PyObject
*
)
&
PyLong_Type
)
custom_func
=
s
->
parse_int
;
else
custom_func
=
NULL
;
if
(
custom_func
)
{
/* copy the section we determined to be a number */
numstr
=
PyUnicode_FromUnicode
(
&
str
[
start
],
idx
-
start
);
if
(
numstr
==
NULL
)
return
NULL
;
rval
=
PyObject_CallFunctionObjArgs
(
custom_func
,
numstr
,
NULL
);
}
else
{
/* no fast path for unicode -> int, just call */
rval
=
PyObject_CallFunctionObjArgs
(
s
->
parse_int
,
numstr
,
NULL
);
Py_ssize_t
i
,
n
;
char
*
buf
;
/* Straight conversion to ASCII, to avoid costly conversion of
decimal unicode digits (which cannot appear here) */
n
=
idx
-
start
;
numstr
=
PyBytes_FromStringAndSize
(
NULL
,
n
);
if
(
numstr
==
NULL
)
return
NULL
;
buf
=
PyBytes_AS_STRING
(
numstr
);
for
(
i
=
0
;
i
<
n
;
i
++
)
{
buf
[
i
]
=
(
char
)
str
[
i
+
start
];
}
if
(
is_float
)
rval
=
PyFloat_FromString
(
numstr
);
else
rval
=
PyLong_FromString
(
buf
,
NULL
,
10
);
}
Py_DECREF
(
numstr
);
*
next_idx_ptr
=
idx
;
...
...
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