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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.82 by root, Wed Mar 26 02:35:45 2008 UTC vs.
Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC

…		…
31	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	35	#define F_RELAXED 0x00001000UL
36		36	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		38
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		40
49	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
51		43
52	#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
…		…
67		59
68	#define IN_RANGE_INC(type,val,beg,end) \	60	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	61	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	62	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		63
		64	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		65
72	#ifdef USE_ITHREADS	66	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	67	# define JSON_SLOW 1
74	# 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))
75	#else	69	#else
76	# define JSON_SLOW 0	70	# define JSON_SLOW 0
…		…
85	INCR_M_STR, // inside string	79	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	80	INCR_M_BS, // inside backslash
87	INCR_M_JSON // outside anything, count nesting	81	INCR_M_JSON // outside anything, count nesting
88	};	82	};
89		83
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		85
92	typedef struct {	86	typedef struct {
93	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
94	SV *cb_object;	91	SV *cb_object;
95	HV *cb_sk_object;	92	HV *cb_sk_object;
96		93
97	// for the incremental parser	94	// for the incremental parser
98	SV *incr_text; // the source text so far	95	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	96	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	97	int incr_nest; // {[]}-nesting level
101	int incr_mode;	98	unsigned char incr_mode;
102	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
103		107
104	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	109	// utility functions
106		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
107	INLINE void	122	INLINE void
108	shrink (SV *sv)	123	shrink (SV *sv)
109	{	124	{
110	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
111	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
112	{	128	{
113	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
114	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
115	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
170	char *cur; // SvPVX (sv) + current output position	186	char *cur; // SvPVX (sv) + current output position
171	char *end; // SvEND (sv)	187	char *end; // SvEND (sv)
172	SV *sv; // result scalar	188	SV *sv; // result scalar
173	JSON json;	189	JSON json;
174	U32 indent; // indentation level	190	U32 indent; // indentation level
175	U32 maxdepth; // max. indentation/recursion level
176	UV limit; // escape character values >= this value when encoding	191	UV limit; // escape character values >= this value when encoding
177	} enc_t;	192	} enc_t;
178		193
179	INLINE void	194	INLINE void
180	need (enc_t *enc, STRLEN len)	195	need (enc_t *enc, STRLEN len)
…		…
265	(int)((uch - 0x10000) % 0x400 + 0xDC00));	280	(int)((uch - 0x10000) % 0x400 + 0xDC00));
266	enc->cur += 12;	281	enc->cur += 12;
267	}	282	}
268	else	283	else
269	{	284	{
270	static char hexdigit [16] = "0123456789abcdef";
271	need (enc, len += 5);	285	need (enc, len += 5);
272	*enc->cur++ = '\\';	286	*enc->cur++ = '\\';
273	*enc->cur++ = 'u';	287	*enc->cur++ = 'u';
274	*enc->cur++ = hexdigit [ uch >> 12 ];	288	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
275	*enc->cur++ = hexdigit [(uch >> 8) & 15];	289	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276	*enc->cur++ = hexdigit [(uch >> 4) & 15];	290	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277	*enc->cur++ = hexdigit [(uch >> 0) & 15];	291	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278	}	292	}
279		293
280	str += clen;	294	str += clen;
281	}	295	}
282	else if (enc->json.flags & F_LATIN1)	296	else if (enc->json.flags & F_LATIN1)
…		…
353	static void	367	static void
354	encode_av (enc_t enc, AV av)	368	encode_av (enc_t enc, AV av)
355	{	369	{
356	int i, len = av_len (av);	370	int i, len = av_len (av);
357		371
358	if (enc->indent >= enc->maxdepth)	372	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	373	croak (ERR_NESTING_EXCEEDED);
360		374
361	encode_ch (enc, '[');	375	encode_ch (enc, '[');
362		376
363	if (len >= 0)	377	if (len >= 0)
364	{	378	{
…		…
439	static void	453	static void
440	encode_hv (enc_t enc, HV hv)	454	encode_hv (enc_t enc, HV hv)
441	{	455	{
442	HE *he;	456	HE *he;
443		457
444	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
445	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
446		460
447	encode_ch (enc, '{');	461	encode_ch (enc, '{');
448		462
449	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
450	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
…		…
631		645
632	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
633	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
634	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
635	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);
636	else	652	else
637	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",
638	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
639	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
640	else	658	else
641	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",
642	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
643	}	661	}
644		662
…		…
706	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
707	}	725	}
708	}	726	}
709	else if (SvROK (sv))	727	else if (SvROK (sv))
710	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
711	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
712	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
713	else	731	else
714	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",
715	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
716	}	734	}
…		…
726	enc.json = *json;	744	enc.json = *json;
727	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
728	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
729	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
730	enc.indent = 0;	748	enc.indent = 0;
731	enc.maxdepth = DEC_DEPTH (enc.json.flags);
732	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	749	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
733	: enc.json.flags & F_LATIN1 ? 0x000100UL	750	: enc.json.flags & F_LATIN1 ? 0x000100UL
734	: 0x110000UL;	751	: 0x110000UL;
735		752
736	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
…		…
803	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
804	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
805	++dec->cur; \	822	++dec->cur; \
806	SE	823	SE
807		824
808	#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)
809	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
810		827
811	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
812		829
813	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
1343	case 't':	1360	case 't':
1344	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1361	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1345	{	1362	{
1346	dec->cur += 4;	1363	dec->cur += 4;
1347	#if JSON_SLOW	1364	#if JSON_SLOW
1348	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1365	json_true = get_bool ("JSON::XS::true");
1349	#endif	1366	#endif
1350	return SvREFCNT_inc (json_true);	1367	return newSVsv (json_true);
1351	}	1368	}
1352	else	1369	else
1353	ERR ("'true' expected");	1370	ERR ("'true' expected");
1354		1371
1355	break;	1372	break;
…		…
1357	case 'f':	1374	case 'f':
1358	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1375	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1359	{	1376	{
1360	dec->cur += 5;	1377	dec->cur += 5;
1361	#if JSON_SLOW	1378	#if JSON_SLOW
1362	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1379	json_false = get_bool ("JSON::XS::false");
1363	#endif	1380	#endif
1364	return SvREFCNT_inc (json_false);	1381	return newSVsv (json_false);
1365	}	1382	}
1366	else	1383	else
1367	ERR ("'false' expected");	1384	ERR ("'false' expected");
1368		1385
1369	break;	1386	break;
…		…
1396	SV *sv;	1413	SV *sv;
1397		1414
1398	SvGETMAGIC (string);	1415	SvGETMAGIC (string);
1399	SvUPGRADE (string, SVt_PV);	1416	SvUPGRADE (string, SVt_PV);
1400		1417
1401	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1418	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1419	* assertion with -DDEBUGGING, although SvCUR is documented to
		1420	* return the xpv_cur field which certainly exists after upgrading.
		1421	* according to nicholas clark, calling SvPOK fixes this.
		1422	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1423	* and hope for the best.
		1424	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1425	* assertion business is seriously broken, try yet another workaround
		1426	* for the broken -DDEBUGGING.
		1427	*/
		1428	#ifdef DEBUGGING
		1429	offset = SvOK (string) ? sv_len (string) : 0;
		1430	#else
		1431	offset = SvCUR (string);
		1432	#endif
		1433
		1434	if (offset > json->max_size && json->max_size)
1402	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1435	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1403	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1436	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1404		1437
1405	if (json->flags & F_UTF8)	1438	if (json->flags & F_UTF8)
1406	sv_utf8_downgrade (string, 0);	1439	sv_utf8_downgrade (string, 0);
1407	else	1440	else
1408	sv_utf8_upgrade (string);	1441	sv_utf8_upgrade (string);
1409		1442
1410	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1443	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1411		1444
1412	dec.json = *json;	1445	dec.json = *json;
1413	dec.cur = SvPVX (string);	1446	dec.cur = SvPVX (string);
1414	dec.end = SvEND (string);	1447	dec.end = SvEND (string);
1415	dec.err = 0;	1448	dec.err = 0;
1416	dec.depth = 0;	1449	dec.depth = 0;
1417	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1418		1450
1419	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1451	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1420	dec.json.flags \|= F_HOOK;	1452	dec.json.flags \|= F_HOOK;
1421		1453
1422	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1454	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1568	self->incr_mode = INCR_M_STR;	1600	self->incr_mode = INCR_M_STR;
1569	goto incr_m_str;	1601	goto incr_m_str;
1570		1602
1571	case '[':	1603	case '[':
1572	case '{':	1604	case '{':
1573	++self->incr_nest;	1605	if (++self->incr_nest > self->max_depth)
		1606	croak (ERR_NESTING_EXCEEDED);
1574	break;	1607	break;
1575		1608
1576	case ']':	1609	case ']':
1577	case '}':	1610	case '}':
1578	if (!--self->incr_nest)	1611	if (--self->incr_nest <= 0)
1579	goto interrupt;	1612	goto interrupt;
1580	}	1613	}
1581	}	1614	}
1582	}	1615	}
1583		1616
…		…
1607	: -1;	1640	: -1;
1608		1641
1609	json_stash = gv_stashpv ("JSON::XS" , 1);	1642	json_stash = gv_stashpv ("JSON::XS" , 1);
1610	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1643	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1611		1644
1612	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1645	json_true = get_bool ("JSON::XS::true");
1613	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1646	json_false = get_bool ("JSON::XS::false");
1614	}	1647	}
1615		1648
1616	PROTOTYPES: DISABLE	1649	PROTOTYPES: DISABLE
1617		1650
1618	void CLONE (...)	1651	void CLONE (...)
…		…
1623	void new (char *klass)	1656	void new (char *klass)
1624	PPCODE:	1657	PPCODE:
1625	{	1658	{
1626	SV *pv = NEWSV (0, sizeof (JSON));	1659	SV *pv = NEWSV (0, sizeof (JSON));
1627	SvPOK_only (pv);	1660	SvPOK_only (pv);
1628	Zero (SvPVX (pv), 1, JSON);	1661	json_init ((JSON *)SvPVX (pv));
1629	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1630	XPUSHs (sv_2mortal (sv_bless (	1662	XPUSHs (sv_2mortal (sv_bless (
1631	newRV_noinc (pv),	1663	newRV_noinc (pv),
1632	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1664	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1633	)));	1665	)));
1634	}	1666	}
…		…
1646	allow_nonref = F_ALLOW_NONREF	1678	allow_nonref = F_ALLOW_NONREF
1647	shrink = F_SHRINK	1679	shrink = F_SHRINK
1648	allow_blessed = F_ALLOW_BLESSED	1680	allow_blessed = F_ALLOW_BLESSED
1649	convert_blessed = F_CONV_BLESSED	1681	convert_blessed = F_CONV_BLESSED
1650	relaxed = F_RELAXED	1682	relaxed = F_RELAXED
		1683	allow_unknown = F_ALLOW_UNKNOWN
1651	PPCODE:	1684	PPCODE:
1652	{	1685	{
1653	if (enable)	1686	if (enable)
1654	self->flags \|= ix;	1687	self->flags \|= ix;
1655	else	1688	else
…		…
1670	get_allow_nonref = F_ALLOW_NONREF	1703	get_allow_nonref = F_ALLOW_NONREF
1671	get_shrink = F_SHRINK	1704	get_shrink = F_SHRINK
1672	get_allow_blessed = F_ALLOW_BLESSED	1705	get_allow_blessed = F_ALLOW_BLESSED
1673	get_convert_blessed = F_CONV_BLESSED	1706	get_convert_blessed = F_CONV_BLESSED
1674	get_relaxed = F_RELAXED	1707	get_relaxed = F_RELAXED
		1708	get_allow_unknown = F_ALLOW_UNKNOWN
1675	PPCODE:	1709	PPCODE:
1676	XPUSHs (boolSV (self->flags & ix));	1710	XPUSHs (boolSV (self->flags & ix));
1677		1711
1678	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1712	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1679	PPCODE:	1713	PPCODE:
1680	{	1714	self->max_depth = max_depth;
1681	UV log2 = 0;
1682
1683	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1684
1685	while ((1UL << log2) < max_depth)
1686	++log2;
1687
1688	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1689
1690	XPUSHs (ST (0));	1715	XPUSHs (ST (0));
1691	}
1692		1716
1693	U32 get_max_depth (JSON *self)	1717	U32 get_max_depth (JSON *self)
1694	CODE:	1718	CODE:
1695	RETVAL = DEC_DEPTH (self->flags);	1719	RETVAL = self->max_depth;
1696	OUTPUT:	1720	OUTPUT:
1697	RETVAL	1721	RETVAL
1698		1722
1699	void max_size (JSON *self, UV max_size = 0)	1723	void max_size (JSON *self, U32 max_size = 0)
1700	PPCODE:	1724	PPCODE:
1701	{	1725	self->max_size = max_size;
1702	UV log2 = 0;
1703
1704	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1705	if (max_size == 1) max_size = 2;
1706
1707	while ((1UL << log2) < max_size)
1708	++log2;
1709
1710	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1711
1712	XPUSHs (ST (0));	1726	XPUSHs (ST (0));
1713	}
1714		1727
1715	int get_max_size (JSON *self)	1728	int get_max_size (JSON *self)
1716	CODE:	1729	CODE:
1717	RETVAL = DEC_SIZE (self->flags);	1730	RETVAL = self->max_size;
1718	OUTPUT:	1731	OUTPUT:
1719	RETVAL	1732	RETVAL
1720		1733
1721	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1734	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1722	PPCODE:	1735	PPCODE:
…		…
1801	STRLEN offset;	1814	STRLEN offset;
1802		1815
1803	if (!INCR_DONE (self))	1816	if (!INCR_DONE (self))
1804	{	1817	{
1805	incr_parse (self);	1818	incr_parse (self);
		1819
		1820	if (self->incr_pos > self->max_size && self->max_size)
		1821	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1822	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1823
1806	if (!INCR_DONE (self))	1824	if (!INCR_DONE (self))
1807	break;	1825	break;
1808	}	1826	}
1809		1827
1810	XPUSHs (decode_json (self->incr_text, self, &offset));	1828	XPUSHs (decode_json (self->incr_text, self, &offset));
…		…
1839	self->incr_nest = 0;	1857	self->incr_nest = 0;
1840	self->incr_mode = 0;	1858	self->incr_mode = 0;
1841	}	1859	}
1842	}	1860	}
1843		1861
		1862	void incr_reset (JSON *self)
		1863	CODE:
		1864	{
		1865	SvREFCNT_dec (self->incr_text);
		1866	self->incr_text = 0;
		1867	self->incr_pos = 0;
		1868	self->incr_nest = 0;
		1869	self->incr_mode = 0;
		1870	}
		1871
1844	void DESTROY (JSON *self)	1872	void DESTROY (JSON *self)
1845	CODE:	1873	CODE:
1846	SvREFCNT_dec (self->cb_sk_object);	1874	SvREFCNT_dec (self->cb_sk_object);
1847	SvREFCNT_dec (self->cb_object);	1875	SvREFCNT_dec (self->cb_object);
1848	SvREFCNT_dec (self->incr_text);	1876	SvREFCNT_dec (self->incr_text);
…		…
1853	ALIAS:	1881	ALIAS:
1854	to_json_ = 0	1882	to_json_ = 0
1855	encode_json = F_UTF8	1883	encode_json = F_UTF8
1856	PPCODE:	1884	PPCODE:
1857	{	1885	{
1858	JSON json = { F_DEFAULT \| ix };	1886	JSON json;
		1887	json_init (&json);
		1888	json.flags \|= ix;
1859	XPUSHs (encode_json (scalar, &json));	1889	XPUSHs (encode_json (scalar, &json));
1860	}	1890	}
1861		1891
1862	void decode_json (SV *jsonstr)	1892	void decode_json (SV *jsonstr)
1863	ALIAS:	1893	ALIAS:
1864	from_json_ = 0	1894	from_json_ = 0
1865	decode_json = F_UTF8	1895	decode_json = F_UTF8
1866	PPCODE:	1896	PPCODE:
1867	{	1897	{
1868	JSON json = { F_DEFAULT \| ix };	1898	JSON json;
		1899	json_init (&json);
		1900	json.flags \|= ix;
1869	XPUSHs (decode_json (jsonstr, &json, 0));	1901	XPUSHs (decode_json (jsonstr, &json, 0));
1870	}	1902	}
1871		1903
1872		1904

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.82 by root, Wed Mar 26 02:35:45 2008 UTC vs. Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.82 by root, Wed Mar 26 02:35:45 2008 UTC vs.
Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC