[ViewVC] Diff of: cvs/JSON-XS/XS.xs

Comparing JSON-XS/XS.xs (file contents):
Revision 1.74 by root, Wed Mar 19 15:17:53 2008 UTC vs.
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC

…		…
4		4
5	#include <assert.h>	5	#include <assert.h>
6	#include <string.h>	6	#include <string.h>
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
		9	#include <limits.h>
9	#include <float.h>	10	#include <float.h>
10		11
11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
12	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
13	#endif	14	#endif
…		…
15	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
16	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarentees, though. if it breaks, you get to keep the pieces.
17	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
18	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
19	#endif	20	#endif
		21
		22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
20		23
21	#define F_ASCII 0x00000001UL	24	#define F_ASCII 0x00000001UL
22	#define F_LATIN1 0x00000002UL	25	#define F_LATIN1 0x00000002UL
23	#define F_UTF8 0x00000004UL	26	#define F_UTF8 0x00000004UL
24	#define F_INDENT 0x00000008UL	27	#define F_INDENT 0x00000008UL
…		…
28	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
29	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
30	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
31	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
32	#define F_RELAXED 0x00001000UL	35	#define F_RELAXED 0x00001000UL
33		36	#define F_ALLOW_UNKNOWN 0x00002000UL
34	#define F_MAXDEPTH 0xf8000000UL
35	#define S_MAXDEPTH 27
36	#define F_MAXSIZE 0x01f00000UL
37	#define S_MAXSIZE 20
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		38
40	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
44	#define F_DEFAULT (9UL << S_MAXDEPTH)
45		40
46	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
47	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
48		43
49	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	44	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
…		…
64		59
65	#define IN_RANGE_INC(type,val,beg,end) \	60	#define IN_RANGE_INC(type,val,beg,end) \
66	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	61	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
67	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	62	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
68		63
		64	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		65
69	#ifdef USE_ITHREADS	66	#ifdef USE_ITHREADS
70	# define JSON_SLOW 1	67	# define JSON_SLOW 1
71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	68	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
72	#else	69	#else
73	# define JSON_SLOW 0	70	# define JSON_SLOW 0
…		…
75	#endif	72	#endif
76		73
77	static HV json_stash, json_boolean_stash; // JSON::XS::	74	static HV json_stash, json_boolean_stash; // JSON::XS::
78	static SV json_true, json_false;	75	static SV json_true, json_false;
79		76
		77	enum {
		78	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		79	INCR_M_STR, // inside string
		80	INCR_M_BS, // inside backslash
		81	INCR_M_JSON // outside anything, count nesting
		82	};
		83
		84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		85
80	typedef struct {	86	typedef struct {
81	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
82	SV *cb_object;	91	SV *cb_object;
83	HV *cb_sk_object;	92	HV *cb_sk_object;
		93
		94	// for the incremental parser
		95	SV *incr_text; // the source text so far
		96	STRLEN incr_pos; // the current offset into the text
		97	int incr_nest; // {[]}-nesting level
		98	unsigned char incr_mode;
84	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
85		107
86	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
87	// utility functions	109	// utility functions
88		110
		111	INLINE SV *
		112	get_bool (const char *name)
		113	{
		114	SV *sv = get_sv (name, 1);
		115
		116	SvREADONLY_on (sv);
		117	SvREADONLY_on (SvRV (sv));
		118
		119	return sv;
		120	}
		121
89	INLINE void	122	INLINE void
90	shrink (SV *sv)	123	shrink (SV *sv)
91	{	124	{
92	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
93	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
94	{	128	{
95	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
96	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
97	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
152	char *cur; // SvPVX (sv) + current output position	186	char *cur; // SvPVX (sv) + current output position
153	char *end; // SvEND (sv)	187	char *end; // SvEND (sv)
154	SV *sv; // result scalar	188	SV *sv; // result scalar
155	JSON json;	189	JSON json;
156	U32 indent; // indentation level	190	U32 indent; // indentation level
157	U32 maxdepth; // max. indentation/recursion level
158	UV limit; // escape character values >= this value when encoding	191	UV limit; // escape character values >= this value when encoding
159	} enc_t;	192	} enc_t;
160		193
161	INLINE void	194	INLINE void
162	need (enc_t *enc, STRLEN len)	195	need (enc_t *enc, STRLEN len)
163	{	196	{
164	if (expect_false (enc->cur + len >= enc->end))	197	if (expect_false (enc->cur + len >= enc->end))
165	{	198	{
166	STRLEN cur = enc->cur - SvPVX (enc->sv);	199	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
167	SvGROW (enc->sv, cur + len + 1);	200	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
168	enc->cur = SvPVX (enc->sv) + cur;	201	enc->cur = SvPVX (enc->sv) + cur;
169	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	202	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
170	}	203	}
171	}	204	}
172		205
…		…
247	(int)((uch - 0x10000) % 0x400 + 0xDC00));	280	(int)((uch - 0x10000) % 0x400 + 0xDC00));
248	enc->cur += 12;	281	enc->cur += 12;
249	}	282	}
250	else	283	else
251	{	284	{
252	static char hexdigit [16] = "0123456789abcdef";
253	need (enc, len += 5);	285	need (enc, len += 5);
254	*enc->cur++ = '\\';	286	*enc->cur++ = '\\';
255	*enc->cur++ = 'u';	287	*enc->cur++ = 'u';
256	*enc->cur++ = hexdigit [ uch >> 12 ];	288	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
257	*enc->cur++ = hexdigit [(uch >> 8) & 15];	289	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
258	*enc->cur++ = hexdigit [(uch >> 4) & 15];	290	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
259	*enc->cur++ = hexdigit [(uch >> 0) & 15];	291	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
260	}	292	}
261		293
262	str += clen;	294	str += clen;
263	}	295	}
264	else if (enc->json.flags & F_LATIN1)	296	else if (enc->json.flags & F_LATIN1)
…		…
335	static void	367	static void
336	encode_av (enc_t enc, AV av)	368	encode_av (enc_t enc, AV av)
337	{	369	{
338	int i, len = av_len (av);	370	int i, len = av_len (av);
339		371
340	if (enc->indent >= enc->maxdepth)	372	if (enc->indent >= enc->json.max_depth)
341	croak ("data structure too deep (hit recursion limit)");	373	croak (ERR_NESTING_EXCEEDED);
342		374
343	encode_ch (enc, '[');	375	encode_ch (enc, '[');
344		376
345	if (len >= 0)	377	if (len >= 0)
346	{	378	{
…		…
420		452
421	static void	453	static void
422	encode_hv (enc_t enc, HV hv)	454	encode_hv (enc_t enc, HV hv)
423	{	455	{
424	HE *he;	456	HE *he;
425	int count;
426		457
427	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
428	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
429		460
430	encode_ch (enc, '{');	461	encode_ch (enc, '{');
431		462
432	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
433	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
434	// security workaround added somewhere in 5.8.x.	465	// security workaround added somewhere in 5.8.x
435	// that randomises hash orderings	466	// that randomises hash orderings
436	if (enc->json.flags & F_CANONICAL)	467	if (enc->json.flags & F_CANONICAL)
437	{	468	{
438	int count = hv_iterinit (hv);	469	int count = hv_iterinit (hv);
439		470
…		…
614		645
615	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
616	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
617	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
618	encode_str (enc, "false", 5, 0);	649	encode_str (enc, "false", 5, 0);
		650	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		651	encode_str (enc, "null", 4, 0);
619	else	652	else
620	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	653	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
621	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
622	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
623	else	658	else
624	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	659	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
625	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
626	}	661	}
627		662
…		…
648	else if (SvIOKp (sv))	683	else if (SvIOKp (sv))
649	{	684	{
650	// we assume we can always read an IV as a UV and vice versa	685	// we assume we can always read an IV as a UV and vice versa
651	// we assume two's complement	686	// we assume two's complement
652	// we assume no aliasing issues in the union	687	// we assume no aliasing issues in the union
653	if (SvIsUV (sv) ? SvUVX (sv) > 59000	688	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
654	: SvIVX (sv) > 59000 \|\| SvIVX (sv) < -59000)	689	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
655	{
656	// large integer, use the (rather slow) snprintf way.
657	need (enc, sizeof (UV) * 5 / 2 + 1); // CHAR_BIT is at least 8
658	enc->cur +=
659	SvIsUV(sv)
660	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
661	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
662	}
663	else
664	{	690	{
665	// optimise the "small number case"	691	// optimise the "small number case"
666	// code will likely be branchless and use only a single multiplication	692	// code will likely be branchless and use only a single multiplication
667	// works for numbers up to 59074	693	// works for numbers up to 59074
668	I32 i = SvIVX (sv);	694	I32 i = SvIVX (sv);
…		…
679		705
680	// now output digit by digit, each time masking out the integer part	706	// now output digit by digit, each time masking out the integer part
681	// and multiplying by 5 while moving the decimal point one to the right,	707	// and multiplying by 5 while moving the decimal point one to the right,
682	// resulting in a net multiplication by 10.	708	// resulting in a net multiplication by 10.
683	// we always write the digit to memory but conditionally increment	709	// we always write the digit to memory but conditionally increment
684	// the pointer, to ease the usage of conditional move instructions.	710	// the pointer, to enable the use of conditional move instructions.
685	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;	711	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffffUL) 5;
686	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;	712	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffffUL) 5;
687	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;	713	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffffUL) 5;
688	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;	714	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffffUL) 5;
689	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'	715	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
690	}	716	}
		717	else
		718	{
		719	// large integer, use the (rather slow) snprintf way.
		720	need (enc, IVUV_MAXCHARS);
		721	enc->cur +=
		722	SvIsUV(sv)
		723	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
		724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
		725	}
691	}	726	}
692	else if (SvROK (sv))	727	else if (SvROK (sv))
693	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
694	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
695	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
696	else	731	else
697	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	732	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
698	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
699	}	734	}
…		…
709	enc.json = *json;	744	enc.json = *json;
710	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
711	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
712	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
713	enc.indent = 0;	748	enc.indent = 0;
714	enc.maxdepth = DEC_DEPTH (enc.json.flags);
715	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	749	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
716	: enc.json.flags & F_LATIN1 ? 0x000100UL	750	: enc.json.flags & F_LATIN1 ? 0x000100UL
717	: 0x110000UL;	751	: 0x110000UL;
718		752
719	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
…		…
786	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
787	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
788	++dec->cur; \	822	++dec->cur; \
789	SE	823	SE
790		824
791	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	825	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
792	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
793		827
794	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
795		829
796	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
936	{	970	{
937	STRLEN len = cur - buf;	971	STRLEN len = cur - buf;
938		972
939	if (sv)	973	if (sv)
940	{	974	{
941	SvGROW (sv, SvCUR (sv) + len + 1);	975	STRLEN cur = SvCUR (sv);
		976
		977	if (SvLEN (sv) <= cur + len)
		978	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		979
942	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	980	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
943	SvCUR_set (sv, SvCUR (sv) + len);	981	SvCUR_set (sv, SvCUR (sv) + len);
944	}	982	}
945	else	983	else
946	sv = newSVpvn (buf, len);	984	sv = newSVpvn (buf, len);
…		…
1168	char *p = dec->cur;	1206	char *p = dec->cur;
1169	char *e = p + 24; // only try up to 24 bytes	1207	char *e = p + 24; // only try up to 24 bytes
1170		1208
1171	for (;;)	1209	for (;;)
1172	{	1210	{
1173	// the >= 0x80 is true on most architectures	1211	// the >= 0x80 is false on most architectures
1174	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1212	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1175	{	1213	{
1176	// slow path, back up and use decode_str	1214	// slow path, back up and use decode_str
1177	SV *key = decode_str (dec);	1215	SV *key = decode_str (dec);
1178	if (!key)	1216	if (!key)
…		…
1326	case 't':	1364	case 't':
1327	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1365	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1328	{	1366	{
1329	dec->cur += 4;	1367	dec->cur += 4;
1330	#if JSON_SLOW	1368	#if JSON_SLOW
1331	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1369	json_true = get_bool ("JSON::XS::true");
1332	#endif	1370	#endif
1333	return SvREFCNT_inc (json_true);	1371	return newSVsv (json_true);
1334	}	1372	}
1335	else	1373	else
1336	ERR ("'true' expected");	1374	ERR ("'true' expected");
1337		1375
1338	break;	1376	break;
…		…
1340	case 'f':	1378	case 'f':
1341	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1379	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1342	{	1380	{
1343	dec->cur += 5;	1381	dec->cur += 5;
1344	#if JSON_SLOW	1382	#if JSON_SLOW
1345	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1383	json_false = get_bool ("JSON::XS::false");
1346	#endif	1384	#endif
1347	return SvREFCNT_inc (json_false);	1385	return newSVsv (json_false);
1348	}	1386	}
1349	else	1387	else
1350	ERR ("'false' expected");	1388	ERR ("'false' expected");
1351		1389
1352	break;	1390	break;
…		…
1370	fail:	1408	fail:
1371	return 0;	1409	return 0;
1372	}	1410	}
1373		1411
1374	static SV *	1412	static SV *
1375	decode_json (SV string, JSON json, UV *offset_return)	1413	decode_json (SV string, JSON json, STRLEN *offset_return)
1376	{	1414	{
1377	dec_t dec;	1415	dec_t dec;
1378	UV offset;	1416	STRLEN offset;
1379	SV *sv;	1417	SV *sv;
1380		1418
		1419	/* work around bugs in 5.10 where manipulating magic values
		1420	* will perl ignore the magic in subsequent accesses
		1421	*/
1381	SvGETMAGIC (string);	1422	/SvGETMAGIC (string);/
		1423	if (SvMAGICAL (string))
		1424	string = sv_2mortal (newSVsv (string));
		1425
1382	SvUPGRADE (string, SVt_PV);	1426	SvUPGRADE (string, SVt_PV);
1383		1427
1384	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1428	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1429	* assertion with -DDEBUGGING, although SvCUR is documented to
		1430	* return the xpv_cur field which certainly exists after upgrading.
		1431	* according to nicholas clark, calling SvPOK fixes this.
		1432	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1433	* and hope for the best.
		1434	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1435	* assertion business is seriously broken, try yet another workaround
		1436	* for the broken -DDEBUGGING.
		1437	*/
		1438	#ifdef DEBUGGING
		1439	offset = SvOK (string) ? sv_len (string) : 0;
		1440	#else
		1441	offset = SvCUR (string);
		1442	#endif
		1443
		1444	if (offset > json->max_size && json->max_size)
1385	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1445	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1386	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1446	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1387		1447
1388	if (json->flags & F_UTF8)	1448	if (json->flags & F_UTF8)
1389	sv_utf8_downgrade (string, 0);	1449	sv_utf8_downgrade (string, 0);
1390	else	1450	else
1391	sv_utf8_upgrade (string);	1451	sv_utf8_upgrade (string);
1392		1452
1393	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1453	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1394		1454
1395	dec.json = *json;	1455	dec.json = *json;
1396	dec.cur = SvPVX (string);	1456	dec.cur = SvPVX (string);
1397	dec.end = SvEND (string);	1457	dec.end = SvEND (string);
1398	dec.err = 0;	1458	dec.err = 0;
1399	dec.depth = 0;	1459	dec.depth = 0;
1400	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1401		1460
1402	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1461	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1403	dec.json.flags \|= F_HOOK;	1462	dec.json.flags \|= F_HOOK;
1404		1463
1405	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1464	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1456		1515
1457	return sv;	1516	return sv;
1458	}	1517	}
1459		1518
1460	/////////////////////////////////////////////////////////////////////////////	1519	/////////////////////////////////////////////////////////////////////////////
		1520	// incremental parser
		1521
		1522	static void
		1523	incr_parse (JSON *self)
		1524	{
		1525	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1526
		1527	for (;;)
		1528	{
		1529	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
		1530	switch (self->incr_mode)
		1531	{
		1532	// only used for intiial whitespace skipping
		1533	case INCR_M_WS:
		1534	for (;;)
		1535	{
		1536	if (*p > 0x20)
		1537	{
		1538	self->incr_mode = INCR_M_JSON;
		1539	goto incr_m_json;
		1540	}
		1541	else if (!*p)
		1542	goto interrupt;
		1543
		1544	++p;
		1545	}
		1546
		1547	// skip a single char inside a string (for \\-processing)
		1548	case INCR_M_BS:
		1549	if (!*p)
		1550	goto interrupt;
		1551
		1552	++p;
		1553	self->incr_mode = INCR_M_STR;
		1554	goto incr_m_str;
		1555
		1556	// inside a string
		1557	case INCR_M_STR:
		1558	incr_m_str:
		1559	for (;;)
		1560	{
		1561	if (*p == '"')
		1562	{
		1563	++p;
		1564	self->incr_mode = INCR_M_JSON;
		1565
		1566	if (!self->incr_nest)
		1567	goto interrupt;
		1568
		1569	goto incr_m_json;
		1570	}
		1571	else if (*p == '\\')
		1572	{
		1573	++p; // "virtually" consumes character after \
		1574
		1575	if (!*p) // if at end of string we have to switch modes
		1576	{
		1577	self->incr_mode = INCR_M_BS;
		1578	goto interrupt;
		1579	}
		1580	}
		1581	else if (!*p)
		1582	goto interrupt;
		1583
		1584	++p;
		1585	}
		1586
		1587	// after initial ws, outside string
		1588	case INCR_M_JSON:
		1589	incr_m_json:
		1590	for (;;)
		1591	{
		1592	switch (*p++)
		1593	{
		1594	case 0:
		1595	--p;
		1596	goto interrupt;
		1597
		1598	case 0x09:
		1599	case 0x0a:
		1600	case 0x0d:
		1601	case 0x20:
		1602	if (!self->incr_nest)
		1603	{
		1604	--p; // do not eat the whitespace, let the next round do it
		1605	goto interrupt;
		1606	}
		1607	break;
		1608
		1609	case '"':
		1610	self->incr_mode = INCR_M_STR;
		1611	goto incr_m_str;
		1612
		1613	case '[':
		1614	case '{':
		1615	if (++self->incr_nest > self->max_depth)
		1616	croak (ERR_NESTING_EXCEEDED);
		1617	break;
		1618
		1619	case ']':
		1620	case '}':
		1621	if (--self->incr_nest <= 0)
		1622	goto interrupt;
		1623	}
		1624	}
		1625	}
		1626
		1627	modechange:
		1628	;
		1629	}
		1630
		1631	interrupt:
		1632	self->incr_pos = p - SvPVX (self->incr_text);
		1633	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1634	}
		1635
		1636	/////////////////////////////////////////////////////////////////////////////
1461	// XS interface functions	1637	// XS interface functions
1462		1638
1463	MODULE = JSON::XS PACKAGE = JSON::XS	1639	MODULE = JSON::XS PACKAGE = JSON::XS
1464		1640
1465	BOOT:	1641	BOOT:
…		…
1474	: -1;	1650	: -1;
1475		1651
1476	json_stash = gv_stashpv ("JSON::XS" , 1);	1652	json_stash = gv_stashpv ("JSON::XS" , 1);
1477	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1653	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1478		1654
1479	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1655	json_true = get_bool ("JSON::XS::true");
1480	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1656	json_false = get_bool ("JSON::XS::false");
1481	}	1657	}
1482		1658
1483	PROTOTYPES: DISABLE	1659	PROTOTYPES: DISABLE
1484		1660
1485	void CLONE (...)	1661	void CLONE (...)
…		…
1490	void new (char *klass)	1666	void new (char *klass)
1491	PPCODE:	1667	PPCODE:
1492	{	1668	{
1493	SV *pv = NEWSV (0, sizeof (JSON));	1669	SV *pv = NEWSV (0, sizeof (JSON));
1494	SvPOK_only (pv);	1670	SvPOK_only (pv);
1495	Zero (SvPVX (pv), 1, JSON);	1671	json_init ((JSON *)SvPVX (pv));
1496	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1497	XPUSHs (sv_2mortal (sv_bless (	1672	XPUSHs (sv_2mortal (sv_bless (
1498	newRV_noinc (pv),	1673	newRV_noinc (pv),
1499	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1674	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1500	)));	1675	)));
1501	}	1676	}
…		…
1513	allow_nonref = F_ALLOW_NONREF	1688	allow_nonref = F_ALLOW_NONREF
1514	shrink = F_SHRINK	1689	shrink = F_SHRINK
1515	allow_blessed = F_ALLOW_BLESSED	1690	allow_blessed = F_ALLOW_BLESSED
1516	convert_blessed = F_CONV_BLESSED	1691	convert_blessed = F_CONV_BLESSED
1517	relaxed = F_RELAXED	1692	relaxed = F_RELAXED
		1693	allow_unknown = F_ALLOW_UNKNOWN
1518	PPCODE:	1694	PPCODE:
1519	{	1695	{
1520	if (enable)	1696	if (enable)
1521	self->flags \|= ix;	1697	self->flags \|= ix;
1522	else	1698	else
…		…
1537	get_allow_nonref = F_ALLOW_NONREF	1713	get_allow_nonref = F_ALLOW_NONREF
1538	get_shrink = F_SHRINK	1714	get_shrink = F_SHRINK
1539	get_allow_blessed = F_ALLOW_BLESSED	1715	get_allow_blessed = F_ALLOW_BLESSED
1540	get_convert_blessed = F_CONV_BLESSED	1716	get_convert_blessed = F_CONV_BLESSED
1541	get_relaxed = F_RELAXED	1717	get_relaxed = F_RELAXED
		1718	get_allow_unknown = F_ALLOW_UNKNOWN
1542	PPCODE:	1719	PPCODE:
1543	XPUSHs (boolSV (self->flags & ix));	1720	XPUSHs (boolSV (self->flags & ix));
1544		1721
1545	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1722	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1546	PPCODE:	1723	PPCODE:
1547	{	1724	self->max_depth = max_depth;
1548	UV log2 = 0;
1549
1550	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1551
1552	while ((1UL << log2) < max_depth)
1553	++log2;
1554
1555	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1556
1557	XPUSHs (ST (0));	1725	XPUSHs (ST (0));
1558	}
1559		1726
1560	U32 get_max_depth (JSON *self)	1727	U32 get_max_depth (JSON *self)
1561	CODE:	1728	CODE:
1562	RETVAL = DEC_DEPTH (self->flags);	1729	RETVAL = self->max_depth;
1563	OUTPUT:	1730	OUTPUT:
1564	RETVAL	1731	RETVAL
1565		1732
1566	void max_size (JSON *self, UV max_size = 0)	1733	void max_size (JSON *self, U32 max_size = 0)
1567	PPCODE:	1734	PPCODE:
1568	{	1735	self->max_size = max_size;
1569	UV log2 = 0;
1570
1571	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1572	if (max_size == 1) max_size = 2;
1573
1574	while ((1UL << log2) < max_size)
1575	++log2;
1576
1577	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1578
1579	XPUSHs (ST (0));	1736	XPUSHs (ST (0));
1580	}
1581		1737
1582	int get_max_size (JSON *self)	1738	int get_max_size (JSON *self)
1583	CODE:	1739	CODE:
1584	RETVAL = DEC_SIZE (self->flags);	1740	RETVAL = self->max_size;
1585	OUTPUT:	1741	OUTPUT:
1586	RETVAL	1742	RETVAL
1587		1743
1588	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1744	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1589	PPCODE:	1745	PPCODE:
…		…
1625	XPUSHs (decode_json (jsonstr, self, 0));	1781	XPUSHs (decode_json (jsonstr, self, 0));
1626		1782
1627	void decode_prefix (JSON self, SV jsonstr)	1783	void decode_prefix (JSON self, SV jsonstr)
1628	PPCODE:	1784	PPCODE:
1629	{	1785	{
1630	UV offset;	1786	STRLEN offset;
1631	EXTEND (SP, 2);	1787	EXTEND (SP, 2);
1632	PUSHs (decode_json (jsonstr, self, &offset));	1788	PUSHs (decode_json (jsonstr, self, &offset));
1633	PUSHs (sv_2mortal (newSVuv (offset)));	1789	PUSHs (sv_2mortal (newSVuv (offset)));
		1790	}
		1791
		1792	void incr_parse (JSON self, SV jsonstr = 0)
		1793	PPCODE:
		1794	{
		1795	if (!self->incr_text)
		1796	self->incr_text = newSVpvn ("", 0);
		1797
		1798	// append data, if any
		1799	if (jsonstr)
		1800	{
		1801	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1802	{
		1803	/* utf-8-ness differs, need to upgrade */
		1804	sv_utf8_upgrade (self->incr_text);
		1805
		1806	if (self->incr_pos)
		1807	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1808	- (U8 *)SvPVX (self->incr_text);
		1809	}
		1810
		1811	{
		1812	STRLEN len;
		1813	const char *str = SvPV (jsonstr, len);
		1814	STRLEN cur = SvCUR (self->incr_text);
		1815
		1816	if (SvLEN (self->incr_text) <= cur + len)
		1817	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1818
		1819	Move (str, SvEND (self->incr_text), len, char);
		1820	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1821	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1822	}
		1823	}
		1824
		1825	if (GIMME_V != G_VOID)
		1826	do
		1827	{
		1828	STRLEN offset;
		1829
		1830	if (!INCR_DONE (self))
		1831	{
		1832	incr_parse (self);
		1833
		1834	if (self->incr_pos > self->max_size && self->max_size)
		1835	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1836	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1837
		1838	if (!INCR_DONE (self))
		1839	break;
		1840	}
		1841
		1842	XPUSHs (decode_json (self->incr_text, self, &offset));
		1843
		1844	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1845	self->incr_pos -= offset;
		1846	self->incr_nest = 0;
		1847	self->incr_mode = 0;
		1848	}
		1849	while (GIMME_V == G_ARRAY);
		1850	}
		1851
		1852	SV incr_text (JSON self)
		1853	ATTRS: lvalue
		1854	CODE:
		1855	{
		1856	if (self->incr_pos)
		1857	croak ("incr_text can not be called when the incremental parser already started parsing");
		1858
		1859	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1860	}
		1861	OUTPUT:
		1862	RETVAL
		1863
		1864	void incr_skip (JSON *self)
		1865	CODE:
		1866	{
		1867	if (self->incr_pos)
		1868	{
		1869	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1870	self->incr_pos = 0;
		1871	self->incr_nest = 0;
		1872	self->incr_mode = 0;
		1873	}
		1874	}
		1875
		1876	void incr_reset (JSON *self)
		1877	CODE:
		1878	{
		1879	SvREFCNT_dec (self->incr_text);
		1880	self->incr_text = 0;
		1881	self->incr_pos = 0;
		1882	self->incr_nest = 0;
		1883	self->incr_mode = 0;
1634	}	1884	}
1635		1885
1636	void DESTROY (JSON *self)	1886	void DESTROY (JSON *self)
1637	CODE:	1887	CODE:
1638	SvREFCNT_dec (self->cb_sk_object);	1888	SvREFCNT_dec (self->cb_sk_object);
1639	SvREFCNT_dec (self->cb_object);	1889	SvREFCNT_dec (self->cb_object);
		1890	SvREFCNT_dec (self->incr_text);
1640		1891
1641	PROTOTYPES: ENABLE	1892	PROTOTYPES: ENABLE
1642		1893
1643	void encode_json (SV *scalar)	1894	void encode_json (SV *scalar)
		1895	ALIAS:
		1896	to_json_ = 0
		1897	encode_json = F_UTF8
1644	PPCODE:	1898	PPCODE:
1645	{	1899	{
1646	JSON json = { F_DEFAULT \| F_UTF8 };	1900	JSON json;
		1901	json_init (&json);
		1902	json.flags \|= ix;
1647	XPUSHs (encode_json (scalar, &json));	1903	XPUSHs (encode_json (scalar, &json));
1648	}	1904	}
1649		1905
1650	void decode_json (SV *jsonstr)	1906	void decode_json (SV *jsonstr)
		1907	ALIAS:
		1908	from_json_ = 0
		1909	decode_json = F_UTF8
1651	PPCODE:	1910	PPCODE:
1652	{	1911	{
1653	JSON json = { F_DEFAULT \| F_UTF8 };	1912	JSON json;
		1913	json_init (&json);
		1914	json.flags \|= ix;
1654	XPUSHs (decode_json (jsonstr, &json, 0));	1915	XPUSHs (decode_json (jsonstr, &json, 0));
1655	}	1916	}
1656		1917
		1918

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing JSON-XS/XS.xs (file contents): Revision 1.74 by root, Wed Mar 19 15:17:53 2008 UTC vs. Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.74 by root, Wed Mar 19 15:17:53 2008 UTC vs.
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC