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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.90 by root, Sun Jul 20 17:55:19 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)
…		…
338	static void	368	static void
339	encode_av (enc_t enc, AV av)	369	encode_av (enc_t enc, AV av)
340	{	370	{
341	int i, len = av_len (av);	371	int i, len = av_len (av);
342		372
343	if (enc->indent >= enc->maxdepth)	373	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	374	croak (ERR_NESTING_EXCEEDED);
345		375
346	encode_ch (enc, '[');	376	encode_ch (enc, '[');
347		377
348	if (len >= 0)	378	if (len >= 0)
349	{	379	{
…		…
423		453
424	static void	454	static void
425	encode_hv (enc_t enc, HV hv)	455	encode_hv (enc_t enc, HV hv)
426	{	456	{
427	HE *he;	457	HE *he;
428	int count;
429		458
430	if (enc->indent >= enc->maxdepth)	459	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	460	croak (ERR_NESTING_EXCEEDED);
432		461
433	encode_ch (enc, '{');	462	encode_ch (enc, '{');
434		463
435	// for canonical output we have to sort by keys first	464	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	465	// actually, this is mostly due to the stupid so-called
…		…
617		646
618	if (len == 1 && *pv == '1')	647	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	648	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	649	else if (len == 1 && *pv == '0')
621	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);
622	else	653	else
623	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",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	655	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	656	}
		657	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		658	encode_str (enc, "null", 4, 0);
626	else	659	else
627	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",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	661	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	662	}
630		663
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	725	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	726	}
694	}	727	}
695	else if (SvROK (sv))	728	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	729	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	730	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	731	encode_str (enc, "null", 4, 0);
699	else	732	else
700	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",
701	SvPV_nolen (sv), SvFLAGS (sv));	734	SvPV_nolen (sv), SvFLAGS (sv));
702	}	735	}
…		…
712	enc.json = *json;	745	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	746	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	747	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	748	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	749	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	750	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	751	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	752	: 0x110000UL;
721		753
722	SvPOK_only (enc.sv);	754	SvPOK_only (enc.sv);
…		…
789	if (*dec->cur != ch) \	821	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	822	ERR (# ch " expected"); \
791	++dec->cur; \	823	++dec->cur; \
792	SE	824	SE
793		825
794	#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)
795	#define DEC_DEC_DEPTH --dec->depth	827	#define DEC_DEC_DEPTH --dec->depth
796		828
797	static SV decode_sv (dec_t dec);	829	static SV decode_sv (dec_t dec);
798		830
799	static signed char decode_hexdigit[256];	831	static signed char decode_hexdigit[256];
…		…
1171	char *p = dec->cur;	1203	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1204	char *e = p + 24; // only try up to 24 bytes
1173		1205
1174	for (;;)	1206	for (;;)
1175	{	1207	{
1176	// the >= 0x80 is true on most architectures	1208	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1209	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1210	{
1179	// slow path, back up and use decode_str	1211	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1212	SV *key = decode_str (dec);
1181	if (!key)	1213	if (!key)
…		…
1329	case 't':	1361	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1362	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1363	{
1332	dec->cur += 4;	1364	dec->cur += 4;
1333	#if JSON_SLOW	1365	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1366	json_true = get_bool ("JSON::XS::true");
1335	#endif	1367	#endif
1336	return SvREFCNT_inc (json_true);	1368	return newSVsv (json_true);
1337	}	1369	}
1338	else	1370	else
1339	ERR ("'true' expected");	1371	ERR ("'true' expected");
1340		1372
1341	break;	1373	break;
…		…
1343	case 'f':	1375	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1376	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1377	{
1346	dec->cur += 5;	1378	dec->cur += 5;
1347	#if JSON_SLOW	1379	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1380	json_false = get_bool ("JSON::XS::false");
1349	#endif	1381	#endif
1350	return SvREFCNT_inc (json_false);	1382	return newSVsv (json_false);
1351	}	1383	}
1352	else	1384	else
1353	ERR ("'false' expected");	1385	ERR ("'false' expected");
1354		1386
1355	break;	1387	break;
…		…
1373	fail:	1405	fail:
1374	return 0;	1406	return 0;
1375	}	1407	}
1376		1408
1377	static SV *	1409	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1410	decode_json (SV string, JSON json, STRLEN *offset_return)
1379	{	1411	{
1380	dec_t dec;	1412	dec_t dec;
1381	UV offset;	1413	STRLEN offset;
1382	SV *sv;	1414	SV *sv;
1383		1415
1384	SvGETMAGIC (string);	1416	SvGETMAGIC (string);
1385	SvUPGRADE (string, SVt_PV);	1417	SvUPGRADE (string, SVt_PV);
1386		1418
1387	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)
1388	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",
1389	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1437	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1390		1438
1391	if (json->flags & F_UTF8)	1439	if (json->flags & F_UTF8)
1392	sv_utf8_downgrade (string, 0);	1440	sv_utf8_downgrade (string, 0);
1393	else	1441	else
1394	sv_utf8_upgrade (string);	1442	sv_utf8_upgrade (string);
1395		1443
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1444	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1445
1398	dec.json = *json;	1446	dec.json = *json;
1399	dec.cur = SvPVX (string);	1447	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1448	dec.end = SvEND (string);
1401	dec.err = 0;	1449	dec.err = 0;
1402	dec.depth = 0;	1450	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1451
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1452	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1453	dec.json.flags \|= F_HOOK;
1407		1454
1408	*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
…		…
1459		1506
1460	return sv;	1507	return sv;
1461	}	1508	}
1462		1509
1463	/////////////////////////////////////////////////////////////////////////////	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	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1628	// XS interface functions
1465		1629
1466	MODULE = JSON::XS PACKAGE = JSON::XS	1630	MODULE = JSON::XS PACKAGE = JSON::XS
1467		1631
1468	BOOT:	1632	BOOT:
…		…
1477	: -1;	1641	: -1;
1478		1642
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1643	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1644	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1645
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1646	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1647	json_false = get_bool ("JSON::XS::false");
1484	}	1648	}
1485		1649
1486	PROTOTYPES: DISABLE	1650	PROTOTYPES: DISABLE
1487		1651
1488	void CLONE (...)	1652	void CLONE (...)
…		…
1493	void new (char *klass)	1657	void new (char *klass)
1494	PPCODE:	1658	PPCODE:
1495	{	1659	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1660	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1661	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1662	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1663	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1664	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1665	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1666	)));
1504	}	1667	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1679	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1680	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1681	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1682	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1683	relaxed = F_RELAXED
		1684	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1685	PPCODE:
1522	{	1686	{
1523	if (enable)	1687	if (enable)
1524	self->flags \|= ix;	1688	self->flags \|= ix;
1525	else	1689	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1704	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1705	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1706	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1707	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1708	get_relaxed = F_RELAXED
		1709	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1710	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1711	XPUSHs (boolSV (self->flags & ix));
1547		1712
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1713	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1714	PPCODE:
1550	{	1715	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));	1716	XPUSHs (ST (0));
1561	}
1562		1717
1563	U32 get_max_depth (JSON *self)	1718	U32 get_max_depth (JSON *self)
1564	CODE:	1719	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1720	RETVAL = self->max_depth;
1566	OUTPUT:	1721	OUTPUT:
1567	RETVAL	1722	RETVAL
1568		1723
1569	void max_size (JSON *self, UV max_size = 0)	1724	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1725	PPCODE:
1571	{	1726	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));	1727	XPUSHs (ST (0));
1583	}
1584		1728
1585	int get_max_size (JSON *self)	1729	int get_max_size (JSON *self)
1586	CODE:	1730	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1731	RETVAL = self->max_size;
1588	OUTPUT:	1732	OUTPUT:
1589	RETVAL	1733	RETVAL
1590		1734
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1735	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1736	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1772	XPUSHs (decode_json (jsonstr, self, 0));
1629		1773
1630	void decode_prefix (JSON self, SV jsonstr)	1774	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1775	PPCODE:
1632	{	1776	{
1633	UV offset;	1777	STRLEN offset;
1634	EXTEND (SP, 2);	1778	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1779	PUSHs (decode_json (jsonstr, self, &offset));
1636	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;
1637	}	1871	}
1638		1872
1639	void DESTROY (JSON *self)	1873	void DESTROY (JSON *self)
1640	CODE:	1874	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	1875	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	1876	SvREFCNT_dec (self->cb_object);
		1877	SvREFCNT_dec (self->incr_text);
1643		1878
1644	PROTOTYPES: ENABLE	1879	PROTOTYPES: ENABLE
1645		1880
1646	void encode_json (SV *scalar)	1881	void encode_json (SV *scalar)
1647	ALIAS:	1882	ALIAS:
1648	to_json_ = 0	1883	to_json_ = 0
1649	encode_json = F_UTF8	1884	encode_json = F_UTF8
1650	PPCODE:	1885	PPCODE:
1651	{	1886	{
1652	JSON json = { F_DEFAULT \| ix };	1887	JSON json;
		1888	json_init (&json);
		1889	json.flags \|= ix;
1653	XPUSHs (encode_json (scalar, &json));	1890	XPUSHs (encode_json (scalar, &json));
1654	}	1891	}
1655		1892
1656	void decode_json (SV *jsonstr)	1893	void decode_json (SV *jsonstr)
1657	ALIAS:	1894	ALIAS:
1658	from_json_ = 0	1895	from_json_ = 0
1659	decode_json = F_UTF8	1896	decode_json = F_UTF8
1660	PPCODE:	1897	PPCODE:
1661	{	1898	{
1662	JSON json = { F_DEFAULT \| ix };	1899	JSON json;
		1900	json_init (&json);
		1901	json.flags \|= ix;
1663	XPUSHs (decode_json (jsonstr, &json, 0));	1902	XPUSHs (decode_json (jsonstr, &json, 0));
1664	}	1903	}
1665		1904
		1905

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.76 by root, Thu Mar 20 00:56:37 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.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.90 by root, Sun Jul 20 17:55:19 2008 UTC