[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.90 by root, Sun Jul 20 17:55:19 2008 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)
…		…
335	static void	368	static void
336	encode_av (enc_t enc, AV av)	369	encode_av (enc_t enc, AV av)
337	{	370	{
338	int i, len = av_len (av);	371	int i, len = av_len (av);
339		372
340	if (enc->indent >= enc->maxdepth)	373	if (enc->indent >= enc->json.max_depth)
341	croak ("data structure too deep (hit recursion limit)");	374	croak (ERR_NESTING_EXCEEDED);
342		375
343	encode_ch (enc, '[');	376	encode_ch (enc, '[');
344		377
345	if (len >= 0)	378	if (len >= 0)
346	{	379	{
…		…
420		453
421	static void	454	static void
422	encode_hv (enc_t enc, HV hv)	455	encode_hv (enc_t enc, HV hv)
423	{	456	{
424	HE *he;	457	HE *he;
425	int count;
426		458
427	if (enc->indent >= enc->maxdepth)	459	if (enc->indent >= enc->json.max_depth)
428	croak ("data structure too deep (hit recursion limit)");	460	croak (ERR_NESTING_EXCEEDED);
429		461
430	encode_ch (enc, '{');	462	encode_ch (enc, '{');
431		463
432	// for canonical output we have to sort by keys first	464	// for canonical output we have to sort by keys first
433	// actually, this is mostly due to the stupid so-called	465	// actually, this is mostly due to the stupid so-called
…		…
614		646
615	if (len == 1 && *pv == '1')	647	if (len == 1 && *pv == '1')
616	encode_str (enc, "true", 4, 0);	648	encode_str (enc, "true", 4, 0);
617	else if (len == 1 && *pv == '0')	649	else if (len == 1 && *pv == '0')
618	encode_str (enc, "false", 5, 0);	650	encode_str (enc, "false", 5, 0);
		651	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		652	encode_str (enc, "null", 4, 0);
619	else	653	else
620	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	654	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
621	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	655	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
622	}	656	}
		657	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		658	encode_str (enc, "null", 4, 0);
623	else	659	else
624	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	660	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
625	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	661	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
626	}	662	}
627		663
…		…
648	else if (SvIOKp (sv))	684	else if (SvIOKp (sv))
649	{	685	{
650	// we assume we can always read an IV as a UV and vice versa	686	// we assume we can always read an IV as a UV and vice versa
651	// we assume two's complement	687	// we assume two's complement
652	// we assume no aliasing issues in the union	688	// we assume no aliasing issues in the union
653	if (SvIsUV (sv) ? SvUVX (sv) > 59000	689	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
654	: SvIVX (sv) > 59000 \|\| SvIVX (sv) < -59000)	690	: 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	{	691	{
665	// optimise the "small number case"	692	// optimise the "small number case"
666	// code will likely be branchless and use only a single multiplication	693	// code will likely be branchless and use only a single multiplication
667	// works for numbers up to 59074	694	// works for numbers up to 59074
668	I32 i = SvIVX (sv);	695	I32 i = SvIVX (sv);
…		…
679		706
680	// now output digit by digit, each time masking out the integer part	707	// 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,	708	// and multiplying by 5 while moving the decimal point one to the right,
682	// resulting in a net multiplication by 10.	709	// resulting in a net multiplication by 10.
683	// we always write the digit to memory but conditionally increment	710	// we always write the digit to memory but conditionally increment
684	// the pointer, to ease the usage of conditional move instructions.	711	// 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;	712	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;	713	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;	714	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;	715	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'	716	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
690	}	717	}
		718	else
		719	{
		720	// large integer, use the (rather slow) snprintf way.
		721	need (enc, IVUV_MAXCHARS);
		722	enc->cur +=
		723	SvIsUV(sv)
		724	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
		725	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
		726	}
691	}	727	}
692	else if (SvROK (sv))	728	else if (SvROK (sv))
693	encode_rv (enc, SvRV (sv));	729	encode_rv (enc, SvRV (sv));
694	else if (!SvOK (sv))	730	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
695	encode_str (enc, "null", 4, 0);	731	encode_str (enc, "null", 4, 0);
696	else	732	else
697	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	733	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
698	SvPV_nolen (sv), SvFLAGS (sv));	734	SvPV_nolen (sv), SvFLAGS (sv));
699	}	735	}
…		…
709	enc.json = *json;	745	enc.json = *json;
710	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	746	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
711	enc.cur = SvPVX (enc.sv);	747	enc.cur = SvPVX (enc.sv);
712	enc.end = SvEND (enc.sv);	748	enc.end = SvEND (enc.sv);
713	enc.indent = 0;	749	enc.indent = 0;
714	enc.maxdepth = DEC_DEPTH (enc.json.flags);
715	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	750	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
716	: enc.json.flags & F_LATIN1 ? 0x000100UL	751	: enc.json.flags & F_LATIN1 ? 0x000100UL
717	: 0x110000UL;	752	: 0x110000UL;
718		753
719	SvPOK_only (enc.sv);	754	SvPOK_only (enc.sv);
…		…
786	if (*dec->cur != ch) \	821	if (*dec->cur != ch) \
787	ERR (# ch " expected"); \	822	ERR (# ch " expected"); \
788	++dec->cur; \	823	++dec->cur; \
789	SE	824	SE
790		825
791	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	826	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
792	#define DEC_DEC_DEPTH --dec->depth	827	#define DEC_DEC_DEPTH --dec->depth
793		828
794	static SV decode_sv (dec_t dec);	829	static SV decode_sv (dec_t dec);
795		830
796	static signed char decode_hexdigit[256];	831	static signed char decode_hexdigit[256];
…		…
1168	char *p = dec->cur;	1203	char *p = dec->cur;
1169	char *e = p + 24; // only try up to 24 bytes	1204	char *e = p + 24; // only try up to 24 bytes
1170		1205
1171	for (;;)	1206	for (;;)
1172	{	1207	{
1173	// the >= 0x80 is true on most architectures	1208	// the >= 0x80 is false on most architectures
1174	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1209	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1175	{	1210	{
1176	// slow path, back up and use decode_str	1211	// slow path, back up and use decode_str
1177	SV *key = decode_str (dec);	1212	SV *key = decode_str (dec);
1178	if (!key)	1213	if (!key)
…		…
1326	case 't':	1361	case 't':
1327	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1362	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1328	{	1363	{
1329	dec->cur += 4;	1364	dec->cur += 4;
1330	#if JSON_SLOW	1365	#if JSON_SLOW
1331	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1366	json_true = get_bool ("JSON::XS::true");
1332	#endif	1367	#endif
1333	return SvREFCNT_inc (json_true);	1368	return newSVsv (json_true);
1334	}	1369	}
1335	else	1370	else
1336	ERR ("'true' expected");	1371	ERR ("'true' expected");
1337		1372
1338	break;	1373	break;
…		…
1340	case 'f':	1375	case 'f':
1341	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1376	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1342	{	1377	{
1343	dec->cur += 5;	1378	dec->cur += 5;
1344	#if JSON_SLOW	1379	#if JSON_SLOW
1345	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1380	json_false = get_bool ("JSON::XS::false");
1346	#endif	1381	#endif
1347	return SvREFCNT_inc (json_false);	1382	return newSVsv (json_false);
1348	}	1383	}
1349	else	1384	else
1350	ERR ("'false' expected");	1385	ERR ("'false' expected");
1351		1386
1352	break;	1387	break;
…		…
1370	fail:	1405	fail:
1371	return 0;	1406	return 0;
1372	}	1407	}
1373		1408
1374	static SV *	1409	static SV *
1375	decode_json (SV string, JSON json, UV *offset_return)	1410	decode_json (SV string, JSON json, STRLEN *offset_return)
1376	{	1411	{
1377	dec_t dec;	1412	dec_t dec;
1378	UV offset;	1413	STRLEN offset;
1379	SV *sv;	1414	SV *sv;
1380		1415
1381	SvGETMAGIC (string);	1416	SvGETMAGIC (string);
1382	SvUPGRADE (string, SVt_PV);	1417	SvUPGRADE (string, SVt_PV);
1383		1418
1384	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1419	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1420	* assertion with -DDEBUGGING, although SvCUR is documented to
		1421	* return the xpv_cur field which certainly exists after upgrading.
		1422	* according to nicholas clark, calling SvPOK fixes this.
		1423	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1424	* and hope for the best.
		1425	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1426	* assertion business is seriously broken, try yet another workaround
		1427	* for the broken -DDEBUGGING.
		1428	*/
		1429	#ifdef DEBUGGING
		1430	offset = SvOK (string) ? sv_len (string) : 0;
		1431	#else
		1432	offset = SvCUR (string);
		1433	#endif
		1434
		1435	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",	1436	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));	1437	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1387		1438
1388	if (json->flags & F_UTF8)	1439	if (json->flags & F_UTF8)
1389	sv_utf8_downgrade (string, 0);	1440	sv_utf8_downgrade (string, 0);
1390	else	1441	else
1391	sv_utf8_upgrade (string);	1442	sv_utf8_upgrade (string);
1392		1443
1393	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1444	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1394		1445
1395	dec.json = *json;	1446	dec.json = *json;
1396	dec.cur = SvPVX (string);	1447	dec.cur = SvPVX (string);
1397	dec.end = SvEND (string);	1448	dec.end = SvEND (string);
1398	dec.err = 0;	1449	dec.err = 0;
1399	dec.depth = 0;	1450	dec.depth = 0;
1400	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1401		1451
1402	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1452	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1403	dec.json.flags \|= F_HOOK;	1453	dec.json.flags \|= F_HOOK;
1404		1454
1405	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1455	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1456		1506
1457	return sv;	1507	return sv;
1458	}	1508	}
1459		1509
1460	/////////////////////////////////////////////////////////////////////////////	1510	/////////////////////////////////////////////////////////////////////////////
		1511	// incremental parser
		1512
		1513	static void
		1514	incr_parse (JSON *self)
		1515	{
		1516	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1517
		1518	for (;;)
		1519	{
		1520	//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
		1521	switch (self->incr_mode)
		1522	{
		1523	// only used for intiial whitespace skipping
		1524	case INCR_M_WS:
		1525	for (;;)
		1526	{
		1527	if (*p > 0x20)
		1528	{
		1529	self->incr_mode = INCR_M_JSON;
		1530	goto incr_m_json;
		1531	}
		1532	else if (!*p)
		1533	goto interrupt;
		1534
		1535	++p;
		1536	}
		1537
		1538	// skip a single char inside a string (for \\-processing)
		1539	case INCR_M_BS:
		1540	if (!*p)
		1541	goto interrupt;
		1542
		1543	++p;
		1544	self->incr_mode = INCR_M_STR;
		1545	goto incr_m_str;
		1546
		1547	// inside a string
		1548	case INCR_M_STR:
		1549	incr_m_str:
		1550	for (;;)
		1551	{
		1552	if (*p == '"')
		1553	{
		1554	++p;
		1555	self->incr_mode = INCR_M_JSON;
		1556
		1557	if (!self->incr_nest)
		1558	goto interrupt;
		1559
		1560	goto incr_m_json;
		1561	}
		1562	else if (*p == '\\')
		1563	{
		1564	++p; // "virtually" consumes character after \
		1565
		1566	if (!*p) // if at end of string we have to switch modes
		1567	{
		1568	self->incr_mode = INCR_M_BS;
		1569	goto interrupt;
		1570	}
		1571	}
		1572	else if (!*p)
		1573	goto interrupt;
		1574
		1575	++p;
		1576	}
		1577
		1578	// after initial ws, outside string
		1579	case INCR_M_JSON:
		1580	incr_m_json:
		1581	for (;;)
		1582	{
		1583	switch (*p++)
		1584	{
		1585	case 0:
		1586	--p;
		1587	goto interrupt;
		1588
		1589	case 0x09:
		1590	case 0x0a:
		1591	case 0x0d:
		1592	case 0x20:
		1593	if (!self->incr_nest)
		1594	{
		1595	--p; // do not eat the whitespace, let the next round do it
		1596	goto interrupt;
		1597	}
		1598	break;
		1599
		1600	case '"':
		1601	self->incr_mode = INCR_M_STR;
		1602	goto incr_m_str;
		1603
		1604	case '[':
		1605	case '{':
		1606	if (++self->incr_nest > self->max_depth)
		1607	croak (ERR_NESTING_EXCEEDED);
		1608	break;
		1609
		1610	case ']':
		1611	case '}':
		1612	if (--self->incr_nest <= 0)
		1613	goto interrupt;
		1614	}
		1615	}
		1616	}
		1617
		1618	modechange:
		1619	;
		1620	}
		1621
		1622	interrupt:
		1623	self->incr_pos = p - SvPVX (self->incr_text);
		1624	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1625	}
		1626
		1627	/////////////////////////////////////////////////////////////////////////////
1461	// XS interface functions	1628	// XS interface functions
1462		1629
1463	MODULE = JSON::XS PACKAGE = JSON::XS	1630	MODULE = JSON::XS PACKAGE = JSON::XS
1464		1631
1465	BOOT:	1632	BOOT:
…		…
1474	: -1;	1641	: -1;
1475		1642
1476	json_stash = gv_stashpv ("JSON::XS" , 1);	1643	json_stash = gv_stashpv ("JSON::XS" , 1);
1477	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1644	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1478		1645
1479	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1646	json_true = get_bool ("JSON::XS::true");
1480	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1647	json_false = get_bool ("JSON::XS::false");
1481	}	1648	}
1482		1649
1483	PROTOTYPES: DISABLE	1650	PROTOTYPES: DISABLE
1484		1651
1485	void CLONE (...)	1652	void CLONE (...)
…		…
1490	void new (char *klass)	1657	void new (char *klass)
1491	PPCODE:	1658	PPCODE:
1492	{	1659	{
1493	SV *pv = NEWSV (0, sizeof (JSON));	1660	SV *pv = NEWSV (0, sizeof (JSON));
1494	SvPOK_only (pv);	1661	SvPOK_only (pv);
1495	Zero (SvPVX (pv), 1, JSON);	1662	json_init ((JSON *)SvPVX (pv));
1496	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1497	XPUSHs (sv_2mortal (sv_bless (	1663	XPUSHs (sv_2mortal (sv_bless (
1498	newRV_noinc (pv),	1664	newRV_noinc (pv),
1499	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1665	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1500	)));	1666	)));
1501	}	1667	}
…		…
1513	allow_nonref = F_ALLOW_NONREF	1679	allow_nonref = F_ALLOW_NONREF
1514	shrink = F_SHRINK	1680	shrink = F_SHRINK
1515	allow_blessed = F_ALLOW_BLESSED	1681	allow_blessed = F_ALLOW_BLESSED
1516	convert_blessed = F_CONV_BLESSED	1682	convert_blessed = F_CONV_BLESSED
1517	relaxed = F_RELAXED	1683	relaxed = F_RELAXED
		1684	allow_unknown = F_ALLOW_UNKNOWN
1518	PPCODE:	1685	PPCODE:
1519	{	1686	{
1520	if (enable)	1687	if (enable)
1521	self->flags \|= ix;	1688	self->flags \|= ix;
1522	else	1689	else
…		…
1537	get_allow_nonref = F_ALLOW_NONREF	1704	get_allow_nonref = F_ALLOW_NONREF
1538	get_shrink = F_SHRINK	1705	get_shrink = F_SHRINK
1539	get_allow_blessed = F_ALLOW_BLESSED	1706	get_allow_blessed = F_ALLOW_BLESSED
1540	get_convert_blessed = F_CONV_BLESSED	1707	get_convert_blessed = F_CONV_BLESSED
1541	get_relaxed = F_RELAXED	1708	get_relaxed = F_RELAXED
		1709	get_allow_unknown = F_ALLOW_UNKNOWN
1542	PPCODE:	1710	PPCODE:
1543	XPUSHs (boolSV (self->flags & ix));	1711	XPUSHs (boolSV (self->flags & ix));
1544		1712
1545	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1713	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1546	PPCODE:	1714	PPCODE:
1547	{	1715	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));	1716	XPUSHs (ST (0));
1558	}
1559		1717
1560	U32 get_max_depth (JSON *self)	1718	U32 get_max_depth (JSON *self)
1561	CODE:	1719	CODE:
1562	RETVAL = DEC_DEPTH (self->flags);	1720	RETVAL = self->max_depth;
1563	OUTPUT:	1721	OUTPUT:
1564	RETVAL	1722	RETVAL
1565		1723
1566	void max_size (JSON *self, UV max_size = 0)	1724	void max_size (JSON *self, U32 max_size = 0)
1567	PPCODE:	1725	PPCODE:
1568	{	1726	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));	1727	XPUSHs (ST (0));
1580	}
1581		1728
1582	int get_max_size (JSON *self)	1729	int get_max_size (JSON *self)
1583	CODE:	1730	CODE:
1584	RETVAL = DEC_SIZE (self->flags);	1731	RETVAL = self->max_size;
1585	OUTPUT:	1732	OUTPUT:
1586	RETVAL	1733	RETVAL
1587		1734
1588	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1735	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1589	PPCODE:	1736	PPCODE:
…		…
1625	XPUSHs (decode_json (jsonstr, self, 0));	1772	XPUSHs (decode_json (jsonstr, self, 0));
1626		1773
1627	void decode_prefix (JSON self, SV jsonstr)	1774	void decode_prefix (JSON self, SV jsonstr)
1628	PPCODE:	1775	PPCODE:
1629	{	1776	{
1630	UV offset;	1777	STRLEN offset;
1631	EXTEND (SP, 2);	1778	EXTEND (SP, 2);
1632	PUSHs (decode_json (jsonstr, self, &offset));	1779	PUSHs (decode_json (jsonstr, self, &offset));
1633	PUSHs (sv_2mortal (newSVuv (offset)));	1780	PUSHs (sv_2mortal (newSVuv (offset)));
		1781	}
		1782
		1783	void incr_parse (JSON self, SV jsonstr = 0)
		1784	PPCODE:
		1785	{
		1786	if (!self->incr_text)
		1787	self->incr_text = newSVpvn ("", 0);
		1788
		1789	// append data, if any
		1790	if (jsonstr)
		1791	{
		1792	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1793	{
		1794	/* utf-8-ness differs, need to upgrade */
		1795	sv_utf8_upgrade (self->incr_text);
		1796
		1797	if (self->incr_pos)
		1798	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1799	- (U8 *)SvPVX (self->incr_text);
		1800	}
		1801
		1802	{
		1803	STRLEN len;
		1804	const char *str = SvPV (jsonstr, len);
		1805	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
		1806	Move (str, SvEND (self->incr_text), len, char);
		1807	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1808	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1809	}
		1810	}
		1811
		1812	if (GIMME_V != G_VOID)
		1813	do
		1814	{
		1815	STRLEN offset;
		1816
		1817	if (!INCR_DONE (self))
		1818	{
		1819	incr_parse (self);
		1820
		1821	if (self->incr_pos > self->max_size && self->max_size)
		1822	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1823	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1824
		1825	if (!INCR_DONE (self))
		1826	break;
		1827	}
		1828
		1829	XPUSHs (decode_json (self->incr_text, self, &offset));
		1830
		1831	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1832	self->incr_pos -= offset;
		1833	self->incr_nest = 0;
		1834	self->incr_mode = 0;
		1835	}
		1836	while (GIMME_V == G_ARRAY);
		1837	}
		1838
		1839	SV incr_text (JSON self)
		1840	ATTRS: lvalue
		1841	CODE:
		1842	{
		1843	if (self->incr_pos)
		1844	croak ("incr_text can not be called when the incremental parser already started parsing");
		1845
		1846	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1847	}
		1848	OUTPUT:
		1849	RETVAL
		1850
		1851	void incr_skip (JSON *self)
		1852	CODE:
		1853	{
		1854	if (self->incr_pos)
		1855	{
		1856	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1857	self->incr_pos = 0;
		1858	self->incr_nest = 0;
		1859	self->incr_mode = 0;
		1860	}
		1861	}
		1862
		1863	void incr_reset (JSON *self)
		1864	CODE:
		1865	{
		1866	SvREFCNT_dec (self->incr_text);
		1867	self->incr_text = 0;
		1868	self->incr_pos = 0;
		1869	self->incr_nest = 0;
		1870	self->incr_mode = 0;
1634	}	1871	}
1635		1872
1636	void DESTROY (JSON *self)	1873	void DESTROY (JSON *self)
1637	CODE:	1874	CODE:
1638	SvREFCNT_dec (self->cb_sk_object);	1875	SvREFCNT_dec (self->cb_sk_object);
1639	SvREFCNT_dec (self->cb_object);	1876	SvREFCNT_dec (self->cb_object);
		1877	SvREFCNT_dec (self->incr_text);
1640		1878
1641	PROTOTYPES: ENABLE	1879	PROTOTYPES: ENABLE
1642		1880
1643	void encode_json (SV *scalar)	1881	void encode_json (SV *scalar)
		1882	ALIAS:
		1883	to_json_ = 0
		1884	encode_json = F_UTF8
1644	PPCODE:	1885	PPCODE:
1645	{	1886	{
1646	JSON json = { F_DEFAULT \| F_UTF8 };	1887	JSON json;
		1888	json_init (&json);
		1889	json.flags \|= ix;
1647	XPUSHs (encode_json (scalar, &json));	1890	XPUSHs (encode_json (scalar, &json));
1648	}	1891	}
1649		1892
1650	void decode_json (SV *jsonstr)	1893	void decode_json (SV *jsonstr)
		1894	ALIAS:
		1895	from_json_ = 0
		1896	decode_json = F_UTF8
1651	PPCODE:	1897	PPCODE:
1652	{	1898	{
1653	JSON json = { F_DEFAULT \| F_UTF8 };	1899	JSON json;
		1900	json_init (&json);
		1901	json.flags \|= ix;
1654	XPUSHs (decode_json (jsonstr, &json, 0));	1902	XPUSHs (decode_json (jsonstr, &json, 0));
1655	}	1903	}
1656		1904
		1905

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.90 by root, Sun Jul 20 17:55:19 2008 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.90 by root, Sun Jul 20 17:55:19 2008 UTC