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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.75 by root, Wed Mar 19 15:37:54 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
…		…
78	#endif	72	#endif
79		73
80	static HV json_stash, json_boolean_stash; // JSON::XS::	74	static HV json_stash, json_boolean_stash; // JSON::XS::
81	static SV json_true, json_false;	75	static SV json_true, json_false;
82		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
83	typedef struct {	86	typedef struct {
84	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
85	SV *cb_object;	91	SV *cb_object;
86	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;
87	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
88		107
89	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
90	// utility functions	109	// utility functions
91		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
92	INLINE void	122	INLINE void
93	shrink (SV *sv)	123	shrink (SV *sv)
94	{	124	{
95	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
96	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
97	{	128	{
98	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
99	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
100	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
155	char *cur; // SvPVX (sv) + current output position	186	char *cur; // SvPVX (sv) + current output position
156	char *end; // SvEND (sv)	187	char *end; // SvEND (sv)
157	SV *sv; // result scalar	188	SV *sv; // result scalar
158	JSON json;	189	JSON json;
159	U32 indent; // indentation level	190	U32 indent; // indentation level
160	U32 maxdepth; // max. indentation/recursion level
161	UV limit; // escape character values >= this value when encoding	191	UV limit; // escape character values >= this value when encoding
162	} enc_t;	192	} enc_t;
163		193
164	INLINE void	194	INLINE void
165	need (enc_t *enc, STRLEN len)	195	need (enc_t *enc, STRLEN len)
…		…
250	(int)((uch - 0x10000) % 0x400 + 0xDC00));	280	(int)((uch - 0x10000) % 0x400 + 0xDC00));
251	enc->cur += 12;	281	enc->cur += 12;
252	}	282	}
253	else	283	else
254	{	284	{
255	static char hexdigit [16] = "0123456789abcdef";
256	need (enc, len += 5);	285	need (enc, len += 5);
257	*enc->cur++ = '\\';	286	*enc->cur++ = '\\';
258	*enc->cur++ = 'u';	287	*enc->cur++ = 'u';
259	*enc->cur++ = hexdigit [ uch >> 12 ];	288	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
260	*enc->cur++ = hexdigit [(uch >> 8) & 15];	289	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261	*enc->cur++ = hexdigit [(uch >> 4) & 15];	290	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262	*enc->cur++ = hexdigit [(uch >> 0) & 15];	291	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263	}	292	}
264		293
265	str += clen;	294	str += clen;
266	}	295	}
267	else if (enc->json.flags & F_LATIN1)	296	else if (enc->json.flags & F_LATIN1)
…		…
338	static void	367	static void
339	encode_av (enc_t enc, AV av)	368	encode_av (enc_t enc, AV av)
340	{	369	{
341	int i, len = av_len (av);	370	int i, len = av_len (av);
342		371
343	if (enc->indent >= enc->maxdepth)	372	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	373	croak (ERR_NESTING_EXCEEDED);
345		374
346	encode_ch (enc, '[');	375	encode_ch (enc, '[');
347		376
348	if (len >= 0)	377	if (len >= 0)
349	{	378	{
…		…
423		452
424	static void	453	static void
425	encode_hv (enc_t enc, HV hv)	454	encode_hv (enc_t enc, HV hv)
426	{	455	{
427	HE *he;	456	HE *he;
428	int count;
429		457
430	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
432		460
433	encode_ch (enc, '{');	461	encode_ch (enc, '{');
434		462
435	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
…		…
617		645
618	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
621	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);
622	else	652	else
623	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",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
626	else	658	else
627	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",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	661	}
630		662
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	725	}
694	}	726	}
695	else if (SvROK (sv))	727	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
699	else	731	else
700	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",
701	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
702	}	734	}
…		…
712	enc.json = *json;	744	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	748	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	749	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	750	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	751	: 0x110000UL;
721		752
722	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
…		…
789	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
791	++dec->cur; \	822	++dec->cur; \
792	SE	823	SE
793		824
794	#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)
795	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
796		827
797	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
798		829
799	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
1171	char *p = dec->cur;	1202	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1203	char *e = p + 24; // only try up to 24 bytes
1173		1204
1174	for (;;)	1205	for (;;)
1175	{	1206	{
1176	// the >= 0x80 is true on most architectures	1207	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1208	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1209	{
1179	// slow path, back up and use decode_str	1210	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1211	SV *key = decode_str (dec);
1181	if (!key)	1212	if (!key)
…		…
1329	case 't':	1360	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1361	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1362	{
1332	dec->cur += 4;	1363	dec->cur += 4;
1333	#if JSON_SLOW	1364	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1365	json_true = get_bool ("JSON::XS::true");
1335	#endif	1366	#endif
1336	return SvREFCNT_inc (json_true);	1367	return newSVsv (json_true);
1337	}	1368	}
1338	else	1369	else
1339	ERR ("'true' expected");	1370	ERR ("'true' expected");
1340		1371
1341	break;	1372	break;
…		…
1343	case 'f':	1374	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1375	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1376	{
1346	dec->cur += 5;	1377	dec->cur += 5;
1347	#if JSON_SLOW	1378	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1379	json_false = get_bool ("JSON::XS::false");
1349	#endif	1380	#endif
1350	return SvREFCNT_inc (json_false);	1381	return newSVsv (json_false);
1351	}	1382	}
1352	else	1383	else
1353	ERR ("'false' expected");	1384	ERR ("'false' expected");
1354		1385
1355	break;	1386	break;
…		…
1373	fail:	1404	fail:
1374	return 0;	1405	return 0;
1375	}	1406	}
1376		1407
1377	static SV *	1408	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1409	decode_json (SV string, JSON json, STRLEN *offset_return)
1379	{	1410	{
1380	dec_t dec;	1411	dec_t dec;
1381	UV offset;	1412	STRLEN offset;
1382	SV *sv;	1413	SV *sv;
1383		1414
1384	SvGETMAGIC (string);	1415	SvGETMAGIC (string);
1385	SvUPGRADE (string, SVt_PV);	1416	SvUPGRADE (string, SVt_PV);
1386		1417
1387	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)
1388	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",
1389	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1436	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1390		1437
1391	if (json->flags & F_UTF8)	1438	if (json->flags & F_UTF8)
1392	sv_utf8_downgrade (string, 0);	1439	sv_utf8_downgrade (string, 0);
1393	else	1440	else
1394	sv_utf8_upgrade (string);	1441	sv_utf8_upgrade (string);
1395		1442
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1443	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1444
1398	dec.json = *json;	1445	dec.json = *json;
1399	dec.cur = SvPVX (string);	1446	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1447	dec.end = SvEND (string);
1401	dec.err = 0;	1448	dec.err = 0;
1402	dec.depth = 0;	1449	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1450
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1451	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1452	dec.json.flags \|= F_HOOK;
1407		1453
1408	*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
…		…
1459		1505
1460	return sv;	1506	return sv;
1461	}	1507	}
1462		1508
1463	/////////////////////////////////////////////////////////////////////////////	1509	/////////////////////////////////////////////////////////////////////////////
		1510	// incremental parser
		1511
		1512	static void
		1513	incr_parse (JSON *self)
		1514	{
		1515	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1516
		1517	for (;;)
		1518	{
		1519	//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
		1520	switch (self->incr_mode)
		1521	{
		1522	// only used for intiial whitespace skipping
		1523	case INCR_M_WS:
		1524	for (;;)
		1525	{
		1526	if (*p > 0x20)
		1527	{
		1528	self->incr_mode = INCR_M_JSON;
		1529	goto incr_m_json;
		1530	}
		1531	else if (!*p)
		1532	goto interrupt;
		1533
		1534	++p;
		1535	}
		1536
		1537	// skip a single char inside a string (for \\-processing)
		1538	case INCR_M_BS:
		1539	if (!*p)
		1540	goto interrupt;
		1541
		1542	++p;
		1543	self->incr_mode = INCR_M_STR;
		1544	goto incr_m_str;
		1545
		1546	// inside a string
		1547	case INCR_M_STR:
		1548	incr_m_str:
		1549	for (;;)
		1550	{
		1551	if (*p == '"')
		1552	{
		1553	++p;
		1554	self->incr_mode = INCR_M_JSON;
		1555
		1556	if (!self->incr_nest)
		1557	goto interrupt;
		1558
		1559	goto incr_m_json;
		1560	}
		1561	else if (*p == '\\')
		1562	{
		1563	++p; // "virtually" consumes character after \
		1564
		1565	if (!*p) // if at end of string we have to switch modes
		1566	{
		1567	self->incr_mode = INCR_M_BS;
		1568	goto interrupt;
		1569	}
		1570	}
		1571	else if (!*p)
		1572	goto interrupt;
		1573
		1574	++p;
		1575	}
		1576
		1577	// after initial ws, outside string
		1578	case INCR_M_JSON:
		1579	incr_m_json:
		1580	for (;;)
		1581	{
		1582	switch (*p++)
		1583	{
		1584	case 0:
		1585	--p;
		1586	goto interrupt;
		1587
		1588	case 0x09:
		1589	case 0x0a:
		1590	case 0x0d:
		1591	case 0x20:
		1592	if (!self->incr_nest)
		1593	{
		1594	--p; // do not eat the whitespace, let the next round do it
		1595	goto interrupt;
		1596	}
		1597	break;
		1598
		1599	case '"':
		1600	self->incr_mode = INCR_M_STR;
		1601	goto incr_m_str;
		1602
		1603	case '[':
		1604	case '{':
		1605	if (++self->incr_nest > self->max_depth)
		1606	croak (ERR_NESTING_EXCEEDED);
		1607	break;
		1608
		1609	case ']':
		1610	case '}':
		1611	if (--self->incr_nest <= 0)
		1612	goto interrupt;
		1613	}
		1614	}
		1615	}
		1616
		1617	modechange:
		1618	;
		1619	}
		1620
		1621	interrupt:
		1622	self->incr_pos = p - SvPVX (self->incr_text);
		1623	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1624	}
		1625
		1626	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1627	// XS interface functions
1465		1628
1466	MODULE = JSON::XS PACKAGE = JSON::XS	1629	MODULE = JSON::XS PACKAGE = JSON::XS
1467		1630
1468	BOOT:	1631	BOOT:
…		…
1477	: -1;	1640	: -1;
1478		1641
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1642	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1643	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1644
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1645	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1646	json_false = get_bool ("JSON::XS::false");
1484	}	1647	}
1485		1648
1486	PROTOTYPES: DISABLE	1649	PROTOTYPES: DISABLE
1487		1650
1488	void CLONE (...)	1651	void CLONE (...)
…		…
1493	void new (char *klass)	1656	void new (char *klass)
1494	PPCODE:	1657	PPCODE:
1495	{	1658	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1659	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1660	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1661	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1662	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1663	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1664	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1665	)));
1504	}	1666	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1678	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1679	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1680	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1681	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1682	relaxed = F_RELAXED
		1683	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1684	PPCODE:
1522	{	1685	{
1523	if (enable)	1686	if (enable)
1524	self->flags \|= ix;	1687	self->flags \|= ix;
1525	else	1688	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1703	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1704	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1705	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1706	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1707	get_relaxed = F_RELAXED
		1708	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1709	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1710	XPUSHs (boolSV (self->flags & ix));
1547		1711
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1712	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1713	PPCODE:
1550	{	1714	self->max_depth = max_depth;
1551	UV log2 = 0;
1552
1553	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555	while ((1UL << log2) < max_depth)
1556	++log2;
1557
1558	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1559
1560	XPUSHs (ST (0));	1715	XPUSHs (ST (0));
1561	}
1562		1716
1563	U32 get_max_depth (JSON *self)	1717	U32 get_max_depth (JSON *self)
1564	CODE:	1718	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1719	RETVAL = self->max_depth;
1566	OUTPUT:	1720	OUTPUT:
1567	RETVAL	1721	RETVAL
1568		1722
1569	void max_size (JSON *self, UV max_size = 0)	1723	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1724	PPCODE:
1571	{	1725	self->max_size = max_size;
1572	UV log2 = 0;
1573
1574	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1575	if (max_size == 1) max_size = 2;
1576
1577	while ((1UL << log2) < max_size)
1578	++log2;
1579
1580	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1581
1582	XPUSHs (ST (0));	1726	XPUSHs (ST (0));
1583	}
1584		1727
1585	int get_max_size (JSON *self)	1728	int get_max_size (JSON *self)
1586	CODE:	1729	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1730	RETVAL = self->max_size;
1588	OUTPUT:	1731	OUTPUT:
1589	RETVAL	1732	RETVAL
1590		1733
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1734	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1735	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1771	XPUSHs (decode_json (jsonstr, self, 0));
1629		1772
1630	void decode_prefix (JSON self, SV jsonstr)	1773	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1774	PPCODE:
1632	{	1775	{
1633	UV offset;	1776	STRLEN offset;
1634	EXTEND (SP, 2);	1777	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1778	PUSHs (decode_json (jsonstr, self, &offset));
1636	PUSHs (sv_2mortal (newSVuv (offset)));	1779	PUSHs (sv_2mortal (newSVuv (offset)));
		1780	}
		1781
		1782	void incr_parse (JSON self, SV jsonstr = 0)
		1783	PPCODE:
		1784	{
		1785	if (!self->incr_text)
		1786	self->incr_text = newSVpvn ("", 0);
		1787
		1788	// append data, if any
		1789	if (jsonstr)
		1790	{
		1791	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1792	{
		1793	/* utf-8-ness differs, need to upgrade */
		1794	sv_utf8_upgrade (self->incr_text);
		1795
		1796	if (self->incr_pos)
		1797	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1798	- (U8 *)SvPVX (self->incr_text);
		1799	}
		1800
		1801	{
		1802	STRLEN len;
		1803	const char *str = SvPV (jsonstr, len);
		1804	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
		1805	Move (str, SvEND (self->incr_text), len, char);
		1806	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1807	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1808	}
		1809	}
		1810
		1811	if (GIMME_V != G_VOID)
		1812	do
		1813	{
		1814	STRLEN offset;
		1815
		1816	if (!INCR_DONE (self))
		1817	{
		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
		1824	if (!INCR_DONE (self))
		1825	break;
		1826	}
		1827
		1828	XPUSHs (decode_json (self->incr_text, self, &offset));
		1829
		1830	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1831	self->incr_pos -= offset;
		1832	self->incr_nest = 0;
		1833	self->incr_mode = 0;
		1834	}
		1835	while (GIMME_V == G_ARRAY);
		1836	}
		1837
		1838	SV incr_text (JSON self)
		1839	ATTRS: lvalue
		1840	CODE:
		1841	{
		1842	if (self->incr_pos)
		1843	croak ("incr_text can not be called when the incremental parser already started parsing");
		1844
		1845	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1846	}
		1847	OUTPUT:
		1848	RETVAL
		1849
		1850	void incr_skip (JSON *self)
		1851	CODE:
		1852	{
		1853	if (self->incr_pos)
		1854	{
		1855	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1856	self->incr_pos = 0;
		1857	self->incr_nest = 0;
		1858	self->incr_mode = 0;
		1859	}
		1860	}
		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;
1637	}	1870	}
1638		1871
1639	void DESTROY (JSON *self)	1872	void DESTROY (JSON *self)
1640	CODE:	1873	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	1874	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	1875	SvREFCNT_dec (self->cb_object);
		1876	SvREFCNT_dec (self->incr_text);
1643		1877
1644	PROTOTYPES: ENABLE	1878	PROTOTYPES: ENABLE
1645		1879
1646	void encode_json (SV *scalar)	1880	void encode_json (SV *scalar)
		1881	ALIAS:
		1882	to_json_ = 0
		1883	encode_json = F_UTF8
1647	PPCODE:	1884	PPCODE:
1648	{	1885	{
1649	JSON json = { F_DEFAULT \| F_UTF8 };	1886	JSON json;
		1887	json_init (&json);
		1888	json.flags \|= ix;
1650	XPUSHs (encode_json (scalar, &json));	1889	XPUSHs (encode_json (scalar, &json));
1651	}	1890	}
1652		1891
1653	void decode_json (SV *jsonstr)	1892	void decode_json (SV *jsonstr)
		1893	ALIAS:
		1894	from_json_ = 0
		1895	decode_json = F_UTF8
1654	PPCODE:	1896	PPCODE:
1655	{	1897	{
1656	JSON json = { F_DEFAULT \| F_UTF8 };	1898	JSON json;
		1899	json_init (&json);
		1900	json.flags \|= ix;
1657	XPUSHs (decode_json (jsonstr, &json, 0));	1901	XPUSHs (decode_json (jsonstr, &json, 0));
1658	}	1902	}
1659		1903
		1904

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.75 by root, Wed Mar 19 15:37:54 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.75 by root, Wed Mar 19 15:37:54 2008 UTC vs.
Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC