cpython-lru_cache-weakref: Modules/

annotate Modules/_json.c @ 81343:3a7cd8efc19f

#16852: merge with 3.3.

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Thu, 10 Jan 2013 03:29:45 +0200
parents	4b42d7f288c5
children	ae1a7c420f08

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/_json.c @ 81343:3a7cd8efc19f