cpython-lru_cache-weakref: Modules/

annotate Modules/_json.c @ 84007:dbfbdf2b5c19 3.3

Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted.

author	Senthil Kumaran <senthil@uthcode.com>
date	Sat, 01 Jun 2013 08:27:06 -0700
parents	944e86223d1f
children	8abbdbe86c01 4b42d7f288c5

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 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	177 Py_UCS4 v = c - 0x10000;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	178 c = 0xd800 \| ((v >> 10) & 0x3ff);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	179 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	180 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	181 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	182 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	183 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	184 c = 0xdc00 \| (v & 0x3ff);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	185 output[chars++] = '\\';
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	186 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	187 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	188 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	189 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	190 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	191 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	192 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	193 return chars;
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
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	196 static PyObject *
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	197 ascii_escape_unicode(PyObject *pystr)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	198 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	199 /* 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	200 Py_ssize_t i;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	201 Py_ssize_t input_chars;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	202 Py_ssize_t output_size;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	203 Py_ssize_t chars;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	204 PyObject *rval;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	205 void *input;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	206 unsigned char *output;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	207 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	208
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	209 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	210 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	211
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	212 input_chars = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	213 input = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	214 kind = PyUnicode_KIND(pystr);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	215
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	216 /* Compute the output size */
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	217 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	218 Py_UCS4 c = PyUnicode_READ(kind, input, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	219 if (S_CHAR(c))
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	220 output_size++;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	221 else {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	222 switch(c) {
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	223 case '\\': case '"': case '\b': case '\f':
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	224 case '\n': case '\r': case '\t':
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	225 output_size += 2; break;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	226 default:
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	227 output_size += c >= 0x10000 ? 12 : 6;
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 }
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	230 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	231
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	232 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	233 if (rval == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	234 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	235 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	236 output = PyUnicode_1BYTE_DATA(rval);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	237 chars = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	238 output[chars++] = '"';
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	239 for (i = 0; i < input_chars; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	240 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	241 if (S_CHAR(c)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	242 output[chars++] = c;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	243 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	244 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	245 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	246 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	247 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	248 output[chars++] = '"';
81271 944e86223d1f Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in Christian Heimes <christian@cheimes.de> parents: 80158 diff changeset	249 #ifdef Py_DEBUG
76573 1439e2d1f490 Check newly created consistency using _PyUnicode_CheckConsistency(str, 1) Victor Stinner <victor.stinner@gmail.com> parents: 75876 diff changeset	250 assert(_PyUnicode_CheckConsistency(rval, 1));
81271 944e86223d1f Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in Christian Heimes <christian@cheimes.de> parents: 80158 diff changeset	251 #endif
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	252 return rval;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	253 }
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 static void
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	256 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	257 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	258 /* 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	259 looking ValueError exception */
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	260 static PyObject *errmsg_fn = NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	261 PyObject *pymsg;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	262 if (errmsg_fn == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	263 PyObject *decoder = PyImport_ImportModule("json.decoder");
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	264 if (decoder == NULL)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	265 return;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	266 errmsg_fn = PyObject_GetAttrString(decoder, "errmsg");
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	267 Py_DECREF(decoder);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	268 if (errmsg_fn == NULL)
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	269 return;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	270 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	271 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	272 if (pymsg) {
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	273 PyErr_SetObject(PyExc_ValueError, pymsg);
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	274 Py_DECREF(pymsg);
00e467db6182 merge r66932 and add a few py3k only checks Benjamin Peterson <benjamin@python.org> parents: 48770 diff changeset	275 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	276 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	277
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	278 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	279 _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	280 /* 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	281 PyObject *tpl;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	282 PyObject *pyidx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	283 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	284 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	285 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	286 if (rval == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	287 return NULL;
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	288 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	289 pyidx = PyLong_FromSsize_t(idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	290 if (pyidx == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	291 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	292 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	293 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	294 tpl = PyTuple_New(2);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	295 if (tpl == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	296 Py_DECREF(pyidx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	297 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	298 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	299 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	300 PyTuple_SET_ITEM(tpl, 0, rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	301 PyTuple_SET_ITEM(tpl, 1, pyidx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	302 return tpl;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	303 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	304
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	305 #define APPEND_OLD_CHUNK \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	306 if (chunk != NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	307 if (chunks == NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	308 chunks = PyList_New(0); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	309 if (chunks == NULL) { \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	310 goto bail; \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	311 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	312 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	313 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	314 Py_DECREF(chunk); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	315 goto bail; \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	316 } \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	317 Py_CLEAR(chunk); \
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	318 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	319
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	320 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	321 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	322 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	323 /* Read the JSON string from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	324 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	325 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	326 *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	327 after the end quote
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	328
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	329 Return value is a new PyUnicode
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	330 */
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	331 PyObject *rval = NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	332 Py_ssize_t len;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	333 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	334 Py_ssize_t next /* = begin */;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	335 const void *buf;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	336 int kind;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	337 PyObject *chunks = NULL;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	338 PyObject *chunk = NULL;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	339
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	340 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	341 return 0;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	342
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	343 len = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	344 buf = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	345 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	346
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	347 if (end < 0 \|\| len <= end) {
8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	348 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	349 goto bail;
8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	350 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	351 while (1) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	352 /* 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	353 Py_UCS4 c = 0;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	354 for (next = end; next < len; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	355 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	356 if (c == '"' \|\| c == '\\') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	357 break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	358 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	359 else if (strict && c <= 0x1f) {
48544 8cdb181aa9af Merged revisions 65147 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47580 diff changeset	360 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	361 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	362 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	363 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	364 if (!(c == '"' \|\| c == '\\')) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	365 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	366 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	367 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	368 /* 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	369 if (next != end) {
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	370 APPEND_OLD_CHUNK
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	371 chunk = PyUnicode_FromKindAndData(
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	372 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	373 (char)buf + kind end,
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	374 next - end);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	375 if (chunk == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	376 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	377 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	378 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	379 next++;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	380 if (c == '"') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	381 end = next;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	382 break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	383 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	384 if (next == len) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	385 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	386 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	387 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	388 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	389 if (c != 'u') {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	390 /* Non-unicode backslash escapes */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	391 end = next + 1;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	392 switch (c) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	393 case '"': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	394 case '\\': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	395 case '/': break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	396 case 'b': c = '\b'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	397 case 'f': c = '\f'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	398 case 'n': c = '\n'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	399 case 'r': c = '\r'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	400 case 't': c = '\t'; break;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	401 default: c = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	402 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	403 if (c == 0) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	404 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	405 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	406 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	407 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	408 else {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	409 c = 0;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	410 next++;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	411 end = next + 4;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	412 if (end >= len) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	413 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	414 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	415 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	416 /* Decode 4 hex digits */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	417 for (; next < end; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	418 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	419 c <<= 4;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	420 switch (digit) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	421 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	422 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	423 c \|= (digit - '0'); 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 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	428 case 'F':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	429 c \|= (digit - 'A' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	430 default:
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	431 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	432 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	433 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	434 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	435 /* Surrogate pair */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	436 if ((c & 0xfc00) == 0xd800) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	437 Py_UCS4 c2 = 0;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	438 if (end + 6 >= len) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	439 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	440 goto bail;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	441 }
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	442 if (PyUnicode_READ(kind, buf, next++) != '\\' \|\|
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	443 PyUnicode_READ(kind, buf, next++) != 'u') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	444 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	445 goto bail;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	446 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	447 end += 6;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	448 /* Decode 4 hex digits */
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	449 for (; next < end; next++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	450 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	451 c2 <<= 4;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	452 switch (digit) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	453 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	454 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	455 c2 \|= (digit - '0'); 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 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	460 case 'F':
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	461 c2 \|= (digit - 'A' + 10); break;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	462 default:
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	463 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	464 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	465 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	466 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	467 if ((c2 & 0xfc00) != 0xdc00) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	468 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	469 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	470 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	471 c = 0x10000 + (((c - 0xd800) << 10) \| (c2 - 0xdc00));
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	472 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	473 else if ((c & 0xfc00) == 0xdc00) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	474 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	475 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	476 }
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	477 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	478 APPEND_OLD_CHUNK
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	479 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	480 if (chunk == NULL) {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	481 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	482 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	483 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	484
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	485 if (chunks == NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	486 if (chunk != NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	487 rval = chunk;
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 rval = PyUnicode_FromStringAndSize("", 0);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	490 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	491 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	492 APPEND_OLD_CHUNK
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	493 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	494 if (rval == NULL) {
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	495 goto bail;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	496 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	497 Py_CLEAR(chunks);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	498 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	499
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	500 *next_end_ptr = end;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	501 return rval;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	502 bail:
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	503 *next_end_ptr = -1;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	504 Py_XDECREF(chunks);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	505 Py_XDECREF(chunk);
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	506 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	507 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	508
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	509 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	510 "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	511 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	512 "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	513 "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	514 "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	515 "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	516 "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	517 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	518 "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	519 "after the end quote."
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	520 );
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 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	523 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	524 {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	525 PyObject *pystr;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	526 PyObject *rval;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	527 Py_ssize_t end;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	528 Py_ssize_t next_end = -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	529 int strict = 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	530 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	531 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	532 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	533 if (PyUnicode_Check(pystr)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	534 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	535 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	536 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	537 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	538 "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	539 Py_TYPE(pystr)->tp_name);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	540 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	541 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	542 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	543 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	544
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	545 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	546 "encode_basestring_ascii(string) -> string\n"
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	547 "\n"
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	548 "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	549 );
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 static PyObject *
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	552 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	553 {
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	554 PyObject *rval;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	555 /* 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	556 /* METH_O */
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	557 if (PyUnicode_Check(pystr)) {
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	558 rval = ascii_escape_unicode(pystr);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	559 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	560 else {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	561 PyErr_Format(PyExc_TypeError,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	562 "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	563 Py_TYPE(pystr)->tp_name);
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	564 return NULL;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	565 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	566 return rval;
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	567 }
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	568
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	569 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	570 scanner_dealloc(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	571 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	572 /* Deallocate scanner object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	573 scanner_clear(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	574 Py_TYPE(self)->tp_free(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	575 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	578 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	579 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	580 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	581 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	582 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	583 Py_VISIT(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	584 Py_VISIT(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	585 Py_VISIT(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	586 Py_VISIT(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	587 Py_VISIT(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	588 Py_VISIT(s->parse_constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	589 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	590 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	593 scanner_clear(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	594 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	595 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	596 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	597 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	598 Py_CLEAR(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	599 Py_CLEAR(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	600 Py_CLEAR(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	601 Py_CLEAR(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	602 Py_CLEAR(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	603 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	604 Py_CLEAR(s->memo);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	605 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	606 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	607
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	608 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	609 _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	610 /* Read a JSON object from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	611 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	612 *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	613 the closing curly brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	614
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	615 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	616 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	617 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	618 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	619 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	620 PyObject *val = NULL;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	621 PyObject *rval = NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	622 PyObject *key = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	623 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	624 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	625 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	626
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	627 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	628 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	629
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	630 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	631 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	632 end_idx = PyUnicode_GET_LENGTH(pystr) - 1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	633
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	634 if (has_pairs_hook)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	635 rval = PyList_New(0);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	636 else
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	637 rval = PyDict_New();
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	638 if (rval == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	639 return NULL;
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 /* skip whitespace after { */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	642 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	643
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	644 /* 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	645 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	646 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	647 PyObject *memokey;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	648
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	649 /* read key */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	650 if (PyUnicode_READ(kind, str, idx) != '"') {
77840 9854520c8200 Issue #5067: improve some json error messages. Antoine Pitrou <solipsis@pitrou.net> parents: 70022 diff changeset	651 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	652 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	653 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	654 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	655 if (key == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	656 goto bail;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	657 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	658 if (memokey != NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	659 Py_INCREF(memokey);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	660 Py_DECREF(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	661 key = memokey;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	662 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	663 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	664 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	665 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	666 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	667 idx = next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	668
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	669 /* 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	670 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	671 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	672 raise_errmsg("Expecting ':' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	673 goto bail;
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 idx++;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	676 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	677
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	678 /* read any JSON term */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	679 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	680 if (val == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	681 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	682
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	683 if (has_pairs_hook) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	684 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	685 if (item == NULL)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	686 goto bail;
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	687 Py_CLEAR(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	688 Py_CLEAR(val);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	689 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	690 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	691 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	692 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	693 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	694 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	695 else {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	696 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	697 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	698 Py_CLEAR(key);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	699 Py_CLEAR(val);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	700 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	701 idx = next_idx;
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 /* skip whitespace before } or , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	704 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	705
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	706 /* 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	707 if (idx > end_idx) break;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	708 if (PyUnicode_READ(kind, str, idx) == '}') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	709 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	710 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	711 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	712 raise_errmsg("Expecting ',' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	713 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	714 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	715 idx++;
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 /* skip whitespace after , delimiter */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	718 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	719 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	720 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	721
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	722 /* 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	723 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	724 raise_errmsg("Expecting object", pystr, end_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	725 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	726 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	727
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	728 *next_idx_ptr = idx + 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	729
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	730 if (has_pairs_hook) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	731 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	732 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	733 return val;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	734 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	735
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	736 /* 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	737 if (s->object_hook != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	738 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	739 Py_DECREF(rval);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	740 return val;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	741 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	742 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	743 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	744 Py_XDECREF(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	745 Py_XDECREF(val);
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	746 Py_XDECREF(rval);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	747 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	748 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	749
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	750 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	751 _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	752 /* Read a JSON array from PyString pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	753 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	754 *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	755 the closing brace.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	756
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	757 Returns a new PyList
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	758 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	759 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	760 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	761 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	762 PyObject *val = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	763 PyObject *rval = PyList_New(0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	764 Py_ssize_t next_idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	765 if (rval == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	766 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	767
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	768 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	769 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	770
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	771 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	772 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	773 end_idx = PyUnicode_GET_LENGTH(pystr) - 1;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	774
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	775 /* skip whitespace after [ */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	776 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	777
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	778 /* 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	779 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	780 while (idx <= end_idx) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	781
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	782 /* read any JSON term */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	783 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	784 if (val == NULL)
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 if (PyList_Append(rval, val) == -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	788 goto bail;
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 Py_CLEAR(val);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	791 idx = next_idx;
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 /* skip whitespace between term and , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	794 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	795
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	796 /* 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	797 if (idx > end_idx) break;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	798 if (PyUnicode_READ(kind, str, idx) == ']') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	799 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	800 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	801 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	802 raise_errmsg("Expecting ',' delimiter", pystr, idx);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	803 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	804 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	805 idx++;
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 /* skip whitespace after , */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	808 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	809 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	810 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	811
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	812 /* 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	813 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	814 raise_errmsg("Expecting object", pystr, end_idx);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	815 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	816 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	817 *next_idx_ptr = idx + 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	818 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	819 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	820 Py_XDECREF(val);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	821 Py_DECREF(rval);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	822 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	823 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	824
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	825 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	826 _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	827 /* Read a JSON constant from PyString pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	828 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	829 ("NaN", "Infinity", "-Infinity").
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	830 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	831 *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	832 the constant.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	833
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	834 Returns the result of parse_constant
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	835 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	836 PyObject *cstr;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	837 PyObject *rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	838 /* constant is "NaN", "Infinity", or "-Infinity" */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	839 cstr = PyUnicode_InternFromString(constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	840 if (cstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	841 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	842
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	843 /* rval = parse_constant(constant) */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	844 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	845 idx += PyUnicode_GET_LENGTH(cstr);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	846 Py_DECREF(cstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	847 *next_idx_ptr = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	848 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	849 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	850
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	851 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	852 _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	853 /* Read a JSON number from PyUnicode pystr.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	854 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	855 *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	856 the number.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	857
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	858 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	859 PyInt, PyLong, or PyFloat.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	860 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	861 */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	862 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	863 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	864 Py_ssize_t end_idx;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	865 Py_ssize_t idx = start;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	866 int is_float = 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	867 PyObject *rval;
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	868 PyObject *numstr = NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	869 PyObject *custom_func;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	870
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	871 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	872 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	873
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	874 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	875 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	876 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	877
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	878 /* 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	879 if (PyUnicode_READ(kind, str, idx) == '-') {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	880 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	881 if (idx > end_idx) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	882 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	883 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	884 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	885 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	886
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	887 /* 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	888 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	889 idx++;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	890 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	891 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	892 /* 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	893 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	894 idx++;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	895 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	896 /* no integer digits, error */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	897 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	898 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	899 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	900 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	901
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	902 /* 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	903 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	904 is_float = 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	905 idx += 2;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	906 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	907 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	908
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	909 /* 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	910 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	911 Py_ssize_t e_start = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	912 idx++;
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 an exponent sign if present */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	915 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	916
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	917 /* read all digits */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	918 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	919
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	920 /* 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	921 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	922 is_float = 1;
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 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	925 idx = e_start;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	926 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	927 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	928
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	929 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	930 custom_func = s->parse_float;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	931 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	932 custom_func = s->parse_int;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	933 else
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	934 custom_func = NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	935
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	936 if (custom_func) {
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	937 /* 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	938 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	939 (char)str + kind start,
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	940 idx - start);
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	941 if (numstr == NULL)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	942 return NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	943 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	944 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	945 else {
69552 d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	946 Py_ssize_t i, n;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	947 char *buf;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	948 /* 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	949 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	950 n = idx - start;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	951 numstr = PyBytes_FromStringAndSize(NULL, n);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	952 if (numstr == NULL)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	953 return NULL;
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	954 buf = PyBytes_AS_STRING(numstr);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	955 for (i = 0; i < n; i++) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	956 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	957 }
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	958 if (is_float)
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	959 rval = PyFloat_FromString(numstr);
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	960 else
d60f9d9983bb Issue #11856: Speed up parsing of JSON numbers. Antoine Pitrou <solipsis@pitrou.net> parents: 68258 diff changeset	961 rval = PyLong_FromString(buf, NULL, 10);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	962 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	963 Py_DECREF(numstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	964 *next_idx_ptr = idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	965 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	966 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	969 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	970 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	971 /* 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	972 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	973 *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	974 the number.
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	975
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	976 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	977 */
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	978 PyObject *res;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	979 void *str;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	980 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	981 Py_ssize_t length;
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 if (PyUnicode_READY(pystr) == -1)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	984 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	985
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	986 str = PyUnicode_DATA(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	987 kind = PyUnicode_KIND(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	988 length = PyUnicode_GET_LENGTH(pystr);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	989
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	990 if (idx >= length) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	991 PyErr_SetNone(PyExc_StopIteration);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	992 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	993 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	994
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	995 switch (PyUnicode_READ(kind, str, idx)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	996 case '"':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	997 /* string */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	998 return scanstring_unicode(pystr, idx + 1,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	999 PyObject_IsTrue(s->strict),
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1000 next_idx_ptr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1001 case '{':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1002 /* 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	1003 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	1004 "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	1005 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	1006 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	1007 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	1008 return res;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1009 case '[':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1010 /* 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	1011 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	1012 "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	1013 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	1014 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	1015 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	1016 return res;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1017 case 'n':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1018 /* null */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1019 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	1020 Py_INCREF(Py_None);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1021 *next_idx_ptr = idx + 4;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1022 return Py_None;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1023 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1024 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1025 case 't':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1026 /* true */
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1027 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	1028 Py_INCREF(Py_True);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1029 *next_idx_ptr = idx + 4;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1030 return Py_True;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1031 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1032 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1033 case 'f':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1034 /* false */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1035 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	1036 PyUnicode_READ(kind, str, idx + 2) == 'l' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1037 PyUnicode_READ(kind, str, idx + 3) == 's' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1038 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	1039 Py_INCREF(Py_False);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1040 *next_idx_ptr = idx + 5;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1041 return Py_False;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1042 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1043 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1044 case 'N':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1045 /* NaN */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1046 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	1047 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	1048 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	1049 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1050 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1051 case 'I':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1052 /* Infinity */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1053 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	1054 PyUnicode_READ(kind, str, idx + 2) == 'f' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1055 PyUnicode_READ(kind, str, idx + 3) == 'i' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1056 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	1057 PyUnicode_READ(kind, str, idx + 5) == 'i' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1058 PyUnicode_READ(kind, str, idx + 6) == 't' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1059 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	1060 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	1061 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1062 break;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1063 case '-':
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1064 /* -Infinity */
72864 dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1065 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	1066 PyUnicode_READ(kind, str, idx + 2) == 'n' &&
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1067 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	1068 PyUnicode_READ(kind, str, idx + 4) == 'i' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1069 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	1070 PyUnicode_READ(kind, str, idx + 6) == 'i' &&
dbfd77c15051 Strip trailing spaces in _json.c Victor Stinner <victor.stinner@haypocalc.com> parents: 72863 diff changeset	1071 PyUnicode_READ(kind, str, idx + 7) == 't' &&
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71977 diff changeset	1072 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	1073 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	1074 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1075 break;
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 /* 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	1078 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	1079 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1082 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	1083 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1084 /* 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	1085 PyObject *pystr;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1086 PyObject *rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1087 Py_ssize_t idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1088 Py_ssize_t next_idx = -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1089 static char *kwlist[] = {"string", "idx", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1090 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1091 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1092 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1093 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	1094 return NULL;
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 if (PyUnicode_Check(pystr)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1097 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	1098 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1099 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1100 PyErr_Format(PyExc_TypeError,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1101 "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	1102 Py_TYPE(pystr)->tp_name);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1103 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1104 }
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1105 PyDict_Clear(s->memo);
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1106 if (rval == NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1107 return NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1108 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	1109 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1112 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	1113 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1114 PyScannerObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1115 s = (PyScannerObject *)type->tp_alloc(type, 0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1116 if (s != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1117 s->strict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1118 s->object_hook = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1119 s->object_pairs_hook = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1120 s->parse_float = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1121 s->parse_int = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1122 s->parse_constant = NULL;
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 return (PyObject *)s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1125 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1128 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	1129 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1130 /* Initialize Scanner object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1131 PyObject *ctx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1132 static char *kwlist[] = {"context", NULL};
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1133 PyScannerObject *s;
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 assert(PyScanner_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1136 s = (PyScannerObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1137
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1138 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	1139 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1140
64443 c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1141 if (s->memo == NULL) {
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1142 s->memo = PyDict_New();
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1143 if (s->memo == NULL)
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1144 goto bail;
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1145 }
c3ad883b940b Issue #7451: Improve decoding performance of JSON objects, and reduce Antoine Pitrou <solipsis@pitrou.net> parents: 63575 diff changeset	1146
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1147 /* 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	1148 s->strict = PyObject_GetAttrString(ctx, "strict");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1149 if (s->strict == 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_hook = PyObject_GetAttrString(ctx, "object_hook");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1152 if (s->object_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->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	1155 if (s->object_pairs_hook == 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_float = PyObject_GetAttrString(ctx, "parse_float");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1158 if (s->parse_float == 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_int = PyObject_GetAttrString(ctx, "parse_int");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1161 if (s->parse_int == 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 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	1164 if (s->parse_constant == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1165 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1166
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1167 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1168
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1169 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1170 Py_CLEAR(s->strict);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1171 Py_CLEAR(s->object_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1172 Py_CLEAR(s->object_pairs_hook);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1173 Py_CLEAR(s->parse_float);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1174 Py_CLEAR(s->parse_int);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1175 Py_CLEAR(s->parse_constant);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1176 return -1;
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
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1179 PyDoc_STRVAR(scanner_doc, "JSON scanner object");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1180
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1181 static
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1182 PyTypeObject PyScannerType = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1183 PyVarObject_HEAD_INIT(NULL, 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1184 "_json.Scanner", /* tp_name */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1185 sizeof(PyScannerObject), /* tp_basicsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1186 0, /* tp_itemsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1187 scanner_dealloc, /* tp_dealloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1188 0, /* tp_print */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1189 0, /* tp_getattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1190 0, /* tp_setattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1191 0, /* tp_compare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1192 0, /* tp_repr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1193 0, /* tp_as_number */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1194 0, /* tp_as_sequence */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1195 0, /* tp_as_mapping */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1196 0, /* tp_hash */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1197 scanner_call, /* tp_call */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1198 0, /* tp_str */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1199 0,/* PyObject_GenericGetAttr, / / tp_getattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1200 0,/* PyObject_GenericSetAttr, / / tp_setattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1201 0, /* tp_as_buffer */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1202 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	1203 scanner_doc, /* tp_doc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1204 scanner_traverse, /* tp_traverse */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1205 scanner_clear, /* tp_clear */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1206 0, /* tp_richcompare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1207 0, /* tp_weaklistoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1208 0, /* tp_iter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1209 0, /* tp_iternext */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1210 0, /* tp_methods */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1211 scanner_members, /* tp_members */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1212 0, /* tp_getset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1213 0, /* tp_base */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1214 0, /* tp_dict */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1215 0, /* tp_descr_get */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1216 0, /* tp_descr_set */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1217 0, /* tp_dictoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1218 scanner_init, /* tp_init */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1219 0,/* PyType_GenericAlloc, / / tp_alloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1220 scanner_new, /* tp_new */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1221 0,/* PyObject_GC_Del, / / tp_free */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1222 };
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1225 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	1226 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1227 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1228 s = (PyEncoderObject *)type->tp_alloc(type, 0);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1229 if (s != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1230 s->markers = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1231 s->defaultfn = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1232 s->encoder = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1233 s->indent = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1234 s->key_separator = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1235 s->item_separator = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1236 s->sort_keys = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1237 s->skipkeys = NULL;
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 return (PyObject *)s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1240 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1243 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	1244 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1245 /* initialize Encoder object */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1246 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	1247
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1248 PyEncoderObject *s;
57610 6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1249 PyObject markers, defaultfn, encoder, indent, *key_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1250 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	1251
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1252 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1253 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1254
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1255 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	1256 &markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator,
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1257 &sort_keys, &skipkeys, &allow_nan))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1258 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1259
57610 6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1260 s->markers = markers;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1261 s->defaultfn = defaultfn;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1262 s->encoder = encoder;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1263 s->indent = indent;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1264 s->key_separator = key_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1265 s->item_separator = item_separator;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1266 s->sort_keys = sort_keys;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1267 s->skipkeys = skipkeys;
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1268 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	1269 s->allow_nan = PyObject_IsTrue(allow_nan);
6efb46c2b3c3 Merged revisions 76710 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54374 diff changeset	1270
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1271 Py_INCREF(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1272 Py_INCREF(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1273 Py_INCREF(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1274 Py_INCREF(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1275 Py_INCREF(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1276 Py_INCREF(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1277 Py_INCREF(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1278 Py_INCREF(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1279 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1280 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1283 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	1284 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1285 /* Python callable interface to encode_listencode_obj */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1286 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	1287 PyObject *obj;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1288 Py_ssize_t indent_level;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1289 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	1290 _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	1291
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1292 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1293 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1294 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	1295 &obj, _convertPyInt_AsSsize_t, &indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1296 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	1297 if (_PyAccu_Init(&acc))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1298 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	1299 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	1300 _PyAccu_Destroy(&acc);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1301 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1302 }
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1303 return _PyAccu_FinishAsList(&acc);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1304 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1307 _encoded_const(PyObject *obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1308 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1309 /* 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	1310 if (obj == Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1311 static PyObject *s_null = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1312 if (s_null == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1313 s_null = PyUnicode_InternFromString("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 Py_INCREF(s_null);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1316 return s_null;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1317 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1318 else if (obj == Py_True) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1319 static PyObject *s_true = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1320 if (s_true == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1321 s_true = PyUnicode_InternFromString("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 Py_INCREF(s_true);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1324 return s_true;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1325 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1326 else if (obj == Py_False) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1327 static PyObject *s_false = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1328 if (s_false == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1329 s_false = PyUnicode_InternFromString("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 Py_INCREF(s_false);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1332 return s_false;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1333 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1334 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1335 PyErr_SetString(PyExc_ValueError, "not a const");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1336 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1337 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1338 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1341 encoder_encode_float(PyEncoderObject s, PyObject obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1342 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1343 /* Return the JSON representation of a PyFloat */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1344 double i = PyFloat_AS_DOUBLE(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1345 if (!Py_IS_FINITE(i)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1346 if (!s->allow_nan) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1347 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	1348 return NULL;
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 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 if (i < 0) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1354 return PyUnicode_FromString("-Infinity");
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 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1357 return PyUnicode_FromString("NaN");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1358 }
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 /* Use a better float format here? */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1361 return PyObject_Repr(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1362 }
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 static PyObject *
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1365 encoder_encode_string(PyEncoderObject s, PyObject obj)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1366 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1367 /* Return the JSON representation of a string */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1368 if (s->fast_encode)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1369 return py_encode_basestring_ascii(NULL, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1370 else
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1371 return PyObject_CallFunctionObjArgs(s->encoder, obj, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1372 }
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 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	1375 _steal_accumulate(_PyAccu acc, PyObject stolen)
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1376 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1377 /* 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	1378 int rval = _PyAccu_Accumulate(acc, stolen);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1379 Py_DECREF(stolen);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1380 return rval;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1381 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1382
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1383 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	1384 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	1385 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	1386 {
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	1387 /* 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	1388 PyObject *newobj;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1389 int rv;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1390
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1391 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	1392 PyObject *cstr = _encoded_const(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1393 if (cstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1394 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	1395 return _steal_accumulate(acc, cstr);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1396 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1397 else if (PyUnicode_Check(obj))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1398 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1399 PyObject *encoded = encoder_encode_string(s, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1400 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1401 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	1402 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1403 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1404 else if (PyLong_Check(obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1405 PyObject *encoded = PyObject_Str(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1406 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1407 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	1408 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1409 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1410 else if (PyFloat_Check(obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1411 PyObject *encoded = encoder_encode_float(s, obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1412 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1413 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	1414 return _steal_accumulate(acc, encoded);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1415 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1416 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	1417 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	1418 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	1419 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	1420 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	1421 return rv;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1422 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1423 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	1424 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	1425 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	1426 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	1427 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	1428 return rv;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1429 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1430 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1431 PyObject *ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1432 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1433 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1434 ident = PyLong_FromVoidPtr(obj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1435 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1436 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1437 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1438 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1439 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1440 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1441 Py_DECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1442 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1443 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1444 if (PyDict_SetItem(s->markers, ident, obj)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1445 Py_DECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1446 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1447 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1448 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1449 newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1450 if (newobj == NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1451 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1452 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1453 }
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	1454
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 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	1456 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	1457 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	1458 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	1459
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1460 Py_DECREF(newobj);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1461 if (rv) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1462 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1463 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1464 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1465 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1466 if (PyDict_DelItem(s->markers, ident)) {
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 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1469 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1470 Py_XDECREF(ident);
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 return rv;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1473 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1474 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1475
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1476 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	1477 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	1478 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	1479 {
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	1480 /* 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	1481 static PyObject *open_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1482 static PyObject *close_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1483 static PyObject *empty_dict = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1484 PyObject *kstr = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1485 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	1486 PyObject *it = NULL;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1487 PyObject *items;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1488 PyObject *item = NULL;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1489 int skipkeys;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1490 Py_ssize_t idx;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1491
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1492 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	1493 open_dict = PyUnicode_InternFromString("{");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1494 close_dict = PyUnicode_InternFromString("}");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1495 empty_dict = PyUnicode_InternFromString("{}");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1496 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	1497 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1498 }
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1499 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	1500 return _PyAccu_Accumulate(acc, empty_dict);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1501
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1502 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1503 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1504 ident = PyLong_FromVoidPtr(dct);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1505 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1506 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1507 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1508 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1509 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1510 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
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 if (PyDict_SetItem(s->markers, ident, dct)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1514 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1515 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1516 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1517
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1518 if (_PyAccu_Accumulate(acc, open_dict))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1519 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1520
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1521 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1522 /* TODO: DOES NOT RUN */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1523 indent_level += 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1524 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1525 newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1526 separator = _item_separator + newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1527 buf += newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1528 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1529 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1530
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1531 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	1532 /* 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	1533 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	1534 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	1535 if (items == NULL)
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1536 goto bail;
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1537 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	1538 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	1539 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1540 }
65939 6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1541 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	1542 goto bail;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1543 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	1544 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	1545 PyObject key, value;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1546 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	1547 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	1548 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	1549 if (item == NULL)
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1550 goto bail;
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1551 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	1552 Py_DECREF(key);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1553 }
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 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	1556 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	1557 }
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1558 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	1559 goto bail;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1560 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	1561 Py_DECREF(items);
6631e5f6d2ce Issue #10314: improve performance of JSON encoding with sort_keys=True Antoine Pitrou <solipsis@pitrou.net> parents: 65195 diff changeset	1562 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	1563 goto bail;
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1564 skipkeys = PyObject_IsTrue(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1565 idx = 0;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1566 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	1567 PyObject encoded, key, *value;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1568 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	1569 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	1570 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1571 }
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1572 key = PyTuple_GET_ITEM(item, 0);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1573 if (PyUnicode_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1574 Py_INCREF(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1575 kstr = key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1576 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1577 else if (PyFloat_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1578 kstr = encoder_encode_float(s, key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1579 if (kstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1580 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1581 }
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1582 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	1583 /* 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	1584 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	1585 kstr = _encoded_const(key);
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1586 if (kstr == NULL)
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1587 goto bail;
22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1588 }
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1589 else if (PyLong_Check(key)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1590 kstr = PyObject_Str(key);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1591 if (kstr == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1592 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1593 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1594 else if (skipkeys) {
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1595 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1596 continue;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1597 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1598 else {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1599 /* 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	1600 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	1601 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1602 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1603
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1604 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	1605 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	1606 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1607 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1608
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1609 encoded = encoder_encode_string(s, kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1610 Py_CLEAR(kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1611 if (encoded == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1612 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	1613 if (_PyAccu_Accumulate(acc, encoded)) {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1614 Py_DECREF(encoded);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1615 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1616 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1617 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	1618 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	1619 goto bail;
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1620
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1621 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	1622 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	1623 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1624 idx += 1;
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1625 Py_DECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1626 }
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1627 if (PyErr_Occurred())
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1628 goto bail;
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1629 Py_CLEAR(it);
1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1630
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1631 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1632 if (PyDict_DelItem(s->markers, ident))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1633 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1634 Py_CLEAR(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1635 }
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1636 /* TODO DOES NOT RUN; dead code
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1637 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1638 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	1639
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1640 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	1641 }*/
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1642 if (_PyAccu_Accumulate(acc, close_dict))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1643 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1644 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1645
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1646 bail:
54371 1c078bbca233 Issue 6105: json encoder to respect iteration order of its inputs. Raymond Hettinger <python@rcn.com> parents: 53769 diff changeset	1647 Py_XDECREF(it);
54373 22fd967518ee * Fix-up a TODO (support the sort_key option). Raymond Hettinger <python@rcn.com> parents: 54371 diff changeset	1648 Py_XDECREF(item);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1649 Py_XDECREF(kstr);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1650 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1651 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1652 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1653
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1654
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1655 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	1656 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	1657 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	1658 {
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	1659 /* 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	1660 static PyObject *open_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1661 static PyObject *close_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1662 static PyObject *empty_array = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1663 PyObject *ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1664 PyObject *s_fast = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1665 Py_ssize_t i;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1666
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1667 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	1668 open_array = PyUnicode_InternFromString("[");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1669 close_array = PyUnicode_InternFromString("]");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1670 empty_array = PyUnicode_InternFromString("[]");
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1671 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	1672 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1673 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1674 ident = NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1675 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	1676 if (s_fast == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1677 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	1678 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	1679 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	1680 return _PyAccu_Accumulate(acc, empty_array);
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1681 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1682
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1683 if (s->markers != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1684 int has_key;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1685 ident = PyLong_FromVoidPtr(seq);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1686 if (ident == NULL)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1687 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1688 has_key = PyDict_Contains(s->markers, ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1689 if (has_key) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1690 if (has_key != -1)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1691 PyErr_SetString(PyExc_ValueError, "Circular reference detected");
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 if (PyDict_SetItem(s->markers, ident, seq)) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1695 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1696 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1697 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1698
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1699 if (_PyAccu_Accumulate(acc, open_array))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1700 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1701 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1702 /* TODO: DOES NOT RUN */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1703 indent_level += 1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1704 /*
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1705 newline_indent = '\n' + (' ' * (_indent * _current_indent_level))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1706 separator = _item_separator + newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1707 buf += newline_indent
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1708 */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1709 }
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	1710 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	1711 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	1712 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	1713 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	1714 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1715 }
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	1716 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	1717 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1718 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1719 if (ident != NULL) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1720 if (PyDict_DelItem(s->markers, ident))
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1721 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1722 Py_CLEAR(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1723 }
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1724
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1725 /* TODO: DOES NOT RUN
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1726 if (s->indent != Py_None) {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1727 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	1728
e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 65939 diff changeset	1729 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	1730 }*/
72757 e685b02ddcac Remove now duplicate code in _json.c; instead, reuse the new private lib Antoine Pitrou <solipsis@pitrou.net> parents: 72475 diff changeset	1731 if (_PyAccu_Accumulate(acc, close_array))
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1732 goto bail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1733 Py_DECREF(s_fast);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1734 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1735
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1736 bail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1737 Py_XDECREF(ident);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1738 Py_DECREF(s_fast);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1739 return -1;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1740 }
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 static void
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1743 encoder_dealloc(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1744 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1745 /* Deallocate Encoder */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1746 encoder_clear(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1747 Py_TYPE(self)->tp_free(self);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1748 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1751 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	1752 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1753 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1754 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1755 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1756 Py_VISIT(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1757 Py_VISIT(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1758 Py_VISIT(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1759 Py_VISIT(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1760 Py_VISIT(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1761 Py_VISIT(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1762 Py_VISIT(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1763 Py_VISIT(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1764 return 0;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1765 }
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 static int
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1768 encoder_clear(PyObject *self)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1769 {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1770 /* Deallocate Encoder */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1771 PyEncoderObject *s;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1772 assert(PyEncoder_Check(self));
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1773 s = (PyEncoderObject *)self;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1774 Py_CLEAR(s->markers);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1775 Py_CLEAR(s->defaultfn);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1776 Py_CLEAR(s->encoder);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1777 Py_CLEAR(s->indent);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1778 Py_CLEAR(s->key_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1779 Py_CLEAR(s->item_separator);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1780 Py_CLEAR(s->sort_keys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1781 Py_CLEAR(s->skipkeys);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1782 return 0;
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
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1785 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	1786
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1787 static
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1788 PyTypeObject PyEncoderType = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1789 PyVarObject_HEAD_INIT(NULL, 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1790 "_json.Encoder", /* tp_name */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1791 sizeof(PyEncoderObject), /* tp_basicsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1792 0, /* tp_itemsize */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1793 encoder_dealloc, /* tp_dealloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1794 0, /* tp_print */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1795 0, /* tp_getattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1796 0, /* tp_setattr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1797 0, /* tp_compare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1798 0, /* tp_repr */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1799 0, /* tp_as_number */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1800 0, /* tp_as_sequence */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1801 0, /* tp_as_mapping */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1802 0, /* tp_hash */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1803 encoder_call, /* tp_call */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1804 0, /* tp_str */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1805 0, /* tp_getattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1806 0, /* tp_setattro */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1807 0, /* tp_as_buffer */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1808 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	1809 encoder_doc, /* tp_doc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1810 encoder_traverse, /* tp_traverse */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1811 encoder_clear, /* tp_clear */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1812 0, /* tp_richcompare */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1813 0, /* tp_weaklistoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1814 0, /* tp_iter */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1815 0, /* tp_iternext */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1816 0, /* tp_methods */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1817 encoder_members, /* tp_members */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1818 0, /* tp_getset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1819 0, /* tp_base */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1820 0, /* tp_dict */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1821 0, /* tp_descr_get */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1822 0, /* tp_descr_set */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1823 0, /* tp_dictoffset */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1824 encoder_init, /* tp_init */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1825 0, /* tp_alloc */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1826 encoder_new, /* tp_new */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1827 0, /* tp_free */
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1828 };
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1829
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1830 static PyMethodDef speedups_methods[] = {
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1831 {"encode_basestring_ascii",
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1832 (PyCFunction)py_encode_basestring_ascii,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1833 METH_O,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1834 pydoc_encode_basestring_ascii},
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1835 {"scanstring",
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1836 (PyCFunction)py_scanstring,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1837 METH_VARARGS,
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1838 pydoc_scanstring},
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1839 {NULL, NULL, 0, NULL}
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1840 };
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1841
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1842 PyDoc_STRVAR(module_doc,
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1843 "json speedups\n");
9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1844
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1845 static struct PyModuleDef jsonmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1846 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1847 "_json",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1848 module_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1849 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1850 speedups_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1851 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1852 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1853 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57610 diff changeset	1854 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1855 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1856
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1857 PyObject*
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1858 PyInit__json(void)
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1859 {
53667 f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1860 PyObject *m = PyModule_Create(&jsonmodule);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1861 if (!m)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1862 return NULL;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1863 PyScannerType.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(&PyScannerType) < 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 PyEncoderType.tp_new = PyType_GenericNew;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1867 if (PyType_Ready(&PyEncoderType) < 0)
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1868 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1869 Py_INCREF((PyObject*)&PyScannerType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1870 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	1871 Py_DECREF((PyObject*)&PyScannerType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1872 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1873 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1874 Py_INCREF((PyObject*)&PyEncoderType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1875 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	1876 Py_DECREF((PyObject*)&PyEncoderType);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1877 goto fail;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1878 }
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1879 return m;
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1880 fail:
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1881 Py_DECREF(m);
f686aced02a3 port simplejson upgrade from the trunk #4136 Benjamin Peterson <benjamin@python.org> parents: 49531 diff changeset	1882 return NULL;
46737 9f45979558a9 Merged revisions 62734,62736,62748,62769 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1883 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_json.c @ 84007:dbfbdf2b5c19 3.3