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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs.
Revision 1.88 by root, Sun Jun 22 12:05:49 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)
…		…
353	static void	368	static void
354	encode_av (enc_t enc, AV av)	369	encode_av (enc_t enc, AV av)
355	{	370	{
356	int i, len = av_len (av);	371	int i, len = av_len (av);
357		372
358	if (enc->indent >= enc->maxdepth)	373	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	374	croak (ERR_NESTING_EXCEEDED);
360		375
361	encode_ch (enc, '[');	376	encode_ch (enc, '[');
362		377
363	if (len >= 0)	378	if (len >= 0)
364	{	379	{
…		…
439	static void	454	static void
440	encode_hv (enc_t enc, HV hv)	455	encode_hv (enc_t enc, HV hv)
441	{	456	{
442	HE *he;	457	HE *he;
443		458
444	if (enc->indent >= enc->maxdepth)	459	if (enc->indent >= enc->json.max_depth)
445	croak ("data structure too deep (hit recursion limit)");	460	croak (ERR_NESTING_EXCEEDED);
446		461
447	encode_ch (enc, '{');	462	encode_ch (enc, '{');
448		463
449	// for canonical output we have to sort by keys first	464	// for canonical output we have to sort by keys first
450	// actually, this is mostly due to the stupid so-called	465	// actually, this is mostly due to the stupid so-called
…		…
631		646
632	if (len == 1 && *pv == '1')	647	if (len == 1 && *pv == '1')
633	encode_str (enc, "true", 4, 0);	648	encode_str (enc, "true", 4, 0);
634	else if (len == 1 && *pv == '0')	649	else if (len == 1 && *pv == '0')
635	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);
636	else	653	else
637	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",
638	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	655	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
639	}	656	}
		657	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		658	encode_str (enc, "null", 4, 0);
640	else	659	else
641	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",
642	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	661	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
643	}	662	}
644		663
…		…
706	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	725	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
707	}	726	}
708	}	727	}
709	else if (SvROK (sv))	728	else if (SvROK (sv))
710	encode_rv (enc, SvRV (sv));	729	encode_rv (enc, SvRV (sv));
711	else if (!SvOK (sv))	730	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
712	encode_str (enc, "null", 4, 0);	731	encode_str (enc, "null", 4, 0);
713	else	732	else
714	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",
715	SvPV_nolen (sv), SvFLAGS (sv));	734	SvPV_nolen (sv), SvFLAGS (sv));
716	}	735	}
…		…
726	enc.json = *json;	745	enc.json = *json;
727	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	746	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
728	enc.cur = SvPVX (enc.sv);	747	enc.cur = SvPVX (enc.sv);
729	enc.end = SvEND (enc.sv);	748	enc.end = SvEND (enc.sv);
730	enc.indent = 0;	749	enc.indent = 0;
731	enc.maxdepth = DEC_DEPTH (enc.json.flags);
732	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	750	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
733	: enc.json.flags & F_LATIN1 ? 0x000100UL	751	: enc.json.flags & F_LATIN1 ? 0x000100UL
734	: 0x110000UL;	752	: 0x110000UL;
735		753
736	SvPOK_only (enc.sv);	754	SvPOK_only (enc.sv);
…		…
803	if (*dec->cur != ch) \	821	if (*dec->cur != ch) \
804	ERR (# ch " expected"); \	822	ERR (# ch " expected"); \
805	++dec->cur; \	823	++dec->cur; \
806	SE	824	SE
807		825
808	#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)
809	#define DEC_DEC_DEPTH --dec->depth	827	#define DEC_DEC_DEPTH --dec->depth
810		828
811	static SV decode_sv (dec_t dec);	829	static SV decode_sv (dec_t dec);
812		830
813	static signed char decode_hexdigit[256];	831	static signed char decode_hexdigit[256];
…		…
1343	case 't':	1361	case 't':
1344	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1362	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1345	{	1363	{
1346	dec->cur += 4;	1364	dec->cur += 4;
1347	#if JSON_SLOW	1365	#if JSON_SLOW
1348	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1366	json_true = get_bool ("JSON::XS::true");
1349	#endif	1367	#endif
1350	return SvREFCNT_inc (json_true);	1368	return newSVsv (json_true);
1351	}	1369	}
1352	else	1370	else
1353	ERR ("'true' expected");	1371	ERR ("'true' expected");
1354		1372
1355	break;	1373	break;
…		…
1357	case 'f':	1375	case 'f':
1358	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1376	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1359	{	1377	{
1360	dec->cur += 5;	1378	dec->cur += 5;
1361	#if JSON_SLOW	1379	#if JSON_SLOW
1362	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1380	json_false = get_bool ("JSON::XS::false");
1363	#endif	1381	#endif
1364	return SvREFCNT_inc (json_false);	1382	return newSVsv (json_false);
1365	}	1383	}
1366	else	1384	else
1367	ERR ("'false' expected");	1385	ERR ("'false' expected");
1368		1386
1369	break;	1387	break;
…		…
1396	SV *sv;	1414	SV *sv;
1397		1415
1398	SvGETMAGIC (string);	1416	SvGETMAGIC (string);
1399	SvUPGRADE (string, SVt_PV);	1417	SvUPGRADE (string, SVt_PV);
1400		1418
1401	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	*/
		1424	SvPOK (string);
		1425
		1426	if (SvCUR (string) > json->max_size && json->max_size)
1402	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1427	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));	1428	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1404		1429
1405	if (json->flags & F_UTF8)	1430	if (json->flags & F_UTF8)
1406	sv_utf8_downgrade (string, 0);	1431	sv_utf8_downgrade (string, 0);
1407	else	1432	else
1408	sv_utf8_upgrade (string);	1433	sv_utf8_upgrade (string);
1409		1434
1410	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1435	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1411		1436
1412	dec.json = *json;	1437	dec.json = *json;
1413	dec.cur = SvPVX (string);	1438	dec.cur = SvPVX (string);
1414	dec.end = SvEND (string);	1439	dec.end = SvEND (string);
1415	dec.err = 0;	1440	dec.err = 0;
1416	dec.depth = 0;	1441	dec.depth = 0;
1417	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1418		1442
1419	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1443	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1420	dec.json.flags \|= F_HOOK;	1444	dec.json.flags \|= F_HOOK;
1421		1445
1422	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1446	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1568	self->incr_mode = INCR_M_STR;	1592	self->incr_mode = INCR_M_STR;
1569	goto incr_m_str;	1593	goto incr_m_str;
1570		1594
1571	case '[':	1595	case '[':
1572	case '{':	1596	case '{':
1573	++self->incr_nest;	1597	if (++self->incr_nest > self->max_depth)
		1598	croak (ERR_NESTING_EXCEEDED);
1574	break;	1599	break;
1575		1600
1576	case ']':	1601	case ']':
1577	case '}':	1602	case '}':
1578	if (!--self->incr_nest)	1603	if (--self->incr_nest <= 0)
1579	goto interrupt;	1604	goto interrupt;
1580	}	1605	}
1581	}	1606	}
1582	}	1607	}
1583		1608
…		…
1607	: -1;	1632	: -1;
1608		1633
1609	json_stash = gv_stashpv ("JSON::XS" , 1);	1634	json_stash = gv_stashpv ("JSON::XS" , 1);
1610	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1635	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1611		1636
1612	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1637	json_true = get_bool ("JSON::XS::true");
1613	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1638	json_false = get_bool ("JSON::XS::false");
1614	}	1639	}
1615		1640
1616	PROTOTYPES: DISABLE	1641	PROTOTYPES: DISABLE
1617		1642
1618	void CLONE (...)	1643	void CLONE (...)
…		…
1623	void new (char *klass)	1648	void new (char *klass)
1624	PPCODE:	1649	PPCODE:
1625	{	1650	{
1626	SV *pv = NEWSV (0, sizeof (JSON));	1651	SV *pv = NEWSV (0, sizeof (JSON));
1627	SvPOK_only (pv);	1652	SvPOK_only (pv);
1628	Zero (SvPVX (pv), 1, JSON);	1653	json_init ((JSON *)SvPVX (pv));
1629	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1630	XPUSHs (sv_2mortal (sv_bless (	1654	XPUSHs (sv_2mortal (sv_bless (
1631	newRV_noinc (pv),	1655	newRV_noinc (pv),
1632	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1656	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1633	)));	1657	)));
1634	}	1658	}
…		…
1646	allow_nonref = F_ALLOW_NONREF	1670	allow_nonref = F_ALLOW_NONREF
1647	shrink = F_SHRINK	1671	shrink = F_SHRINK
1648	allow_blessed = F_ALLOW_BLESSED	1672	allow_blessed = F_ALLOW_BLESSED
1649	convert_blessed = F_CONV_BLESSED	1673	convert_blessed = F_CONV_BLESSED
1650	relaxed = F_RELAXED	1674	relaxed = F_RELAXED
		1675	allow_unknown = F_ALLOW_UNKNOWN
1651	PPCODE:	1676	PPCODE:
1652	{	1677	{
1653	if (enable)	1678	if (enable)
1654	self->flags \|= ix;	1679	self->flags \|= ix;
1655	else	1680	else
…		…
1670	get_allow_nonref = F_ALLOW_NONREF	1695	get_allow_nonref = F_ALLOW_NONREF
1671	get_shrink = F_SHRINK	1696	get_shrink = F_SHRINK
1672	get_allow_blessed = F_ALLOW_BLESSED	1697	get_allow_blessed = F_ALLOW_BLESSED
1673	get_convert_blessed = F_CONV_BLESSED	1698	get_convert_blessed = F_CONV_BLESSED
1674	get_relaxed = F_RELAXED	1699	get_relaxed = F_RELAXED
		1700	get_allow_unknown = F_ALLOW_UNKNOWN
1675	PPCODE:	1701	PPCODE:
1676	XPUSHs (boolSV (self->flags & ix));	1702	XPUSHs (boolSV (self->flags & ix));
1677		1703
1678	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1704	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1679	PPCODE:	1705	PPCODE:
1680	{	1706	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));	1707	XPUSHs (ST (0));
1691	}
1692		1708
1693	U32 get_max_depth (JSON *self)	1709	U32 get_max_depth (JSON *self)
1694	CODE:	1710	CODE:
1695	RETVAL = DEC_DEPTH (self->flags);	1711	RETVAL = self->max_depth;
1696	OUTPUT:	1712	OUTPUT:
1697	RETVAL	1713	RETVAL
1698		1714
1699	void max_size (JSON *self, UV max_size = 0)	1715	void max_size (JSON *self, U32 max_size = 0)
1700	PPCODE:	1716	PPCODE:
1701	{	1717	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));	1718	XPUSHs (ST (0));
1713	}
1714		1719
1715	int get_max_size (JSON *self)	1720	int get_max_size (JSON *self)
1716	CODE:	1721	CODE:
1717	RETVAL = DEC_SIZE (self->flags);	1722	RETVAL = self->max_size;
1718	OUTPUT:	1723	OUTPUT:
1719	RETVAL	1724	RETVAL
1720		1725
1721	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1726	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1722	PPCODE:	1727	PPCODE:
…		…
1798	if (GIMME_V != G_VOID)	1803	if (GIMME_V != G_VOID)
1799	do	1804	do
1800	{	1805	{
1801	STRLEN offset;	1806	STRLEN offset;
1802		1807
1803	incr_parse (self);
1804
1805	if (!INCR_DONE (self))	1808	if (!INCR_DONE (self))
		1809	{
		1810	incr_parse (self);
		1811
		1812	if (self->incr_pos > self->max_size && self->max_size)
		1813	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1814	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1815
		1816	if (!INCR_DONE (self))
1806	break;	1817	break;
		1818	}
1807		1819
1808	XPUSHs (decode_json (self->incr_text, self, &offset));	1820	XPUSHs (decode_json (self->incr_text, self, &offset));
1809		1821
1810	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);	1822	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1811	self->incr_pos -= offset;	1823	self->incr_pos -= offset;
…		…
1818	SV incr_text (JSON self)	1830	SV incr_text (JSON self)
1819	ATTRS: lvalue	1831	ATTRS: lvalue
1820	CODE:	1832	CODE:
1821	{	1833	{
1822	if (self->incr_pos)	1834	if (self->incr_pos)
1823	croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D	1835	croak ("incr_text can not be called when the incremental parser already started parsing");
1824		1836
1825	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	1837	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1826	}	1838	}
1827	OUTPUT:	1839	OUTPUT:
1828	RETVAL	1840	RETVAL
		1841
		1842	void incr_skip (JSON *self)
		1843	CODE:
		1844	{
		1845	if (self->incr_pos)
		1846	{
		1847	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1848	self->incr_pos = 0;
		1849	self->incr_nest = 0;
		1850	self->incr_mode = 0;
		1851	}
		1852	}
		1853
		1854	void incr_reset (JSON *self)
		1855	CODE:
		1856	{
		1857	SvREFCNT_dec (self->incr_text);
		1858	self->incr_text = 0;
		1859	self->incr_pos = 0;
		1860	self->incr_nest = 0;
		1861	self->incr_mode = 0;
		1862	}
1829		1863
1830	void DESTROY (JSON *self)	1864	void DESTROY (JSON *self)
1831	CODE:	1865	CODE:
1832	SvREFCNT_dec (self->cb_sk_object);	1866	SvREFCNT_dec (self->cb_sk_object);
1833	SvREFCNT_dec (self->cb_object);	1867	SvREFCNT_dec (self->cb_object);
…		…
1839	ALIAS:	1873	ALIAS:
1840	to_json_ = 0	1874	to_json_ = 0
1841	encode_json = F_UTF8	1875	encode_json = F_UTF8
1842	PPCODE:	1876	PPCODE:
1843	{	1877	{
1844	JSON json = { F_DEFAULT \| ix };	1878	JSON json;
		1879	json_init (&json);
		1880	json.flags \|= ix;
1845	XPUSHs (encode_json (scalar, &json));	1881	XPUSHs (encode_json (scalar, &json));
1846	}	1882	}
1847		1883
1848	void decode_json (SV *jsonstr)	1884	void decode_json (SV *jsonstr)
1849	ALIAS:	1885	ALIAS:
1850	from_json_ = 0	1886	from_json_ = 0
1851	decode_json = F_UTF8	1887	decode_json = F_UTF8
1852	PPCODE:	1888	PPCODE:
1853	{	1889	{
1854	JSON json = { F_DEFAULT \| ix };	1890	JSON json;
		1891	json_init (&json);
		1892	json.flags \|= ix;
1855	XPUSHs (decode_json (jsonstr, &json, 0));	1893	XPUSHs (decode_json (jsonstr, &json, 0));
1856	}	1894	}
1857		1895
1858		1896

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs. Revision 1.88 by root, Sun Jun 22 12:05:49 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs.
Revision 1.88 by root, Sun Jun 22 12:05:49 2008 UTC