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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.94 by root, Thu Nov 20 03:59:53 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)
181	{	196	{
182	if (expect_false (enc->cur + len >= enc->end))	197	if (expect_false (enc->cur + len >= enc->end))
183	{	198	{
184	STRLEN cur = enc->cur - SvPVX (enc->sv);	199	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185	SvGROW (enc->sv, cur + len + 1);	200	SvGROW (enc->sv, cur + len + 1);
186	enc->cur = SvPVX (enc->sv) + cur;	201	enc->cur = SvPVX (enc->sv) + cur;
187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	202	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188	}	203	}
189	}	204	}
…		…
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	{
…		…
438		452
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	int count;
444		457
445	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
446	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
447		460
448	encode_ch (enc, '{');	461	encode_ch (enc, '{');
449		462
450	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
451	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
452	// security workaround added somewhere in 5.8.x.	465	// security workaround added somewhere in 5.8.x
453	// that randomises hash orderings	466	// that randomises hash orderings
454	if (enc->json.flags & F_CANONICAL)	467	if (enc->json.flags & F_CANONICAL)
455	{	468	{
456	int count = hv_iterinit (hv);	469	int count = hv_iterinit (hv);
457		470
…		…
632		645
633	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
634	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
635	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
636	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);
637	else	652	else
638	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",
639	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
640	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
641	else	658	else
642	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",
643	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644	}	661	}
645		662
…		…
707	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
708	}	725	}
709	}	726	}
710	else if (SvROK (sv))	727	else if (SvROK (sv))
711	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
712	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
713	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
714	else	731	else
715	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",
716	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
717	}	734	}
…		…
727	enc.json = *json;	744	enc.json = *json;
728	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
729	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
730	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
731	enc.indent = 0;	748	enc.indent = 0;
732	enc.maxdepth = DEC_DEPTH (enc.json.flags);
733	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	749	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
734	: enc.json.flags & F_LATIN1 ? 0x000100UL	750	: enc.json.flags & F_LATIN1 ? 0x000100UL
735	: 0x110000UL;	751	: 0x110000UL;
736		752
737	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
…		…
804	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
805	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
806	++dec->cur; \	822	++dec->cur; \
807	SE	823	SE
808		824
809	#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)
810	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
811		827
812	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
813		829
814	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
1344	case 't':	1360	case 't':
1345	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1361	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1346	{	1362	{
1347	dec->cur += 4;	1363	dec->cur += 4;
1348	#if JSON_SLOW	1364	#if JSON_SLOW
1349	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1365	json_true = get_bool ("JSON::XS::true");
1350	#endif	1366	#endif
1351	return SvREFCNT_inc (json_true);	1367	return newSVsv (json_true);
1352	}	1368	}
1353	else	1369	else
1354	ERR ("'true' expected");	1370	ERR ("'true' expected");
1355		1371
1356	break;	1372	break;
…		…
1358	case 'f':	1374	case 'f':
1359	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1375	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1360	{	1376	{
1361	dec->cur += 5;	1377	dec->cur += 5;
1362	#if JSON_SLOW	1378	#if JSON_SLOW
1363	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1379	json_false = get_bool ("JSON::XS::false");
1364	#endif	1380	#endif
1365	return SvREFCNT_inc (json_false);	1381	return newSVsv (json_false);
1366	}	1382	}
1367	else	1383	else
1368	ERR ("'false' expected");	1384	ERR ("'false' expected");
1369		1385
1370	break;	1386	break;
…		…
1394	{	1410	{
1395	dec_t dec;	1411	dec_t dec;
1396	STRLEN offset;	1412	STRLEN offset;
1397	SV *sv;	1413	SV *sv;
1398		1414
		1415	/* work around bugs in 5.10 where manipulating magic values
		1416	* will perl ignore the magic in subsequent accesses
		1417	*/
1399	SvGETMAGIC (string);	1418	/SvGETMAGIC (string);/
		1419	if (SvMAGICAL (string))
		1420	string = sv_2mortal (newSVsv (string));
		1421
1400	SvUPGRADE (string, SVt_PV);	1422	SvUPGRADE (string, SVt_PV);
1401		1423
1402	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1424	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1425	* assertion with -DDEBUGGING, although SvCUR is documented to
		1426	* return the xpv_cur field which certainly exists after upgrading.
		1427	* according to nicholas clark, calling SvPOK fixes this.
		1428	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1429	* and hope for the best.
		1430	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1431	* assertion business is seriously broken, try yet another workaround
		1432	* for the broken -DDEBUGGING.
		1433	*/
		1434	#ifdef DEBUGGING
		1435	offset = SvOK (string) ? sv_len (string) : 0;
		1436	#else
		1437	offset = SvCUR (string);
		1438	#endif
		1439
		1440	if (offset > json->max_size && json->max_size)
1403	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1441	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1404	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1442	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1405		1443
1406	if (json->flags & F_UTF8)	1444	if (json->flags & F_UTF8)
1407	sv_utf8_downgrade (string, 0);	1445	sv_utf8_downgrade (string, 0);
1408	else	1446	else
1409	sv_utf8_upgrade (string);	1447	sv_utf8_upgrade (string);
1410		1448
1411	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1449	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1412		1450
1413	dec.json = *json;	1451	dec.json = *json;
1414	dec.cur = SvPVX (string);	1452	dec.cur = SvPVX (string);
1415	dec.end = SvEND (string);	1453	dec.end = SvEND (string);
1416	dec.err = 0;	1454	dec.err = 0;
1417	dec.depth = 0;	1455	dec.depth = 0;
1418	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1419		1456
1420	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1457	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1421	dec.json.flags \|= F_HOOK;	1458	dec.json.flags \|= F_HOOK;
1422		1459
1423	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1460	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1569	self->incr_mode = INCR_M_STR;	1606	self->incr_mode = INCR_M_STR;
1570	goto incr_m_str;	1607	goto incr_m_str;
1571		1608
1572	case '[':	1609	case '[':
1573	case '{':	1610	case '{':
1574	++self->incr_nest;	1611	if (++self->incr_nest > self->max_depth)
		1612	croak (ERR_NESTING_EXCEEDED);
1575	break;	1613	break;
1576		1614
1577	case ']':	1615	case ']':
1578	case '}':	1616	case '}':
1579	if (!--self->incr_nest)	1617	if (--self->incr_nest <= 0)
1580	goto interrupt;	1618	goto interrupt;
1581	}	1619	}
1582	}	1620	}
1583	}	1621	}
1584		1622
…		…
1608	: -1;	1646	: -1;
1609		1647
1610	json_stash = gv_stashpv ("JSON::XS" , 1);	1648	json_stash = gv_stashpv ("JSON::XS" , 1);
1611	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1649	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1612		1650
1613	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1651	json_true = get_bool ("JSON::XS::true");
1614	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1652	json_false = get_bool ("JSON::XS::false");
1615	}	1653	}
1616		1654
1617	PROTOTYPES: DISABLE	1655	PROTOTYPES: DISABLE
1618		1656
1619	void CLONE (...)	1657	void CLONE (...)
…		…
1624	void new (char *klass)	1662	void new (char *klass)
1625	PPCODE:	1663	PPCODE:
1626	{	1664	{
1627	SV *pv = NEWSV (0, sizeof (JSON));	1665	SV *pv = NEWSV (0, sizeof (JSON));
1628	SvPOK_only (pv);	1666	SvPOK_only (pv);
1629	Zero (SvPVX (pv), 1, JSON);	1667	json_init ((JSON *)SvPVX (pv));
1630	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1631	XPUSHs (sv_2mortal (sv_bless (	1668	XPUSHs (sv_2mortal (sv_bless (
1632	newRV_noinc (pv),	1669	newRV_noinc (pv),
1633	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1670	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1634	)));	1671	)));
1635	}	1672	}
…		…
1647	allow_nonref = F_ALLOW_NONREF	1684	allow_nonref = F_ALLOW_NONREF
1648	shrink = F_SHRINK	1685	shrink = F_SHRINK
1649	allow_blessed = F_ALLOW_BLESSED	1686	allow_blessed = F_ALLOW_BLESSED
1650	convert_blessed = F_CONV_BLESSED	1687	convert_blessed = F_CONV_BLESSED
1651	relaxed = F_RELAXED	1688	relaxed = F_RELAXED
		1689	allow_unknown = F_ALLOW_UNKNOWN
1652	PPCODE:	1690	PPCODE:
1653	{	1691	{
1654	if (enable)	1692	if (enable)
1655	self->flags \|= ix;	1693	self->flags \|= ix;
1656	else	1694	else
…		…
1671	get_allow_nonref = F_ALLOW_NONREF	1709	get_allow_nonref = F_ALLOW_NONREF
1672	get_shrink = F_SHRINK	1710	get_shrink = F_SHRINK
1673	get_allow_blessed = F_ALLOW_BLESSED	1711	get_allow_blessed = F_ALLOW_BLESSED
1674	get_convert_blessed = F_CONV_BLESSED	1712	get_convert_blessed = F_CONV_BLESSED
1675	get_relaxed = F_RELAXED	1713	get_relaxed = F_RELAXED
		1714	get_allow_unknown = F_ALLOW_UNKNOWN
1676	PPCODE:	1715	PPCODE:
1677	XPUSHs (boolSV (self->flags & ix));	1716	XPUSHs (boolSV (self->flags & ix));
1678		1717
1679	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1718	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1680	PPCODE:	1719	PPCODE:
1681	{	1720	self->max_depth = max_depth;
1682	UV log2 = 0;
1683
1684	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1685
1686	while ((1UL << log2) < max_depth)
1687	++log2;
1688
1689	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1690
1691	XPUSHs (ST (0));	1721	XPUSHs (ST (0));
1692	}
1693		1722
1694	U32 get_max_depth (JSON *self)	1723	U32 get_max_depth (JSON *self)
1695	CODE:	1724	CODE:
1696	RETVAL = DEC_DEPTH (self->flags);	1725	RETVAL = self->max_depth;
1697	OUTPUT:	1726	OUTPUT:
1698	RETVAL	1727	RETVAL
1699		1728
1700	void max_size (JSON *self, UV max_size = 0)	1729	void max_size (JSON *self, U32 max_size = 0)
1701	PPCODE:	1730	PPCODE:
1702	{	1731	self->max_size = max_size;
1703	UV log2 = 0;
1704
1705	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1706	if (max_size == 1) max_size = 2;
1707
1708	while ((1UL << log2) < max_size)
1709	++log2;
1710
1711	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1712
1713	XPUSHs (ST (0));	1732	XPUSHs (ST (0));
1714	}
1715		1733
1716	int get_max_size (JSON *self)	1734	int get_max_size (JSON *self)
1717	CODE:	1735	CODE:
1718	RETVAL = DEC_SIZE (self->flags);	1736	RETVAL = self->max_size;
1719	OUTPUT:	1737	OUTPUT:
1720	RETVAL	1738	RETVAL
1721		1739
1722	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1740	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1723	PPCODE:	1741	PPCODE:
…		…
1799	if (GIMME_V != G_VOID)	1817	if (GIMME_V != G_VOID)
1800	do	1818	do
1801	{	1819	{
1802	STRLEN offset;	1820	STRLEN offset;
1803		1821
1804	incr_parse (self);
1805
1806	if (!INCR_DONE (self))	1822	if (!INCR_DONE (self))
		1823	{
		1824	incr_parse (self);
		1825
		1826	if (self->incr_pos > self->max_size && self->max_size)
		1827	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1828	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1829
		1830	if (!INCR_DONE (self))
1807	break;	1831	break;
		1832	}
1808		1833
1809	XPUSHs (decode_json (self->incr_text, self, &offset));	1834	XPUSHs (decode_json (self->incr_text, self, &offset));
1810		1835
1811	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);	1836	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1812	self->incr_pos -= offset;	1837	self->incr_pos -= offset;
…		…
1819	SV incr_text (JSON self)	1844	SV incr_text (JSON self)
1820	ATTRS: lvalue	1845	ATTRS: lvalue
1821	CODE:	1846	CODE:
1822	{	1847	{
1823	if (self->incr_pos)	1848	if (self->incr_pos)
1824	croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D	1849	croak ("incr_text can not be called when the incremental parser already started parsing");
1825		1850
1826	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	1851	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1827	}	1852	}
1828	OUTPUT:	1853	OUTPUT:
1829	RETVAL	1854	RETVAL
		1855
		1856	void incr_skip (JSON *self)
		1857	CODE:
		1858	{
		1859	if (self->incr_pos)
		1860	{
		1861	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1862	self->incr_pos = 0;
		1863	self->incr_nest = 0;
		1864	self->incr_mode = 0;
		1865	}
		1866	}
		1867
		1868	void incr_reset (JSON *self)
		1869	CODE:
		1870	{
		1871	SvREFCNT_dec (self->incr_text);
		1872	self->incr_text = 0;
		1873	self->incr_pos = 0;
		1874	self->incr_nest = 0;
		1875	self->incr_mode = 0;
		1876	}
1830		1877
1831	void DESTROY (JSON *self)	1878	void DESTROY (JSON *self)
1832	CODE:	1879	CODE:
1833	SvREFCNT_dec (self->cb_sk_object);	1880	SvREFCNT_dec (self->cb_sk_object);
1834	SvREFCNT_dec (self->cb_object);	1881	SvREFCNT_dec (self->cb_object);
…		…
1840	ALIAS:	1887	ALIAS:
1841	to_json_ = 0	1888	to_json_ = 0
1842	encode_json = F_UTF8	1889	encode_json = F_UTF8
1843	PPCODE:	1890	PPCODE:
1844	{	1891	{
1845	JSON json = { F_DEFAULT \| ix };	1892	JSON json;
		1893	json_init (&json);
		1894	json.flags \|= ix;
1846	XPUSHs (encode_json (scalar, &json));	1895	XPUSHs (encode_json (scalar, &json));
1847	}	1896	}
1848		1897
1849	void decode_json (SV *jsonstr)	1898	void decode_json (SV *jsonstr)
1850	ALIAS:	1899	ALIAS:
1851	from_json_ = 0	1900	from_json_ = 0
1852	decode_json = F_UTF8	1901	decode_json = F_UTF8
1853	PPCODE:	1902	PPCODE:
1854	{	1903	{
1855	JSON json = { F_DEFAULT \| ix };	1904	JSON json;
		1905	json_init (&json);
		1906	json.flags \|= ix;
1856	XPUSHs (decode_json (jsonstr, &json, 0));	1907	XPUSHs (decode_json (jsonstr, &json, 0));
1857	}	1908	}
1858		1909
1859		1910

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs. Revision 1.94 by root, Thu Nov 20 03:59:53 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.94 by root, Thu Nov 20 03:59:53 2008 UTC