cpython-lru_cache-weakref: Modules/

annotate Modules/_json.c @ 80272:ec00f8570c55

Merge typo fix.

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Mon, 05 Nov 2012 22:23:16 +0200
parents	ab65509b8443
children	2c04d2102534

rev	line source
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1 #include "Python.h"
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	2 #include "structmember.h"
75876 5fe7d19ec49a Issue #14387: Do not include accu.h from Python.h. Antoine Pitrou <solipsis@pitrou.net> parents: 72918 diff changeset	3 #include "accu.h"
5fe7d19ec49a Issue #14387: Do not include accu.h from Python.h. Antoine Pitrou <solipsis@pitrou.net> parents: 72918 diff changeset	4
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	5 #if PY_VERSION_HEX < 0x02060000 && !defined(Py_TYPE)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	6 #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	7 #endif
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	8 #if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	9 typedef int Py_ssize_t;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	10 #define PY_SSIZE_T_MAX INT_MAX
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	11 #define PY_SSIZE_T_MIN INT_MIN
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	12 #define PyInt_FromSsize_t PyInt_FromLong
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	13 #define PyInt_AsSsize_t PyInt_AsLong
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	14 #endif
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	15 #ifndef Py_IS_FINITE
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	16 #define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	17 #endif
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	18
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	19 #ifdef __GNUC__
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	20 #define UNUSED __attribute__((__unused__))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	21 #else
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	22 #define UNUSED
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	23 #endif
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	24
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	25 #define PyScanner_Check(op) PyObject_TypeCheck(op, &PyScannerType)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	26 #define PyScanner_CheckExact(op) (Py_TYPE(op) == &PyScannerType)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	27 #define PyEncoder_Check(op) PyObject_TypeCheck(op, &PyEncoderType)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	28 #define PyEncoder_CheckExact(op) (Py_TYPE(op) == &PyEncoderType)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	29
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	30 static PyTypeObject PyScannerType;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	31 static PyTypeObject PyEncoderType;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	32
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	33 typedef struct _PyScannerObject {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	34 PyObject_HEAD
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	35 PyObject *strict;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	36 PyObject *object_hook;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	37 PyObject *object_pairs_hook;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	38 PyObject *parse_float;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	39 PyObject *parse_int;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	40 PyObject *parse_constant;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	41 PyObject *memo;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	42 } PyScannerObject;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	43
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	44 static PyMemberDef scanner_members[] = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	45 {"strict", T_OBJECT, offsetof(PyScannerObject, strict), READONLY, "strict"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	46 {"object_hook", T_OBJECT, offsetof(PyScannerObject, object_hook), READONLY, "object_hook"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	47 {"object_pairs_hook", T_OBJECT, offsetof(PyScannerObject, object_pairs_hook), READONLY},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	48 {"parse_float", T_OBJECT, offsetof(PyScannerObject, parse_float), READONLY, "parse_float"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	49 {"parse_int", T_OBJECT, offsetof(PyScannerObject, parse_int), READONLY, "parse_int"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	50 {"parse_constant", T_OBJECT, offsetof(PyScannerObject, parse_constant), READONLY, "parse_constant"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	51 {NULL}
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	52 };
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	53
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	54 typedef struct _PyEncoderObject {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	55 PyObject_HEAD
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	56 PyObject *markers;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	57 PyObject *defaultfn;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	58 PyObject *encoder;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	59 PyObject *indent;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	60 PyObject *key_separator;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	61 PyObject *item_separator;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	62 PyObject *sort_keys;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	63 PyObject *skipkeys;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	64 int fast_encode;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	65 int allow_nan;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	66 } PyEncoderObject;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	67
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	68 static PyMemberDef encoder_members[] = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	69 {"markers", T_OBJECT, offsetof(PyEncoderObject, markers), READONLY, "markers"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	70 {"default", T_OBJECT, offsetof(PyEncoderObject, defaultfn), READONLY, "default"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	71 {"encoder", T_OBJECT, offsetof(PyEncoderObject, encoder), READONLY, "encoder"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	72 {"indent", T_OBJECT, offsetof(PyEncoderObject, indent), READONLY, "indent"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	73 {"key_separator", T_OBJECT, offsetof(PyEncoderObject, key_separator), READONLY, "key_separator"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	74 {"item_separator", T_OBJECT, offsetof(PyEncoderObject, item_separator), READONLY, "item_separator"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	75 {"sort_keys", T_OBJECT, offsetof(PyEncoderObject, sort_keys), READONLY, "sort_keys"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	76 {"skipkeys", T_OBJECT, offsetof(PyEncoderObject, skipkeys), READONLY, "skipkeys"},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	77 {NULL}
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	78 };
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	79
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	80 static PyObject *
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	81 join_list_unicode(PyObject *lst)
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	82 {
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	83 /* return u''.join(lst) */
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	84 static PyObject *sep = NULL;
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	85 if (sep == NULL) {
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	86 sep = PyUnicode_FromStringAndSize("", 0);
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	87 if (sep == NULL)
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	88 return NULL;
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	89 }
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	90 return PyUnicode_Join(sep, lst);
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	91 }
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	92
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	93 /* Forward decls */
47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	94
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	95 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	96 ascii_escape_unicode(PyObject *pystr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	97 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	98 py_encode_basestring_ascii(PyObject* self UNUSED, PyObject *pystr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	99 void init_json(void);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	100 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	101 scan_once_unicode(PyScannerObject s, PyObject pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	102 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	103 _build_rval_index_tuple(PyObject *rval, Py_ssize_t idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	104 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	105 scanner_new(PyTypeObject type, PyObject args, PyObject *kwds);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	106 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	107 scanner_init(PyObject self, PyObject args, PyObject *kwds);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	108 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	109 scanner_dealloc(PyObject *self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	110 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	111 scanner_clear(PyObject *self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	112 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	113 encoder_new(PyTypeObject type, PyObject args, PyObject *kwds);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	114 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	115 encoder_init(PyObject self, PyObject args, PyObject *kwds);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	116 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	117 encoder_dealloc(PyObject *self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	118 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	119 encoder_clear(PyObject *self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	120 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	121 encoder_listencode_list(PyEncoderObject s, _PyAccu acc, PyObject *seq, Py_ssize_t indent_level);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	122 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	123 encoder_listencode_obj(PyEncoderObject s, _PyAccu acc, PyObject *obj, Py_ssize_t indent_level);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	124 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	125 encoder_listencode_dict(PyEncoderObject s, _PyAccu acc, PyObject *dct, Py_ssize_t indent_level);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	126 static PyObject *
53669 206ccf9aa025 Fixed warning. (Should not use const as variable name) Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 53667 diff changeset	127 _encoded_const(PyObject *obj);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	128 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	129 raise_errmsg(char msg, PyObject s, Py_ssize_t end);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	130 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	131 encoder_encode_string(PyEncoderObject s, PyObject obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	132 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	133 _convertPyInt_AsSsize_t(PyObject o, Py_ssize_t size_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	134 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	135 _convertPyInt_FromSsize_t(Py_ssize_t *size_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	136 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	137 encoder_encode_float(PyEncoderObject s, PyObject obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	138
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	139 #define S_CHAR(c) (c >= ' ' && c <= '~' && c != '\\' && c != '"')
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	140 #define IS_WHITESPACE(c) (((c) == ' ') \|\| ((c) == '\t') \|\| ((c) == '\n') \|\| ((c) == '\r'))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	141
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	142 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	143 _convertPyInt_AsSsize_t(PyObject o, Py_ssize_t size_ptr)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	144 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	145 /* PyObject to Py_ssize_t converter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	146 *size_ptr = PyLong_AsSsize_t(o);
53769 2e044c9f4b40 Merged revisions 72314 via svnmerge from Georg Brandl <georg@python.org> parents: 53669 diff changeset	147 if (*size_ptr == -1 && PyErr_Occurred())
2e044c9f4b40 Merged revisions 72314 via svnmerge from Georg Brandl <georg@python.org> parents: 53669 diff changeset	148 return 0;
2e044c9f4b40 Merged revisions 72314 via svnmerge from Georg Brandl <georg@python.org> parents: 53669 diff changeset	149 return 1;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	150 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	151
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	152 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	153 _convertPyInt_FromSsize_t(Py_ssize_t *size_ptr)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	154 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	155 /* Py_ssize_t to PyObject converter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	156 return PyLong_FromSsize_t(*size_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	157 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	158
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	159 static Py_ssize_t
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	160 ascii_escape_unichar(Py_UCS4 c, unsigned char *output, Py_ssize_t chars)
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	161 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	162 /* Escape unicode code point c to ASCII escape sequences
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	163 in char *output. output must have at least 12 bytes unused to
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	164 accommodate an escaped surrogate pair "\uXXXX\uXXXX" */
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	165 output[chars++] = '\\';
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	166 switch (c) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	167 case '\\': output[chars++] = c; break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	168 case '"': output[chars++] = c; break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	169 case '\b': output[chars++] = 'b'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	170 case '\f': output[chars++] = 'f'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	171 case '\n': output[chars++] = 'n'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	172 case '\r': output[chars++] = 'r'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	173 case '\t': output[chars++] = 't'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	174 default:
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	175 if (c >= 0x10000) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	176 /* UTF-16 surrogate pair */
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	177 Py_UCS4 v = Py_UNICODE_HIGH_SURROGATE(c);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	178 output[chars++] = 'u';
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	179 output[chars++] = Py_hexdigits[(v >> 12) & 0xf];
13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	180 output[chars++] = Py_hexdigits[(v >> 8) & 0xf];
13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	181 output[chars++] = Py_hexdigits[(v >> 4) & 0xf];
13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	182 output[chars++] = Py_hexdigits[(v ) & 0xf];
13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	183 c = Py_UNICODE_LOW_SURROGATE(c);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	184 output[chars++] = '\\';
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	185 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	186 output[chars++] = 'u';
72918 d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72864 diff changeset	187 output[chars++] = Py_hexdigits[(c >> 12) & 0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72864 diff changeset	188 output[chars++] = Py_hexdigits[(c >> 8) & 0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72864 diff changeset	189 output[chars++] = Py_hexdigits[(c >> 4) & 0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72864 diff changeset	190 output[chars++] = Py_hexdigits[(c ) & 0xf];
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	191 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	192 return chars;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	193 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	194
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	195 static PyObject *
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	196 ascii_escape_unicode(PyObject *pystr)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	197 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	198 /* Take a PyUnicode pystr and return a new ASCII-only escaped PyUnicode */
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	199 Py_ssize_t i;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	200 Py_ssize_t input_chars;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	201 Py_ssize_t output_size;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	202 Py_ssize_t chars;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	203 PyObject *rval;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	204 void *input;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	205 unsigned char *output;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	206 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	207
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	208 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	209 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	210
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	211 input_chars = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	212 input = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	213 kind = PyUnicode_KIND(pystr);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	214
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	215 /* Compute the output size */
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	216 for (i = 0, output_size = 2; i < input_chars; i++) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	217 Py_UCS4 c = PyUnicode_READ(kind, input, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	218 if (S_CHAR(c))
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	219 output_size++;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	220 else {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	221 switch(c) {
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	222 case '\\': case '"': case '\b': case '\f':
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	223 case '\n': case '\r': case '\t':
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	224 output_size += 2; break;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	225 default:
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	226 output_size += c >= 0x10000 ? 12 : 6;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	227 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	228 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	229 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	230
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	231 rval = PyUnicode_New(output_size, 127);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	232 if (rval == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	233 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	234 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	235 output = PyUnicode_1BYTE_DATA(rval);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	236 chars = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	237 output[chars++] = '"';
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	238 for (i = 0; i < input_chars; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	239 Py_UCS4 c = PyUnicode_READ(kind, input, i);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	240 if (S_CHAR(c)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	241 output[chars++] = c;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	242 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	243 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	244 chars = ascii_escape_unichar(c, output, chars);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	245 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	246 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	247 output[chars++] = '"';
76573 1439e2d1f490 Check newly created consistency using _PyUnicode_CheckConsistency(str, 1) Victor Stinner <victor.stinner@gmail.com> parents: 75876 diff changeset	248 assert(_PyUnicode_CheckConsistency(rval, 1));
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	249 return rval;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	250 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	251
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	252 static void
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	253 raise_errmsg(char msg, PyObject s, Py_ssize_t end)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	254 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	255 /* Use the Python function json.decoder.errmsg to raise a nice
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	256 looking ValueError exception */
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	257 static PyObject *errmsg_fn = NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	258 PyObject *pymsg;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	259 if (errmsg_fn == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	260 PyObject *decoder = PyImport_ImportModule("json.decoder");
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	261 if (decoder == NULL)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	262 return;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	263 errmsg_fn = PyObject_GetAttrString(decoder, "errmsg");
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	264 Py_DECREF(decoder);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	265 if (errmsg_fn == NULL)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	266 return;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	267 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	268 pymsg = PyObject_CallFunction(errmsg_fn, "(zOO&)", msg, s, _convertPyInt_FromSsize_t, &end);
49524 00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	269 if (pymsg) {
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	270 PyErr_SetObject(PyExc_ValueError, pymsg);
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	271 Py_DECREF(pymsg);
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	272 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	273 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	274
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	275 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	276 _build_rval_index_tuple(PyObject *rval, Py_ssize_t idx) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	277 /* return (rval, idx) tuple, stealing reference to rval */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	278 PyObject *tpl;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	279 PyObject *pyidx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	280 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	281 steal a reference to rval, returns (rval, idx)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	282 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	283 if (rval == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	284 return NULL;
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	285 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	286 pyidx = PyLong_FromSsize_t(idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	287 if (pyidx == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	288 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	289 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	290 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	291 tpl = PyTuple_New(2);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	292 if (tpl == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	293 Py_DECREF(pyidx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	294 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	295 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	296 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	297 PyTuple_SET_ITEM(tpl, 0, rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	298 PyTuple_SET_ITEM(tpl, 1, pyidx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	299 return tpl;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	300 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	301
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	302 #define APPEND_OLD_CHUNK \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	303 if (chunk != NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	304 if (chunks == NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	305 chunks = PyList_New(0); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	306 if (chunks == NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	307 goto bail; \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	308 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	309 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	310 if (PyList_Append(chunks, chunk)) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	311 Py_DECREF(chunk); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	312 goto bail; \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	313 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	314 Py_CLEAR(chunk); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	315 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	316
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	317 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	318 scanstring_unicode(PyObject pystr, Py_ssize_t end, int strict, Py_ssize_t next_end_ptr)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	319 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	320 /* Read the JSON string from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	321 end is the index of the first character after the quote.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	322 if strict is zero then literal control characters are allowed
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	323 *next_end_ptr is a return-by-reference index of the character
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	324 after the end quote
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	325
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	326 Return value is a new PyUnicode
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	327 */
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	328 PyObject *rval = NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	329 Py_ssize_t len;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	330 Py_ssize_t begin = end - 1;
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	331 Py_ssize_t next /* = begin */;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	332 const void *buf;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	333 int kind;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	334 PyObject *chunks = NULL;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	335 PyObject *chunk = NULL;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	336
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	337 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	338 return 0;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	339
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	340 len = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	341 buf = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	342 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	343
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	344 if (end < 0 \|\| len <= end) {
8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	345 PyErr_SetString(PyExc_ValueError, "end is out of bounds");
8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	346 goto bail;
8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	347 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	348 while (1) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	349 /* Find the end of the string or the next escape */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	350 Py_UCS4 c = 0;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	351 for (next = end; next < len; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	352 c = PyUnicode_READ(kind, buf, next);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	353 if (c == '"' \|\| c == '\\') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	354 break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	355 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	356 else if (strict && c <= 0x1f) {
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	357 raise_errmsg("Invalid control character at", pystr, next);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	358 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	359 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	360 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	361 if (!(c == '"' \|\| c == '\\')) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	362 raise_errmsg("Unterminated string starting at", pystr, begin);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	363 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	364 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	365 /* Pick up this chunk if it's not zero length */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	366 if (next != end) {
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	367 APPEND_OLD_CHUNK
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	368 chunk = PyUnicode_FromKindAndData(
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	369 kind,
72796 c25262e97304 Change PyUnicode_KIND to 1,2,4. Drop _KIND_SIZE and _CHARACTER_SIZE. Martin v. Löwis <martin@v.loewis.de> parents: 72757 diff changeset	370 (char)buf + kind end,
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	371 next - end);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	372 if (chunk == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	373 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	374 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	375 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	376 next++;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	377 if (c == '"') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	378 end = next;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	379 break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	380 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	381 if (next == len) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	382 raise_errmsg("Unterminated string starting at", pystr, begin);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	383 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	384 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	385 c = PyUnicode_READ(kind, buf, next);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	386 if (c != 'u') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	387 /* Non-unicode backslash escapes */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	388 end = next + 1;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	389 switch (c) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	390 case '"': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	391 case '\\': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	392 case '/': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	393 case 'b': c = '\b'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	394 case 'f': c = '\f'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	395 case 'n': c = '\n'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	396 case 'r': c = '\r'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	397 case 't': c = '\t'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	398 default: c = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	399 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	400 if (c == 0) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	401 raise_errmsg("Invalid \\escape", pystr, end - 2);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	402 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	403 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	404 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	405 else {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	406 c = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	407 next++;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	408 end = next + 4;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	409 if (end >= len) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	410 raise_errmsg("Invalid \\uXXXX escape", pystr, next - 1);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	411 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	412 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	413 /* Decode 4 hex digits */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	414 for (; next < end; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	415 Py_UCS4 digit = PyUnicode_READ(kind, buf, next);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	416 c <<= 4;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	417 switch (digit) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	418 case '0': case '1': case '2': case '3': case '4':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	419 case '5': case '6': case '7': case '8': case '9':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	420 c \|= (digit - '0'); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	421 case 'a': case 'b': case 'c': case 'd': case 'e':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	422 case 'f':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	423 c \|= (digit - 'a' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	424 case 'A': case 'B': case 'C': case 'D': case 'E':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	425 case 'F':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	426 c \|= (digit - 'A' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	427 default:
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	428 raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	429 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	430 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	431 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	432 /* Surrogate pair */
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	433 if (Py_UNICODE_IS_HIGH_SURROGATE(c)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	434 Py_UCS4 c2 = 0;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	435 if (end + 6 >= len) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	436 raise_errmsg("Unpaired high surrogate", pystr, end - 5);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	437 goto bail;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	438 }
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	439 if (PyUnicode_READ(kind, buf, next++) != '\\' \|\|
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	440 PyUnicode_READ(kind, buf, next++) != 'u') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	441 raise_errmsg("Unpaired high surrogate", pystr, end - 5);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	442 goto bail;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	443 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	444 end += 6;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	445 /* Decode 4 hex digits */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	446 for (; next < end; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	447 Py_UCS4 digit = PyUnicode_READ(kind, buf, next);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	448 c2 <<= 4;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	449 switch (digit) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	450 case '0': case '1': case '2': case '3': case '4':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	451 case '5': case '6': case '7': case '8': case '9':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	452 c2 \|= (digit - '0'); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	453 case 'a': case 'b': case 'c': case 'd': case 'e':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	454 case 'f':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	455 c2 \|= (digit - 'a' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	456 case 'A': case 'B': case 'C': case 'D': case 'E':
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	457 case 'F':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	458 c2 \|= (digit - 'A' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	459 default:
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	460 raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	461 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	462 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	463 }
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	464 if (!Py_UNICODE_IS_LOW_SURROGATE(c2)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	465 raise_errmsg("Unpaired high surrogate", pystr, end - 5);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	466 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	467 }
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	468 c = Py_UNICODE_JOIN_SURROGATES(c, c2);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	469 }
80057 13dd8199c112 Issue #16330: Use surrogate-related macros Victor Stinner <victor.stinner@gmail.com> parents: 77841 diff changeset	470 else if (Py_UNICODE_IS_LOW_SURROGATE(c)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	471 raise_errmsg("Unpaired low surrogate", pystr, end - 5);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	472 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	473 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	474 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	475 APPEND_OLD_CHUNK
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	476 chunk = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, &c, 1);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	477 if (chunk == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	478 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	479 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	480 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	481
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	482 if (chunks == NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	483 if (chunk != NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	484 rval = chunk;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	485 else
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	486 rval = PyUnicode_FromStringAndSize("", 0);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	487 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	488 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	489 APPEND_OLD_CHUNK
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	490 rval = join_list_unicode(chunks);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	491 if (rval == NULL) {
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	492 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	493 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	494 Py_CLEAR(chunks);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	495 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	496
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	497 *next_end_ptr = end;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	498 return rval;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	499 bail:
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	500 *next_end_ptr = -1;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	501 Py_XDECREF(chunks);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	502 Py_XDECREF(chunk);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	503 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	504 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	505
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	506 PyDoc_STRVAR(pydoc_scanstring,
63575 4874efd1f657 #9087: update json docstrings -- unicode and long do not exist anymore. Georg Brandl <georg@python.org> parents: 63122 diff changeset	507 "scanstring(string, end, strict=True) -> (string, end)\n"
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	508 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	509 "Scan the string s for a JSON string. End is the index of the\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	510 "character in s after the quote that started the JSON string.\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	511 "Unescapes all valid JSON string escape sequences and raises ValueError\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	512 "on attempt to decode an invalid string. If strict is False then literal\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	513 "control characters are allowed in the string.\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	514 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	515 "Returns a tuple of the decoded string and the index of the character in s\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	516 "after the end quote."
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	517 );
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	518
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	519 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	520 py_scanstring(PyObject* self UNUSED, PyObject *args)
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	521 {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	522 PyObject *pystr;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	523 PyObject *rval;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	524 Py_ssize_t end;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	525 Py_ssize_t next_end = -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	526 int strict = 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	527 if (!PyArg_ParseTuple(args, "OO&\|i:scanstring", &pystr, _convertPyInt_AsSsize_t, &end, &strict)) {
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	528 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	529 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	530 if (PyUnicode_Check(pystr)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	531 rval = scanstring_unicode(pystr, end, strict, &next_end);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	532 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	533 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	534 PyErr_Format(PyExc_TypeError,
63575 4874efd1f657 #9087: update json docstrings -- unicode and long do not exist anymore. Georg Brandl <georg@python.org> parents: 63122 diff changeset	535 "first argument must be a string, not %.80s",
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	536 Py_TYPE(pystr)->tp_name);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	537 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	538 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	539 return _build_rval_index_tuple(rval, next_end);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	540 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	541
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	542 PyDoc_STRVAR(pydoc_encode_basestring_ascii,
63575 4874efd1f657 #9087: update json docstrings -- unicode and long do not exist anymore. Georg Brandl <georg@python.org> parents: 63122 diff changeset	543 "encode_basestring_ascii(string) -> string\n"
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	544 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	545 "Return an ASCII-only JSON representation of a Python string"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	546 );
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	547
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	548 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	549 py_encode_basestring_ascii(PyObject* self UNUSED, PyObject *pystr)
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	550 {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	551 PyObject *rval;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	552 /* Return an ASCII-only JSON representation of a Python string */
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	553 /* METH_O */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	554 if (PyUnicode_Check(pystr)) {
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	555 rval = ascii_escape_unicode(pystr);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	556 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	557 else {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	558 PyErr_Format(PyExc_TypeError,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	559 "first argument must be a string, not %.80s",
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	560 Py_TYPE(pystr)->tp_name);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	561 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	562 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	563 return rval;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	564 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	565
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	566 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	567 scanner_dealloc(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	568 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	569 /* Deallocate scanner object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	570 scanner_clear(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	571 Py_TYPE(self)->tp_free(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	572 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	573
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	574 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	575 scanner_traverse(PyObject self, visitproc visit, void arg)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	576 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	577 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	578 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	579 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	580 Py_VISIT(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	581 Py_VISIT(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	582 Py_VISIT(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	583 Py_VISIT(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	584 Py_VISIT(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	585 Py_VISIT(s->parse_constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	586 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	587 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	588
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	589 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	590 scanner_clear(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	591 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	592 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	593 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	594 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	595 Py_CLEAR(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	596 Py_CLEAR(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	597 Py_CLEAR(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	598 Py_CLEAR(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	599 Py_CLEAR(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	600 Py_CLEAR(s->parse_constant);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	601 Py_CLEAR(s->memo);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	602 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	603 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	604
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	605 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	606 _parse_object_unicode(PyScannerObject s, PyObject pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	607 /* Read a JSON object from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	608 idx is the index of the first character after the opening curly brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	609 *next_idx_ptr is a return-by-reference index to the first character after
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	610 the closing curly brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	611
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	612 Returns a new PyObject (usually a dict, but object_hook can change that)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	613 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	614 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	615 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	616 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	617 PyObject *val = NULL;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	618 PyObject *rval = NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	619 PyObject *key = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	620 int strict = PyObject_IsTrue(s->strict);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	621 int has_pairs_hook = (s->object_pairs_hook != Py_None);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	622 Py_ssize_t next_idx;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	623
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	624 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	625 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	626
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	627 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	628 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	629 end_idx = PyUnicode_GET_LENGTH(pystr) - 1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	630
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	631 if (has_pairs_hook)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	632 rval = PyList_New(0);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	633 else
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	634 rval = PyDict_New();
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	635 if (rval == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	636 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	637
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	638 /* skip whitespace after { */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	639 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind,str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	640
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	641 /* only loop if the object is non-empty */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	642 if (idx <= end_idx && PyUnicode_READ(kind, str, idx) != '}') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	643 while (idx <= end_idx) {
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	644 PyObject *memokey;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	645
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	646 /* read key */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	647 if (PyUnicode_READ(kind, str, idx) != '"') {
77840 9854520c8200 Issue #5067: improve some json error messages. Antoine Pitrou <solipsis@pitrou.net> parents: 70022 diff changeset	648 raise_errmsg("Expecting property name enclosed in double quotes", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	649 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	650 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	651 key = scanstring_unicode(pystr, idx + 1, strict, &next_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	652 if (key == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	653 goto bail;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	654 memokey = PyDict_GetItem(s->memo, key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	655 if (memokey != NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	656 Py_INCREF(memokey);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	657 Py_DECREF(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	658 key = memokey;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	659 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	660 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	661 if (PyDict_SetItem(s->memo, key, key) < 0)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	662 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	663 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	664 idx = next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	665
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	666 /* skip whitespace between key and : delimiter, read :, skip whitespace */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	667 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	668 if (idx > end_idx \|\| PyUnicode_READ(kind, str, idx) != ':') {
77840 9854520c8200 Issue #5067: improve some json error messages. Antoine Pitrou <solipsis@pitrou.net> parents: 70022 diff changeset	669 raise_errmsg("Expecting ':' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	670 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	671 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	672 idx++;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	673 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	674
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	675 /* read any JSON term */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	676 val = scan_once_unicode(s, pystr, idx, &next_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	677 if (val == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	678 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	679
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	680 if (has_pairs_hook) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	681 PyObject *item = PyTuple_Pack(2, key, val);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	682 if (item == NULL)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	683 goto bail;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	684 Py_CLEAR(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	685 Py_CLEAR(val);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	686 if (PyList_Append(rval, item) == -1) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	687 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	688 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	689 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	690 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	691 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	692 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	693 if (PyDict_SetItem(rval, key, val) < 0)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	694 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	695 Py_CLEAR(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	696 Py_CLEAR(val);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	697 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	698 idx = next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	699
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	700 /* skip whitespace before } or , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	701 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	702
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	703 /* bail if the object is closed or we didn't get the , delimiter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	704 if (idx > end_idx) break;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	705 if (PyUnicode_READ(kind, str, idx) == '}') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	706 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	707 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	708 else if (PyUnicode_READ(kind, str, idx) != ',') {
77840 9854520c8200 Issue #5067: improve some json error messages. Antoine Pitrou <solipsis@pitrou.net> parents: 70022 diff changeset	709 raise_errmsg("Expecting ',' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	710 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	711 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	712 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	713
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	714 /* skip whitespace after , delimiter */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	715 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	716 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	717 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	718
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	719 /* verify that idx < end_idx, str[idx] should be '}' */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	720 if (idx > end_idx \|\| PyUnicode_READ(kind, str, idx) != '}') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	721 raise_errmsg("Expecting object", pystr, end_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	722 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	723 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	724
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	725 *next_idx_ptr = idx + 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	726
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	727 if (has_pairs_hook) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	728 val = PyObject_CallFunctionObjArgs(s->object_pairs_hook, rval, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	729 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	730 return val;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	731 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	732
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	733 /* if object_hook is not None: rval = object_hook(rval) */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	734 if (s->object_hook != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	735 val = PyObject_CallFunctionObjArgs(s->object_hook, rval, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	736 Py_DECREF(rval);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	737 return val;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	738 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	739 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	740 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	741 Py_XDECREF(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	742 Py_XDECREF(val);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	743 Py_XDECREF(rval);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	744 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	745 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	746
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	747 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	748 _parse_array_unicode(PyScannerObject s, PyObject pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	749 /* Read a JSON array from PyString pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	750 idx is the index of the first character after the opening brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	751 *next_idx_ptr is a return-by-reference index to the first character after
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	752 the closing brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	753
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	754 Returns a new PyList
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	755 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	756 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	757 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	758 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	759 PyObject *val = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	760 PyObject *rval = PyList_New(0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	761 Py_ssize_t next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	762 if (rval == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	763 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	764
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	765 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	766 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	767
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	768 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	769 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	770 end_idx = PyUnicode_GET_LENGTH(pystr) - 1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	771
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	772 /* skip whitespace after [ */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	773 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	774
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	775 /* only loop if the array is non-empty */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	776 if (idx <= end_idx && PyUnicode_READ(kind, str, idx) != ']') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	777 while (idx <= end_idx) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	778
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	779 /* read any JSON term */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	780 val = scan_once_unicode(s, pystr, idx, &next_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	781 if (val == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	782 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	783
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	784 if (PyList_Append(rval, val) == -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	785 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	786
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	787 Py_CLEAR(val);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	788 idx = next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	789
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	790 /* skip whitespace between term and , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	791 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	792
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	793 /* bail if the array is closed or we didn't get the , delimiter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	794 if (idx > end_idx) break;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	795 if (PyUnicode_READ(kind, str, idx) == ']') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	796 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	797 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	798 else if (PyUnicode_READ(kind, str, idx) != ',') {
77840 9854520c8200 Issue #5067: improve some json error messages. Antoine Pitrou <solipsis@pitrou.net> parents: 70022 diff changeset	799 raise_errmsg("Expecting ',' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	800 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	801 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	802 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	803
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	804 /* skip whitespace after , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	805 while (idx <= end_idx && IS_WHITESPACE(PyUnicode_READ(kind, str, idx))) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	806 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	807 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	808
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	809 /* verify that idx < end_idx, PyUnicode_READ(kind, str, idx) should be ']' */
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	810 if (idx > end_idx \|\| PyUnicode_READ(kind, str, idx) != ']') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	811 raise_errmsg("Expecting object", pystr, end_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	812 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	813 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	814 *next_idx_ptr = idx + 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	815 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	816 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	817 Py_XDECREF(val);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	818 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	819 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	820 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	821
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	822 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	823 _parse_constant(PyScannerObject s, char constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	824 /* Read a JSON constant from PyString pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	825 constant is the constant string that was found
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	826 ("NaN", "Infinity", "-Infinity").
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	827 idx is the index of the first character of the constant
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	828 *next_idx_ptr is a return-by-reference index to the first character after
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	829 the constant.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	830
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	831 Returns the result of parse_constant
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	832 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	833 PyObject *cstr;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	834 PyObject *rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	835 /* constant is "NaN", "Infinity", or "-Infinity" */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	836 cstr = PyUnicode_InternFromString(constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	837 if (cstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	838 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	839
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	840 /* rval = parse_constant(constant) */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	841 rval = PyObject_CallFunctionObjArgs(s->parse_constant, cstr, NULL);
72863 afa42c04f0a3 Fix misuse of PyUnicode_GET_SIZE, use PyUnicode_GET_LENGTH instead Victor Stinner <victor.stinner@haypocalc.com> parents: 72852 diff changeset	842 idx += PyUnicode_GET_LENGTH(cstr);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	843 Py_DECREF(cstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	844 *next_idx_ptr = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	845 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	846 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	847
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	848 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	849 _match_number_unicode(PyScannerObject s, PyObject pystr, Py_ssize_t start, Py_ssize_t *next_idx_ptr) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	850 /* Read a JSON number from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	851 idx is the index of the first character of the number
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	852 *next_idx_ptr is a return-by-reference index to the first character after
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	853 the number.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	854
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	855 Returns a new PyObject representation of that number:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	856 PyInt, PyLong, or PyFloat.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	857 May return other types if parse_int or parse_float are set
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	858 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	859 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	860 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	861 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	862 Py_ssize_t idx = start;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	863 int is_float = 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	864 PyObject *rval;
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	865 PyObject *numstr = NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	866 PyObject *custom_func;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	867
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	868 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	869 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	870
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	871 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	872 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	873 end_idx = PyUnicode_GET_LENGTH(pystr) - 1;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	874
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	875 /* read a sign if it's there, make sure it's not the end of the string */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	876 if (PyUnicode_READ(kind, str, idx) == '-') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	877 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	878 if (idx > end_idx) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	879 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	880 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	881 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	882 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	883
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	884 /* read as many integer digits as we find as long as it doesn't start with 0 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	885 if (PyUnicode_READ(kind, str, idx) >= '1' && PyUnicode_READ(kind, str, idx) <= '9') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	886 idx++;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	887 while (idx <= end_idx && PyUnicode_READ(kind, str, idx) >= '0' && PyUnicode_READ(kind, str, idx) <= '9') idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	888 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	889 /* if it starts with 0 we only expect one integer digit */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	890 else if (PyUnicode_READ(kind, str, idx) == '0') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	891 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	892 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	893 /* no integer digits, error */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	894 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	895 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	896 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	897 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	898
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	899 /* if the next char is '.' followed by a digit then read all float digits */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	900 if (idx < end_idx && PyUnicode_READ(kind, str, idx) == '.' && PyUnicode_READ(kind, str, idx + 1) >= '0' && PyUnicode_READ(kind, str, idx + 1) <= '9') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	901 is_float = 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	902 idx += 2;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	903 while (idx <= end_idx && PyUnicode_READ(kind, str, idx) >= '0' && PyUnicode_READ(kind, str, idx) <= '9') idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	904 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	905
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	906 /* if the next char is 'e' or 'E' then maybe read the exponent (or backtrack) */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	907 if (idx < end_idx && (PyUnicode_READ(kind, str, idx) == 'e' \|\| PyUnicode_READ(kind, str, idx) == 'E')) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	908 Py_ssize_t e_start = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	909 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	910
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	911 /* read an exponent sign if present */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	912 if (idx < end_idx && (PyUnicode_READ(kind, str, idx) == '-' \|\| PyUnicode_READ(kind, str, idx) == '+')) idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	913
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	914 /* read all digits */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	915 while (idx <= end_idx && PyUnicode_READ(kind, str, idx) >= '0' && PyUnicode_READ(kind, str, idx) <= '9') idx++;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	916
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	917 /* if we got a digit, then parse as float. if not, backtrack */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	918 if (PyUnicode_READ(kind, str, idx - 1) >= '0' && PyUnicode_READ(kind, str, idx - 1) <= '9') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	919 is_float = 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	920 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	921 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	922 idx = e_start;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	923 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	924 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	925
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	926 if (is_float && s->parse_float != (PyObject *)&PyFloat_Type)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	927 custom_func = s->parse_float;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	928 else if (!is_float && s->parse_int != (PyObject *) &PyLong_Type)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	929 custom_func = s->parse_int;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	930 else
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	931 custom_func = NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	932
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	933 if (custom_func) {
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	934 /* copy the section we determined to be a number */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	935 numstr = PyUnicode_FromKindAndData(kind,
72796 c25262e97304 Change PyUnicode_KIND to 1,2,4. Drop _KIND_SIZE and _CHARACTER_SIZE. Martin v. Löwis <martin@v.loewis.de> parents: 72757 diff changeset	936 (char)str + kind start,
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	937 idx - start);
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	938 if (numstr == NULL)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	939 return NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	940 rval = PyObject_CallFunctionObjArgs(custom_func, numstr, NULL);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	941 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	942 else {
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	943 Py_ssize_t i, n;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	944 char *buf;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	945 /* Straight conversion to ASCII, to avoid costly conversion of
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	946 decimal unicode digits (which cannot appear here) */
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	947 n = idx - start;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	948 numstr = PyBytes_FromStringAndSize(NULL, n);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	949 if (numstr == NULL)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	950 return NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	951 buf = PyBytes_AS_STRING(numstr);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	952 for (i = 0; i < n; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	953 buf[i] = (char) PyUnicode_READ(kind, str, i + start);
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	954 }
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	955 if (is_float)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	956 rval = PyFloat_FromString(numstr);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	957 else
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	958 rval = PyLong_FromString(buf, NULL, 10);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	959 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	960 Py_DECREF(numstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	961 *next_idx_ptr = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	962 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	963 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	964
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	965 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	966 scan_once_unicode(PyScannerObject s, PyObject pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	967 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	968 /* Read one JSON term (of any kind) from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	969 idx is the index of the first character of the term
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	970 *next_idx_ptr is a return-by-reference index to the first character after
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	971 the number.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	972
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	973 Returns a new PyObject representation of the term.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	974 */
69910 61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	975 PyObject *res;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	976 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	977 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	978 Py_ssize_t length;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	979
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	980 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	981 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	982
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	983 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	984 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	985 length = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	986
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	987 if (idx >= length) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	988 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	989 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	990 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	991
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	992 switch (PyUnicode_READ(kind, str, idx)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	993 case '"':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	994 /* string */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	995 return scanstring_unicode(pystr, idx + 1,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	996 PyObject_IsTrue(s->strict),
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	997 next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	998 case '{':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	999 /* object */
69910 61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1000 if (Py_EnterRecursiveCall(" while decoding a JSON object "
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1001 "from a unicode string"))
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1002 return NULL;
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1003 res = _parse_object_unicode(s, pystr, idx + 1, next_idx_ptr);
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1004 Py_LeaveRecursiveCall();
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1005 return res;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1006 case '[':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1007 /* array */
69910 61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1008 if (Py_EnterRecursiveCall(" while decoding a JSON array "
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1009 "from a unicode string"))
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1010 return NULL;
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1011 res = _parse_array_unicode(s, pystr, idx + 1, next_idx_ptr);
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1012 Py_LeaveRecursiveCall();
61164d09337e #12017: Fix segfault in json.loads() while decoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 65196 diff changeset	1013 return res;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1014 case 'n':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1015 /* null */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1016 if ((idx + 3 < length) && PyUnicode_READ(kind, str, idx + 1) == 'u' && PyUnicode_READ(kind, str, idx + 2) == 'l' && PyUnicode_READ(kind, str, idx + 3) == 'l') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1017 Py_INCREF(Py_None);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1018 *next_idx_ptr = idx + 4;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1019 return Py_None;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1020 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1021 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1022 case 't':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1023 /* true */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1024 if ((idx + 3 < length) && PyUnicode_READ(kind, str, idx + 1) == 'r' && PyUnicode_READ(kind, str, idx + 2) == 'u' && PyUnicode_READ(kind, str, idx + 3) == 'e') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1025 Py_INCREF(Py_True);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1026 *next_idx_ptr = idx + 4;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1027 return Py_True;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1028 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1029 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1030 case 'f':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1031 /* false */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1032 if ((idx + 4 < length) && PyUnicode_READ(kind, str, idx + 1) == 'a' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1033 PyUnicode_READ(kind, str, idx + 2) == 'l' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1034 PyUnicode_READ(kind, str, idx + 3) == 's' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1035 PyUnicode_READ(kind, str, idx + 4) == 'e') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1036 Py_INCREF(Py_False);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1037 *next_idx_ptr = idx + 5;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1038 return Py_False;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1039 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1040 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1041 case 'N':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1042 /* NaN */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1043 if ((idx + 2 < length) && PyUnicode_READ(kind, str, idx + 1) == 'a' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1044 PyUnicode_READ(kind, str, idx + 2) == 'N') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1045 return _parse_constant(s, "NaN", idx, next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1046 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1047 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1048 case 'I':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1049 /* Infinity */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1050 if ((idx + 7 < length) && PyUnicode_READ(kind, str, idx + 1) == 'n' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1051 PyUnicode_READ(kind, str, idx + 2) == 'f' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1052 PyUnicode_READ(kind, str, idx + 3) == 'i' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1053 PyUnicode_READ(kind, str, idx + 4) == 'n' &&
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1054 PyUnicode_READ(kind, str, idx + 5) == 'i' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1055 PyUnicode_READ(kind, str, idx + 6) == 't' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1056 PyUnicode_READ(kind, str, idx + 7) == 'y') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1057 return _parse_constant(s, "Infinity", idx, next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1058 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1059 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1060 case '-':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1061 /* -Infinity */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1062 if ((idx + 8 < length) && PyUnicode_READ(kind, str, idx + 1) == 'I' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1063 PyUnicode_READ(kind, str, idx + 2) == 'n' &&
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1064 PyUnicode_READ(kind, str, idx + 3) == 'f' &&
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1065 PyUnicode_READ(kind, str, idx + 4) == 'i' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1066 PyUnicode_READ(kind, str, idx + 5) == 'n' &&
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1067 PyUnicode_READ(kind, str, idx + 6) == 'i' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1068 PyUnicode_READ(kind, str, idx + 7) == 't' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1069 PyUnicode_READ(kind, str, idx + 8) == 'y') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1070 return _parse_constant(s, "-Infinity", idx, next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1071 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1072 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1073 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1074 /* Didn't find a string, object, array, or named constant. Look for a number. */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1075 return _match_number_unicode(s, pystr, idx, next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1076 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1077
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1078 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1079 scanner_call(PyObject self, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1080 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1081 /* Python callable interface to scan_once_{str,unicode} */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1082 PyObject *pystr;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1083 PyObject *rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1084 Py_ssize_t idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1085 Py_ssize_t next_idx = -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1086 static char *kwlist[] = {"string", "idx", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1087 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1088 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1089 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1090 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:scan_once", kwlist, &pystr, _convertPyInt_AsSsize_t, &idx))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1091 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1092
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1093 if (PyUnicode_Check(pystr)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1094 rval = scan_once_unicode(s, pystr, idx, &next_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1095 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1096 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1097 PyErr_Format(PyExc_TypeError,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1098 "first argument must be a string, not %.80s",
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1099 Py_TYPE(pystr)->tp_name);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1100 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1101 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1102 PyDict_Clear(s->memo);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1103 if (rval == NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1104 return NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1105 return _build_rval_index_tuple(rval, next_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1106 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1107
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1108 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1109 scanner_new(PyTypeObject type, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1110 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1111 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1112 s = (PyScannerObject *)type->tp_alloc(type, 0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1113 if (s != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1114 s->strict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1115 s->object_hook = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1116 s->object_pairs_hook = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1117 s->parse_float = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1118 s->parse_int = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1119 s->parse_constant = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1120 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1121 return (PyObject *)s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1122 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1123
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1124 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1125 scanner_init(PyObject self, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1126 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1127 /* Initialize Scanner object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1128 PyObject *ctx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1129 static char *kwlist[] = {"context", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1130 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1131
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1132 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1133 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1134
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1135 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:make_scanner", kwlist, &ctx))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1136 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1137
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1138 if (s->memo == NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1139 s->memo = PyDict_New();
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1140 if (s->memo == NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1141 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1142 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1143
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1144 /* All of these will fail "gracefully" so we don't need to verify them */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1145 s->strict = PyObject_GetAttrString(ctx, "strict");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1146 if (s->strict == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1147 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1148 s->object_hook = PyObject_GetAttrString(ctx, "object_hook");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1149 if (s->object_hook == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1150 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1151 s->object_pairs_hook = PyObject_GetAttrString(ctx, "object_pairs_hook");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1152 if (s->object_pairs_hook == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1153 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1154 s->parse_float = PyObject_GetAttrString(ctx, "parse_float");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1155 if (s->parse_float == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1156 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1157 s->parse_int = PyObject_GetAttrString(ctx, "parse_int");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1158 if (s->parse_int == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1159 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1160 s->parse_constant = PyObject_GetAttrString(ctx, "parse_constant");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1161 if (s->parse_constant == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1162 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1163
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1164 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1165
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1166 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1167 Py_CLEAR(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1168 Py_CLEAR(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1169 Py_CLEAR(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1170 Py_CLEAR(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1171 Py_CLEAR(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1172 Py_CLEAR(s->parse_constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1173 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1174 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1175
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1176 PyDoc_STRVAR(scanner_doc, "JSON scanner object");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1177
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1178 static
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1179 PyTypeObject PyScannerType = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1180 PyVarObject_HEAD_INIT(NULL, 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1181 "_json.Scanner", /* tp_name */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1182 sizeof(PyScannerObject), /* tp_basicsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1183 0, /* tp_itemsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1184 scanner_dealloc, /* tp_dealloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1185 0, /* tp_print */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1186 0, /* tp_getattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1187 0, /* tp_setattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1188 0, /* tp_compare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1189 0, /* tp_repr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1190 0, /* tp_as_number */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1191 0, /* tp_as_sequence */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1192 0, /* tp_as_mapping */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1193 0, /* tp_hash */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1194 scanner_call, /* tp_call */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1195 0, /* tp_str */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1196 0,/* PyObject_GenericGetAttr, / / tp_getattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1197 0,/* PyObject_GenericSetAttr, / / tp_setattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1198 0, /* tp_as_buffer */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1199 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1200 scanner_doc, /* tp_doc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1201 scanner_traverse, /* tp_traverse */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1202 scanner_clear, /* tp_clear */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1203 0, /* tp_richcompare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1204 0, /* tp_weaklistoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1205 0, /* tp_iter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1206 0, /* tp_iternext */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1207 0, /* tp_methods */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1208 scanner_members, /* tp_members */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1209 0, /* tp_getset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1210 0, /* tp_base */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1211 0, /* tp_dict */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1212 0, /* tp_descr_get */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1213 0, /* tp_descr_set */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1214 0, /* tp_dictoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1215 scanner_init, /* tp_init */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1216 0,/* PyType_GenericAlloc, / / tp_alloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1217 scanner_new, /* tp_new */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1218 0,/* PyObject_GC_Del, / / tp_free */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1219 };
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1220
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1221 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1222 encoder_new(PyTypeObject type, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1223 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1224 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1225 s = (PyEncoderObject *)type->tp_alloc(type, 0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1226 if (s != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1227 s->markers = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1228 s->defaultfn = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1229 s->encoder = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1230 s->indent = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1231 s->key_separator = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1232 s->item_separator = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1233 s->sort_keys = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1234 s->skipkeys = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1235 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1236 return (PyObject *)s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1237 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1238
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1239 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1240 encoder_init(PyObject self, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1241 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1242 /* initialize Encoder object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1243 static char *kwlist[] = {"markers", "default", "encoder", "indent", "key_separator", "item_separator", "sort_keys", "skipkeys", "allow_nan", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1244
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1245 PyEncoderObject *s;
57610 6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1246 PyObject markers, defaultfn, encoder, indent, *key_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1247 PyObject item_separator, sort_keys, skipkeys, allow_nan;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1248
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1249 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1250 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1251
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1252 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOOOOO:make_encoder", kwlist,
57610 6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1253 &markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator,
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1254 &sort_keys, &skipkeys, &allow_nan))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1255 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1256
57610 6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1257 s->markers = markers;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1258 s->defaultfn = defaultfn;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1259 s->encoder = encoder;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1260 s->indent = indent;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1261 s->key_separator = key_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1262 s->item_separator = item_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1263 s->sort_keys = sort_keys;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1264 s->skipkeys = skipkeys;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1265 s->fast_encode = (PyCFunction_Check(s->encoder) && PyCFunction_GetFunction(s->encoder) == (PyCFunction)py_encode_basestring_ascii);
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1266 s->allow_nan = PyObject_IsTrue(allow_nan);
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1267
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1268 Py_INCREF(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1269 Py_INCREF(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1270 Py_INCREF(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1271 Py_INCREF(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1272 Py_INCREF(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1273 Py_INCREF(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1274 Py_INCREF(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1275 Py_INCREF(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1276 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1277 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1278
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1279 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1280 encoder_call(PyObject self, PyObject args, PyObject *kwds)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1281 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1282 /* Python callable interface to encode_listencode_obj */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1283 static char *kwlist[] = {"obj", "_current_indent_level", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1284 PyObject *obj;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1285 Py_ssize_t indent_level;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1286 PyEncoderObject *s;
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1287 _PyAccu acc;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1288
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1289 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1290 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1291 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:_iterencode", kwlist,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1292 &obj, _convertPyInt_AsSsize_t, &indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1293 return NULL;
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1294 if (_PyAccu_Init(&acc))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1295 return NULL;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1296 if (encoder_listencode_obj(s, &acc, obj, indent_level)) {
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1297 _PyAccu_Destroy(&acc);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1298 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1299 }
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1300 return _PyAccu_FinishAsList(&acc);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1301 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1302
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1303 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1304 _encoded_const(PyObject *obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1305 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1306 /* Return the JSON string representation of None, True, False */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1307 if (obj == Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1308 static PyObject *s_null = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1309 if (s_null == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1310 s_null = PyUnicode_InternFromString("null");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1311 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1312 Py_INCREF(s_null);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1313 return s_null;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1314 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1315 else if (obj == Py_True) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1316 static PyObject *s_true = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1317 if (s_true == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1318 s_true = PyUnicode_InternFromString("true");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1319 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1320 Py_INCREF(s_true);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1321 return s_true;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1322 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1323 else if (obj == Py_False) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1324 static PyObject *s_false = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1325 if (s_false == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1326 s_false = PyUnicode_InternFromString("false");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1327 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1328 Py_INCREF(s_false);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1329 return s_false;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1330 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1331 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1332 PyErr_SetString(PyExc_ValueError, "not a const");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1333 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1334 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1335 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1336
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1337 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1338 encoder_encode_float(PyEncoderObject s, PyObject obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1339 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1340 /* Return the JSON representation of a PyFloat */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1341 double i = PyFloat_AS_DOUBLE(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1342 if (!Py_IS_FINITE(i)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1343 if (!s->allow_nan) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1344 PyErr_SetString(PyExc_ValueError, "Out of range float values are not JSON compliant");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1345 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1346 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1347 if (i > 0) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1348 return PyUnicode_FromString("Infinity");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1349 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1350 else if (i < 0) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1351 return PyUnicode_FromString("-Infinity");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1352 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1353 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1354 return PyUnicode_FromString("NaN");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1355 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1356 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1357 /* Use a better float format here? */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1358 return PyObject_Repr(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1359 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1360
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1361 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1362 encoder_encode_string(PyEncoderObject s, PyObject obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1363 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1364 /* Return the JSON representation of a string */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1365 if (s->fast_encode)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1366 return py_encode_basestring_ascii(NULL, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1367 else
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1368 return PyObject_CallFunctionObjArgs(s->encoder, obj, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1369 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1370
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1371 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1372 _steal_accumulate(_PyAccu acc, PyObject stolen)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1373 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1374 /* Append stolen and then decrement its reference count */
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1375 int rval = _PyAccu_Accumulate(acc, stolen);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1376 Py_DECREF(stolen);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1377 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1378 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1379
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1380 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1381 encoder_listencode_obj(PyEncoderObject s, _PyAccu acc,
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1382 PyObject *obj, Py_ssize_t indent_level)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1383 {
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1384 /* Encode Python object obj to a JSON term */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1385 PyObject *newobj;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1386 int rv;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1387
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1388 if (obj == Py_None \|\| obj == Py_True \|\| obj == Py_False) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1389 PyObject *cstr = _encoded_const(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1390 if (cstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1391 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1392 return _steal_accumulate(acc, cstr);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1393 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1394 else if (PyUnicode_Check(obj))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1395 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1396 PyObject *encoded = encoder_encode_string(s, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1397 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1398 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1399 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1400 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1401 else if (PyLong_Check(obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1402 PyObject *encoded = PyObject_Str(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1403 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1404 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1405 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1406 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1407 else if (PyFloat_Check(obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1408 PyObject *encoded = encoder_encode_float(s, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1409 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1410 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1411 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1412 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1413 else if (PyList_Check(obj) \|\| PyTuple_Check(obj)) {
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1414 if (Py_EnterRecursiveCall(" while encoding a JSON object"))
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1415 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1416 rv = encoder_listencode_list(s, acc, obj, indent_level);
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1417 Py_LeaveRecursiveCall();
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1418 return rv;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1419 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1420 else if (PyDict_Check(obj)) {
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1421 if (Py_EnterRecursiveCall(" while encoding a JSON object"))
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1422 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1423 rv = encoder_listencode_dict(s, acc, obj, indent_level);
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1424 Py_LeaveRecursiveCall();
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1425 return rv;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1426 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1427 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1428 PyObject *ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1429 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1430 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1431 ident = PyLong_FromVoidPtr(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1432 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1433 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1434 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1435 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1436 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1437 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1438 Py_DECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1439 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1440 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1441 if (PyDict_SetItem(s->markers, ident, obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1442 Py_DECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1443 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1444 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1445 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1446 newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1447 if (newobj == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1448 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1449 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1450 }
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1451
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1452 if (Py_EnterRecursiveCall(" while encoding a JSON object"))
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1453 return -1;
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1454 rv = encoder_listencode_obj(s, acc, newobj, indent_level);
70021 9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1455 Py_LeaveRecursiveCall();
9557e4eeb291 #12051: Fix segfault in json.dumps() while encoding highly-nested objects using the C accelerations. Ezio Melotti <ezio.melotti@gmail.com> parents: 69910 diff changeset	1456
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1457 Py_DECREF(newobj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1458 if (rv) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1459 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1460 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1461 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1462 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1463 if (PyDict_DelItem(s->markers, ident)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1464 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1465 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1466 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1467 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1468 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1469 return rv;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1470 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1471 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1472
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1473 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1474 encoder_listencode_dict(PyEncoderObject s, _PyAccu acc,
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1475 PyObject *dct, Py_ssize_t indent_level)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1476 {
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1477 /* Encode Python dict dct a JSON term */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1478 static PyObject *open_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1479 static PyObject *close_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1480 static PyObject *empty_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1481 PyObject *kstr = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1482 PyObject *ident = NULL;
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1483 PyObject *it = NULL;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1484 PyObject *items;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1485 PyObject *item = NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1486 int skipkeys;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1487 Py_ssize_t idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1488
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1489 if (open_dict == NULL \|\| close_dict == NULL \|\| empty_dict == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1490 open_dict = PyUnicode_InternFromString("{");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1491 close_dict = PyUnicode_InternFromString("}");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1492 empty_dict = PyUnicode_InternFromString("{}");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1493 if (open_dict == NULL \|\| close_dict == NULL \|\| empty_dict == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1494 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1495 }
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1496 if (Py_SIZE(dct) == 0)
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1497 return _PyAccu_Accumulate(acc, empty_dict);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1498
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1499 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1500 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1501 ident = PyLong_FromVoidPtr(dct);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1502 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1503 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1504 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1505 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1506 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1507 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1508 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1509 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1510 if (PyDict_SetItem(s->markers, ident, dct)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1511 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1512 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1513 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1514
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1515 if (_PyAccu_Accumulate(acc, open_dict))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1516 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1517
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1518 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1519 /* TODO: DOES NOT RUN */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1520 indent_level += 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1521 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1522 newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1523 separator = _item_separator + newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1524 buf += newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1525 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1526 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1527
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1528 if (PyObject_IsTrue(s->sort_keys)) {
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1529 /* First sort the keys then replace them with (key, value) tuples. */
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1530 Py_ssize_t i, nitems;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1531 items = PyMapping_Keys(dct);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1532 if (items == NULL)
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1533 goto bail;
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1534 if (!PyList_Check(items)) {
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1535 PyErr_SetString(PyExc_ValueError, "keys must return list");
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1536 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1537 }
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1538 if (PyList_Sort(items) < 0)
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1539 goto bail;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1540 nitems = PyList_GET_SIZE(items);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1541 for (i = 0; i < nitems; i++) {
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1542 PyObject key, value;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1543 key = PyList_GET_ITEM(items, i);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1544 value = PyDict_GetItem(dct, key);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1545 item = PyTuple_Pack(2, key, value);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1546 if (item == NULL)
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1547 goto bail;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1548 PyList_SET_ITEM(items, i, item);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1549 Py_DECREF(key);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1550 }
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1551 }
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1552 else {
54374 b61e6ad5ae70 Fix TODO: do the sort by just the key, not the key/value pair. Raymond Hettinger <python@rcn.com> parents: 54373 diff changeset	1553 items = PyMapping_Items(dct);
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1554 }
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1555 if (items == NULL)
54374 b61e6ad5ae70 Fix TODO: do the sort by just the key, not the key/value pair. Raymond Hettinger <python@rcn.com> parents: 54373 diff changeset	1556 goto bail;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1557 it = PyObject_GetIter(items);
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1558 Py_DECREF(items);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1559 if (it == NULL)
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1560 goto bail;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1561 skipkeys = PyObject_IsTrue(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1562 idx = 0;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1563 while ((item = PyIter_Next(it)) != NULL) {
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1564 PyObject encoded, key, *value;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1565 if (!PyTuple_Check(item) \|\| Py_SIZE(item) != 2) {
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1566 PyErr_SetString(PyExc_ValueError, "items must return 2-tuples");
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1567 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1568 }
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1569 key = PyTuple_GET_ITEM(item, 0);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1570 if (PyUnicode_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1571 Py_INCREF(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1572 kstr = key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1573 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1574 else if (PyFloat_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1575 kstr = encoder_encode_float(s, key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1576 if (kstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1577 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1578 }
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1579 else if (key == Py_True \|\| key == Py_False \|\| key == Py_None) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1580 /* This must come before the PyLong_Check because
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1581 True and False are also 1 and 0.*/
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1582 kstr = _encoded_const(key);
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1583 if (kstr == NULL)
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1584 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1585 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1586 else if (PyLong_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1587 kstr = PyObject_Str(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1588 if (kstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1589 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1590 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1591 else if (skipkeys) {
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1592 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1593 continue;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1594 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1595 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1596 /* TODO: include repr of key */
63122 5b468687768c Apply patch from Ray Allen for issue 9296 Doug Hellmann <doug.hellmann@gmail.com> parents: 61466 diff changeset	1597 PyErr_SetString(PyExc_TypeError, "keys must be a string");
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1598 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1599 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1600
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1601 if (idx) {
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1602 if (_PyAccu_Accumulate(acc, s->item_separator))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1603 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1604 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1605
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1606 encoded = encoder_encode_string(s, kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1607 Py_CLEAR(kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1608 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1609 goto bail;
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1610 if (_PyAccu_Accumulate(acc, encoded)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1611 Py_DECREF(encoded);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1612 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1613 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1614 Py_DECREF(encoded);
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1615 if (_PyAccu_Accumulate(acc, s->key_separator))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1616 goto bail;
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1617
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1618 value = PyTuple_GET_ITEM(item, 1);
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1619 if (encoder_listencode_obj(s, acc, value, indent_level))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1620 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1621 idx += 1;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1622 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1623 }
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1624 if (PyErr_Occurred())
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1625 goto bail;
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1626 Py_CLEAR(it);
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1627
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1628 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1629 if (PyDict_DelItem(s->markers, ident))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1630 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1631 Py_CLEAR(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1632 }
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1633 /* TODO DOES NOT RUN; dead code
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1634 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1635 indent_level -= 1;
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1636
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1637 yield '\n' + (' ' * (_indent * _current_indent_level))
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1638 }*/
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1639 if (_PyAccu_Accumulate(acc, close_dict))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1640 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1641 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1642
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1643 bail:
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1644 Py_XDECREF(it);
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1645 Py_XDECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1646 Py_XDECREF(kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1647 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1648 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1649 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1650
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1651
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1652 static int
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1653 encoder_listencode_list(PyEncoderObject s, _PyAccu acc,
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1654 PyObject *seq, Py_ssize_t indent_level)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1655 {
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1656 /* Encode Python list seq to a JSON term */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1657 static PyObject *open_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1658 static PyObject *close_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1659 static PyObject *empty_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1660 PyObject *ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1661 PyObject *s_fast = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1662 Py_ssize_t i;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1663
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1664 if (open_array == NULL \|\| close_array == NULL \|\| empty_array == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1665 open_array = PyUnicode_InternFromString("[");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1666 close_array = PyUnicode_InternFromString("]");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1667 empty_array = PyUnicode_InternFromString("[]");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1668 if (open_array == NULL \|\| close_array == NULL \|\| empty_array == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1669 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1670 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1671 ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1672 s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1673 if (s_fast == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1674 return -1;
80157 3672db224eb3 Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded. Antoine Pitrou <solipsis@pitrou.net> parents: 77840 diff changeset	1675 if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1676 Py_DECREF(s_fast);
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1677 return _PyAccu_Accumulate(acc, empty_array);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1678 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1679
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1680 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1681 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1682 ident = PyLong_FromVoidPtr(seq);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1683 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1684 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1685 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1686 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1687 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1688 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1689 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1690 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1691 if (PyDict_SetItem(s->markers, ident, seq)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1692 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1693 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1694 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1695
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1696 if (_PyAccu_Accumulate(acc, open_array))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1697 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1698 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1699 /* TODO: DOES NOT RUN */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1700 indent_level += 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1701 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1702 newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1703 separator = _item_separator + newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1704 buf += newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1705 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1706 }
80157 3672db224eb3 Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded. Antoine Pitrou <solipsis@pitrou.net> parents: 77840 diff changeset	1707 for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
3672db224eb3 Issue #16228: Fix a crash in the json module where a list changes size while it is being encoded. Antoine Pitrou <solipsis@pitrou.net> parents: 77840 diff changeset	1708 PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1709 if (i) {
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1710 if (_PyAccu_Accumulate(acc, s->item_separator))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1711 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1712 }
71967 47176e8d7060 Issue #12778: Reduce memory consumption when JSON-encoding a large container of many small objects. Antoine Pitrou <solipsis@pitrou.net> parents: 70023 diff changeset	1713 if (encoder_listencode_obj(s, acc, obj, indent_level))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1714 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1715 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1716 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1717 if (PyDict_DelItem(s->markers, ident))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1718 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1719 Py_CLEAR(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1720 }
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1721
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1722 /* TODO: DOES NOT RUN
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1723 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1724 indent_level -= 1;
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1725
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1726 yield '\n' + (' ' * (_indent * _current_indent_level))
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1727 }*/
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1728 if (_PyAccu_Accumulate(acc, close_array))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1729 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1730 Py_DECREF(s_fast);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1731 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1732
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1733 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1734 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1735 Py_DECREF(s_fast);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1736 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1737 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1738
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1739 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1740 encoder_dealloc(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1741 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1742 /* Deallocate Encoder */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1743 encoder_clear(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1744 Py_TYPE(self)->tp_free(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1745 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1746
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1747 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1748 encoder_traverse(PyObject self, visitproc visit, void arg)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1749 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1750 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1751 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1752 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1753 Py_VISIT(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1754 Py_VISIT(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1755 Py_VISIT(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1756 Py_VISIT(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1757 Py_VISIT(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1758 Py_VISIT(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1759 Py_VISIT(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1760 Py_VISIT(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1761 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1762 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1763
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1764 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1765 encoder_clear(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1766 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1767 /* Deallocate Encoder */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1768 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1769 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1770 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1771 Py_CLEAR(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1772 Py_CLEAR(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1773 Py_CLEAR(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1774 Py_CLEAR(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1775 Py_CLEAR(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1776 Py_CLEAR(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1777 Py_CLEAR(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1778 Py_CLEAR(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1779 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1780 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1781
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1782 PyDoc_STRVAR(encoder_doc, "_iterencode(obj, _current_indent_level) -> iterable");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1783
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1784 static
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1785 PyTypeObject PyEncoderType = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1786 PyVarObject_HEAD_INIT(NULL, 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1787 "_json.Encoder", /* tp_name */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1788 sizeof(PyEncoderObject), /* tp_basicsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1789 0, /* tp_itemsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1790 encoder_dealloc, /* tp_dealloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1791 0, /* tp_print */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1792 0, /* tp_getattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1793 0, /* tp_setattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1794 0, /* tp_compare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1795 0, /* tp_repr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1796 0, /* tp_as_number */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1797 0, /* tp_as_sequence */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1798 0, /* tp_as_mapping */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1799 0, /* tp_hash */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1800 encoder_call, /* tp_call */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1801 0, /* tp_str */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1802 0, /* tp_getattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1803 0, /* tp_setattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1804 0, /* tp_as_buffer */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1805 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1806 encoder_doc, /* tp_doc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1807 encoder_traverse, /* tp_traverse */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1808 encoder_clear, /* tp_clear */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1809 0, /* tp_richcompare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1810 0, /* tp_weaklistoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1811 0, /* tp_iter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1812 0, /* tp_iternext */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1813 0, /* tp_methods */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1814 encoder_members, /* tp_members */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1815 0, /* tp_getset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1816 0, /* tp_base */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1817 0, /* tp_dict */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1818 0, /* tp_descr_get */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1819 0, /* tp_descr_set */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1820 0, /* tp_dictoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1821 encoder_init, /* tp_init */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1822 0, /* tp_alloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1823 encoder_new, /* tp_new */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1824 0, /* tp_free */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1825 };
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1826
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1827 static PyMethodDef speedups_methods[] = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1828 {"encode_basestring_ascii",
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1829 (PyCFunction)py_encode_basestring_ascii,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1830 METH_O,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1831 pydoc_encode_basestring_ascii},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1832 {"scanstring",
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1833 (PyCFunction)py_scanstring,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1834 METH_VARARGS,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1835 pydoc_scanstring},
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1836 {NULL, NULL, 0, NULL}
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1837 };
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1838
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1839 PyDoc_STRVAR(module_doc,
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1840 "json speedups\n");
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1841
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1842 static struct PyModuleDef jsonmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1843 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1844 "_json",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1845 module_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1846 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1847 speedups_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1848 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1849 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1850 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1851 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1852 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1853
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1854 PyObject*
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1855 PyInit__json(void)
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1856 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1857 PyObject *m = PyModule_Create(&jsonmodule);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1858 if (!m)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1859 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1860 PyScannerType.tp_new = PyType_GenericNew;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1861 if (PyType_Ready(&PyScannerType) < 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1862 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1863 PyEncoderType.tp_new = PyType_GenericNew;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1864 if (PyType_Ready(&PyEncoderType) < 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1865 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1866 Py_INCREF((PyObject*)&PyScannerType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1867 if (PyModule_AddObject(m, "make_scanner", (PyObject*)&PyScannerType) < 0) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1868 Py_DECREF((PyObject*)&PyScannerType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1869 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1870 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1871 Py_INCREF((PyObject*)&PyEncoderType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1872 if (PyModule_AddObject(m, "make_encoder", (PyObject*)&PyEncoderType) < 0) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1873 Py_DECREF((PyObject*)&PyEncoderType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1874 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1875 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1876 return m;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1877 fail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1878 Py_DECREF(m);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1879 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1880 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_json.c @ 80272:ec00f8570c55