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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC

…		…
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarantees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
		20	#endif
		21
		22	// compatibility with perl <5.18
		23	#ifndef HvNAMELEN_get
		24	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		25	#endif
		26	#ifndef HvNAMELEN
		27	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		28	#endif
		29	#ifndef HvNAMEUTF8
		30	# define HvNAMEUTF8(hv) 0
20	#endif	31	#endif
21		32
22	// three extra for rounding, sign, and end of string	33	// three extra for rounding, sign, and end of string
23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)	34	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24		35
…		…
33	#define F_SHRINK 0x00000200UL	44	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	45	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	46	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	47	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	48	#define F_ALLOW_UNKNOWN 0x00002000UL
		49	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	50	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		51
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	52	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		53
42	#define INIT_SIZE 32 // initial scalar size to be allocated	54	#define INIT_SIZE 32 // initial scalar size to be allocated
43	#define INDENT_STEP 3 // spaces per indentation level	55	#define INDENT_STEP 3 // spaces per indentation level
44		56
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	57	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		58
		59	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46		60
47	#define SB do {	61	#define SB do {
48	#define SE } while (0)	62	#define SE } while (0)
49		63
50	#if __GNUC__ >= 3	64	#if __GNUC__ >= 3
…		…
70	#else	84	#else
71	# define JSON_SLOW 0	85	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	86	# define JSON_STASH json_stash
73	#endif	87	#endif
74		88
		89	// the amount of HEs to allocate on the stack, when sorting keys
		90	#define STACK_HES 64
		91
75	static HV json_stash, json_boolean_stash; // JSON::XS::	92	static HV json_stash, types_boolean_stash; // JSON::XS::
76	static SV json_true, json_false;	93	static SV types_true, types_false, *sv_json;
77		94
78	enum {	95	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	96	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	97	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	98	INCR_M_BS, // inside backslash
…		…
258	}	275	}
259		276
260	// this relies greatly on the quality of the pow ()	277	// this relies greatly on the quality of the pow ()
261	// implementation of the platform, but a good	278	// implementation of the platform, but a good
262	// implementation is hard to beat.	279	// implementation is hard to beat.
		280	// (IEEE 754 conformant ones are required to be exact)
263	if (postdp) *expo -= eaccum;	281	if (postdp) *expo -= eaccum;
264	accum += uaccum Perl_pow (10., *expo);	282	accum += uaccum Perl_pow (10., *expo);
265	*expo += eaccum;	283	*expo += eaccum;
266	}	284	}
267		285
…		…
477		495
478	if (enc->indent >= enc->json.max_depth)	496	if (enc->indent >= enc->json.max_depth)
479	croak (ERR_NESTING_EXCEEDED);	497	croak (ERR_NESTING_EXCEEDED);
480		498
481	encode_ch (enc, '[');	499	encode_ch (enc, '[');
482		500
483	if (len >= 0)	501	if (len >= 0)
484	{	502	{
485	encode_nl (enc); ++enc->indent;	503	encode_nl (enc); ++enc->indent;
486		504
487	for (i = 0; i <= len; ++i)	505	for (i = 0; i <= len; ++i)
…		…
499	encode_comma (enc);	517	encode_comma (enc);
500	}	518	}
501		519
502	encode_nl (enc); --enc->indent; encode_indent (enc);	520	encode_nl (enc); --enc->indent; encode_indent (enc);
503	}	521	}
504		522
505	encode_ch (enc, ']');	523	encode_ch (enc, ']');
506	}	524	}
507		525
508	static void	526	static void
509	encode_hk (enc_t enc, HE he)	527	encode_hk (enc_t enc, HE he)
…		…
513	if (HeKLEN (he) == HEf_SVKEY)	531	if (HeKLEN (he) == HEf_SVKEY)
514	{	532	{
515	SV *sv = HeSVKEY (he);	533	SV *sv = HeSVKEY (he);
516	STRLEN len;	534	STRLEN len;
517	char *str;	535	char *str;
518		536
519	SvGETMAGIC (sv);	537	SvGETMAGIC (sv);
520	str = SvPV (sv, len);	538	str = SvPV (sv, len);
521		539
522	encode_str (enc, str, len, SvUTF8 (sv));	540	encode_str (enc, str, len, SvUTF8 (sv));
523	}	541	}
…		…
589	}	607	}
590		608
591	if (count)	609	if (count)
592	{	610	{
593	int i, fast = 1;	611	int i, fast = 1;
594	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	612	HE *hes_stack [STACK_HES];
595	HE *hes = _alloca (count sizeof (HE));	613	HE **hes = hes_stack;
596	#else	614
597	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	615	// allocate larger arrays on the heap
598	#endif	616	if (count > STACK_HES)
		617	{
		618	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		619	hes = (HE **)SvPVX (sv);
		620	}
599		621
600	i = 0;	622	i = 0;
601	while ((he = hv_iternext (hv)))	623	while ((he = hv_iternext (hv)))
602	{	624	{
603	hes [i++] = he;	625	hes [i++] = he;
…		…
672	// encode objects, arrays and special \0=false and \1=true values.	694	// encode objects, arrays and special \0=false and \1=true values.
673	static void	695	static void
674	encode_rv (enc_t enc, SV sv)	696	encode_rv (enc_t enc, SV sv)
675	{	697	{
676	svtype svt;	698	svtype svt;
		699	GV *method;
677		700
678	SvGETMAGIC (sv);	701	SvGETMAGIC (sv);
679	svt = SvTYPE (sv);	702	svt = SvTYPE (sv);
680		703
681	if (expect_false (SvOBJECT (sv)))	704	if (expect_false (SvOBJECT (sv)))
682	{	705	{
683	HV *stash = !JSON_SLOW \|\| json_boolean_stash	706	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
684	? json_boolean_stash	707	? types_boolean_stash
685	: gv_stashpv ("JSON::XS::Boolean", 1);	708	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		709	HV *stash = SvSTASH (sv);
686		710
687	if (SvSTASH (sv) == stash)	711	if (stash == boolean_stash)
688	{	712	{
689	if (SvIV (sv))	713	if (SvIV (sv))
690	encode_str (enc, "true", 4, 0);	714	encode_str (enc, "true", 4, 0);
691	else	715	else
692	encode_str (enc, "false", 5, 0);	716	encode_str (enc, "false", 5, 0);
693	}	717	}
		718	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		719	{
		720	int count;
		721	dSP;
		722
		723	ENTER; SAVETMPS;
		724	SAVESTACK_POS ();
		725	PUSHMARK (SP);
		726	EXTEND (SP, 2);
		727	// we re-bless the reference to get overload and other niceties right
		728	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		729	PUSHs (sv_json);
		730
		731	PUTBACK;
		732	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		733	SPAGAIN;
		734
		735	// catch this surprisingly common error
		736	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		737	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		738
		739	encode_ch (enc, '(');
		740	encode_ch (enc, '"');
		741	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		742	encode_ch (enc, '"');
		743	encode_ch (enc, ')');
		744	encode_ch (enc, '[');
		745
		746	while (count)
		747	{
		748	encode_sv (enc, SP[1 - count--]);
		749
		750	if (count)
		751	encode_ch (enc, ',');
		752	}
		753
		754	encode_ch (enc, ']');
		755
		756	FREETMPS; LEAVE;
		757	}
		758	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		759	{
		760	dSP;
		761
		762	ENTER; SAVETMPS;
		763	PUSHMARK (SP);
		764	// we re-bless the reference to get overload and other niceties right
		765	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		766
		767	// calling with G_SCALAR ensures that we always get a 1 return value
		768	PUTBACK;
		769	call_sv ((SV *)GvCV (method), G_SCALAR);
		770	SPAGAIN;
		771
		772	// catch this surprisingly common error
		773	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		774	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		775
		776	sv = POPs;
		777	PUTBACK;
		778
		779	encode_sv (enc, sv);
		780
		781	FREETMPS; LEAVE;
		782	}
		783	else if (enc->json.flags & F_ALLOW_BLESSED)
		784	encode_str (enc, "null", 4, 0);
694	else	785	else
695	{
696	#if 0
697	if (0 && sv_derived_from (rv, "JSON::Literal"))
698	{
699	// not yet
700	}
701	#endif
702	if (enc->json.flags & F_CONV_BLESSED)
703	{
704	// we re-bless the reference to get overload and other niceties right
705	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
706
707	if (to_json)
708	{
709	dSP;
710
711	ENTER; SAVETMPS; PUSHMARK (SP);
712	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
713
714	// calling with G_SCALAR ensures that we always get a 1 return value
715	PUTBACK;
716	call_sv ((SV *)GvCV (to_json), G_SCALAR);
717	SPAGAIN;
718
719	// catch this surprisingly common error
720	if (SvROK (TOPs) && SvRV (TOPs) == sv)
721	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
722
723	sv = POPs;
724	PUTBACK;
725
726	encode_sv (enc, sv);
727
728	FREETMPS; LEAVE;
729	}
730	else if (enc->json.flags & F_ALLOW_BLESSED)
731	encode_str (enc, "null", 4, 0);
732	else
733	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
734	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
735	}
736	else if (enc->json.flags & F_ALLOW_BLESSED)
737	encode_str (enc, "null", 4, 0);
738	else
739	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	786	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
740	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	787	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741	}
742	}	788	}
743	else if (svt == SVt_PVHV)	789	else if (svt == SVt_PVHV)
744	encode_hv (enc, (HV *)sv);	790	encode_hv (enc, (HV *)sv);
745	else if (svt == SVt_PVAV)	791	else if (svt == SVt_PVAV)
746	encode_av (enc, (AV *)sv);	792	encode_av (enc, (AV *)sv);
…		…
822	}	868	}
823	else	869	else
824	{	870	{
825	// large integer, use the (rather slow) snprintf way.	871	// large integer, use the (rather slow) snprintf way.
826	need (enc, IVUV_MAXCHARS);	872	need (enc, IVUV_MAXCHARS);
827	enc->cur +=	873	enc->cur +=
828	SvIsUV(sv)	874	SvIsUV(sv)
829	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	875	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	876	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831	}	877	}
832	}	878	}
833	else if (SvROK (sv))	879	else if (SvROK (sv))
834	encode_rv (enc, SvRV (sv));	880	encode_rv (enc, SvRV (sv));
835	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	881	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
836	encode_str (enc, "null", 4, 0);	882	encode_str (enc, "null", 4, 0);
837	else	883	else
838	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	884	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
839	SvPV_nolen (sv), SvFLAGS (sv));	885	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
		886	}
		887
		888	static int
		889	json_scalar (SV *scalar)
		890	{
		891	return 0;//D
		892	if (!SvROK (scalar))
		893	return 1;
840	}	894	}
841		895
842	static SV *	896	static SV *
843	encode_json (SV scalar, JSON json)	897	encode_json (SV scalar, JSON json)
844	{	898	{
845	enc_t enc;	899	enc_t enc;
846		900
847	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	901	if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
848	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	902	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
849		903
850	enc.json = *json;	904	enc.json = *json;
851	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	905	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
852	enc.cur = SvPVX (enc.sv);	906	enc.cur = SvPVX (enc.sv);
…		…
1059	cur++ = dec_cur++;	1113	cur++ = dec_cur++;
1060	while (--clen);	1114	while (--clen);
1061		1115
1062	utf8 = 1;	1116	utf8 = 1;
1063	}	1117	}
		1118	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1119	*cur++ = ch;
1064	else	1120	else
1065	{	1121	{
1066	--dec_cur;	1122	--dec_cur;
1067		1123
1068	if (!ch)	1124	if (!ch)
…		…
1256	if (*dec->cur == ']')	1312	if (*dec->cur == ']')
1257	{	1313	{
1258	++dec->cur;	1314	++dec->cur;
1259	break;	1315	break;
1260	}	1316	}
1261		1317
1262	if (*dec->cur != ',')	1318	if (*dec->cur != ',')
1263	ERR (", or ] expected while parsing array");	1319	ERR (", or ] expected while parsing array");
1264		1320
1265	++dec->cur;	1321	++dec->cur;
1266		1322
…		…
1390		1446
1391	hv_iterinit (hv);	1447	hv_iterinit (hv);
1392	he = hv_iternext (hv);	1448	he = hv_iternext (hv);
1393	hv_iterinit (hv);	1449	hv_iterinit (hv);
1394		1450
1395	// the next line creates a mortal sv each time its called.	1451	// the next line creates a mortal sv each time it's called.
1396	// might want to optimise this for common cases.	1452	// might want to optimise this for common cases.
1397	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1453	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1398		1454
1399	if (cb)	1455	if (cb)
1400	{	1456	{
1401	dSP;	1457	dSP;
1402	int count;	1458	int count;
1403		1459
1404	ENTER; SAVETMPS; PUSHMARK (SP);	1460	ENTER; SAVETMPS;
		1461	SAVESTACK_POS ();
		1462	PUSHMARK (SP);
1405	XPUSHs (HeVAL (he));	1463	XPUSHs (HeVAL (he));
1406	sv_2mortal (sv);	1464	sv_2mortal (sv);
1407		1465
1408	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1466	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1409		1467
…		…
1422	if (dec->json.cb_object)	1480	if (dec->json.cb_object)
1423	{	1481	{
1424	dSP;	1482	dSP;
1425	int count;	1483	int count;
1426		1484
1427	ENTER; SAVETMPS; PUSHMARK (SP);	1485	ENTER; SAVETMPS;
		1486	SAVESTACK_POS ();
		1487	PUSHMARK (SP);
1428	XPUSHs (sv_2mortal (sv));	1488	XPUSHs (sv_2mortal (sv));
1429		1489
1430	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1490	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1431		1491
1432	if (count == 1)	1492	if (count == 1)
…		…
1448	DEC_DEC_DEPTH;	1508	DEC_DEC_DEPTH;
1449	return 0;	1509	return 0;
1450	}	1510	}
1451		1511
1452	static SV *	1512	static SV *
		1513	decode_tag (dec_t *dec)
		1514	{
		1515	SV *tag = 0;
		1516	SV *val = 0;
		1517
		1518	if (!(dec->json.flags & F_ALLOW_TAGS))
		1519	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1520
		1521	++dec->cur;
		1522
		1523	decode_ws (dec);
		1524
		1525	tag = decode_sv (dec);
		1526	if (!tag)
		1527	goto fail;
		1528
		1529	if (!SvPOK (tag))
		1530	ERR ("malformed JSON string, (tag) must be a string");
		1531
		1532	decode_ws (dec);
		1533
		1534	if (*dec->cur != ')')
		1535	ERR (") expected after tag");
		1536
		1537	++dec->cur;
		1538
		1539	decode_ws (dec);
		1540
		1541	val = decode_sv (dec);
		1542	if (!val)
		1543	goto fail;
		1544
		1545	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1546	ERR ("malformed JSON string, tag value must be an array");
		1547
		1548	{
		1549	AV av = (AV )SvRV (val);
		1550	int i, len = av_len (av) + 1;
		1551	HV *stash = gv_stashsv (tag, 0);
		1552	SV *sv;
		1553
		1554	if (!stash)
		1555	ERR ("cannot decode perl-object (package does not exist)");
		1556
		1557	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1558
		1559	if (!method)
		1560	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1561
		1562	dSP;
		1563
		1564	ENTER; SAVETMPS;
		1565	PUSHMARK (SP);
		1566	EXTEND (SP, len + 2);
		1567	// we re-bless the reference to get overload and other niceties right
		1568	PUSHs (tag);
		1569	PUSHs (sv_json);
		1570
		1571	for (i = 0; i < len; ++i)
		1572	PUSHs (*av_fetch (av, i, 1));
		1573
		1574	PUTBACK;
		1575	call_sv ((SV *)GvCV (method), G_SCALAR);
		1576	SPAGAIN;
		1577
		1578	SvREFCNT_dec (tag);
		1579	SvREFCNT_dec (val);
		1580	sv = SvREFCNT_inc (POPs);
		1581
		1582	PUTBACK;
		1583
		1584	FREETMPS; LEAVE;
		1585
		1586	return sv;
		1587	}
		1588
		1589	fail:
		1590	SvREFCNT_dec (tag);
		1591	SvREFCNT_dec (val);
		1592	return 0;
		1593	}
		1594
		1595	static SV *
1453	decode_sv (dec_t *dec)	1596	decode_sv (dec_t *dec)
1454	{	1597	{
1455	// the beauty of JSON: you need exactly one character lookahead	1598	// the beauty of JSON: you need exactly one character lookahead
1456	// to parse everything.	1599	// to parse everything.
1457	switch (*dec->cur)	1600	switch (*dec->cur)
1458	{	1601	{
1459	case '"': ++dec->cur; return decode_str (dec);	1602	case '"': ++dec->cur; return decode_str (dec);
1460	case '[': ++dec->cur; return decode_av (dec);	1603	case '[': ++dec->cur; return decode_av (dec);
1461	case '{': ++dec->cur; return decode_hv (dec);	1604	case '{': ++dec->cur; return decode_hv (dec);
		1605	case '(': return decode_tag (dec);
1462		1606
1463	case '-':	1607	case '-':
1464	case '0': case '1': case '2': case '3': case '4':	1608	case '0': case '1': case '2': case '3': case '4':
1465	case '5': case '6': case '7': case '8': case '9':	1609	case '5': case '6': case '7': case '8': case '9':
1466	return decode_num (dec);	1610	return decode_num (dec);
…		…
1468	case 't':	1612	case 't':
1469	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1613	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1470	{	1614	{
1471	dec->cur += 4;	1615	dec->cur += 4;
1472	#if JSON_SLOW	1616	#if JSON_SLOW
1473	json_true = get_bool ("JSON::XS::true");	1617	types_true = get_bool ("Types::Serialiser::true");
1474	#endif	1618	#endif
1475	return newSVsv (json_true);	1619	return newSVsv (types_true);
1476	}	1620	}
1477	else	1621	else
1478	ERR ("'true' expected");	1622	ERR ("'true' expected");
1479		1623
1480	break;	1624	break;
…		…
1482	case 'f':	1626	case 'f':
1483	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1627	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1484	{	1628	{
1485	dec->cur += 5;	1629	dec->cur += 5;
1486	#if JSON_SLOW	1630	#if JSON_SLOW
1487	json_false = get_bool ("JSON::XS::false");	1631	types_false = get_bool ("Types::Serialiser::false");
1488	#endif	1632	#endif
1489	return newSVsv (json_false);	1633	return newSVsv (types_false);
1490	}	1634	}
1491	else	1635	else
1492	ERR ("'false' expected");	1636	ERR ("'false' expected");
1493		1637
1494	break;	1638	break;
…		…
1503	ERR ("'null' expected");	1647	ERR ("'null' expected");
1504		1648
1505	break;	1649	break;
1506		1650
1507	default:	1651	default:
1508	ERR ("malformed JSON string, neither array, object, number, string or atom");	1652	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1509	break;	1653	break;
1510	}	1654	}
1511		1655
1512	fail:	1656	fail:
1513	return 0;	1657	return 0;
…		…
1518	{	1662	{
1519	dec_t dec;	1663	dec_t dec;
1520	SV *sv;	1664	SV *sv;
1521		1665
1522	/* work around bugs in 5.10 where manipulating magic values	1666	/* work around bugs in 5.10 where manipulating magic values
1523	* will perl ignore the magic in subsequent accesses	1667	* makes perl ignore the magic in subsequent accesses.
		1668	* also make a copy of non-PV values, to get them into a clean
		1669	* state (SvPV should do that, but it's buggy, see below).
1524	*/	1670	*/
1525	/SvGETMAGIC (string);/	1671	/SvGETMAGIC (string);/
1526	if (SvMAGICAL (string))	1672	if (SvMAGICAL (string) \|\| !SvPOK (string))
1527	string = sv_2mortal (newSVsv (string));	1673	string = sv_2mortal (newSVsv (string));
1528		1674
1529	SvUPGRADE (string, SVt_PV);	1675	SvUPGRADE (string, SVt_PV);
1530		1676
1531	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1677	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1548	if (offset > json->max_size && json->max_size)	1694	if (offset > json->max_size && json->max_size)
1549	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1695	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1550	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1696	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1551	}	1697	}
1552		1698
1553	if (json->flags & F_UTF8)	1699	if (DECODE_WANTS_OCTETS (json))
1554	sv_utf8_downgrade (string, 0);	1700	sv_utf8_downgrade (string, 0);
1555	else	1701	else
1556	sv_utf8_upgrade (string);	1702	sv_utf8_upgrade (string);
1557		1703
1558	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1704	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1600	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1746	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1601	LEAVE;	1747	LEAVE;
1602		1748
1603	croak ("%s, at character offset %d (before \"%s\")",	1749	croak ("%s, at character offset %d (before \"%s\")",
1604	dec.err,	1750	dec.err,
1605	ptr_to_index (string, dec.cur),	1751	(int)ptr_to_index (string, dec.cur),
1606	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1752	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1607	}	1753	}
1608		1754
1609	sv = sv_2mortal (sv);	1755	sv = sv_2mortal (sv);
1610		1756
…		…
1738	self->incr_mode = INCR_M_STR;	1884	self->incr_mode = INCR_M_STR;
1739	goto incr_m_str;	1885	goto incr_m_str;
1740		1886
1741	case '[':	1887	case '[':
1742	case '{':	1888	case '{':
		1889	case '(':
1743	if (++self->incr_nest > self->max_depth)	1890	if (++self->incr_nest > self->max_depth)
1744	croak (ERR_NESTING_EXCEEDED);	1891	croak (ERR_NESTING_EXCEEDED);
1745	break;	1892	break;
1746		1893
1747	case ']':	1894	case ']':
1748	case '}':	1895	case '}':
1749	if (--self->incr_nest <= 0)	1896	if (--self->incr_nest <= 0)
1750	goto interrupt;	1897	goto interrupt;
		1898	break;
		1899
		1900	case ')':
		1901	--self->incr_nest;
1751	break;	1902	break;
1752		1903
1753	case '#':	1904	case '#':
1754	self->incr_mode = INCR_M_C1;	1905	self->incr_mode = INCR_M_C1;
1755	goto incr_m_c;	1906	goto incr_m_c;
…		…
1781	i >= '0' && i <= '9' ? i - '0'	1932	i >= '0' && i <= '9' ? i - '0'
1782	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1933	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1783	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1934	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1784	: -1;	1935	: -1;
1785		1936
1786	json_stash = gv_stashpv ("JSON::XS" , 1);	1937	json_stash = gv_stashpv ("JSON::XS" , 1);
1787	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1938	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1788		1939
1789	json_true = get_bool ("JSON::XS::true");	1940	types_true = get_bool ("Types::Serialiser::true");
1790	json_false = get_bool ("JSON::XS::false");	1941	types_false = get_bool ("Types::Serialiser::false");
		1942
		1943	sv_json = newSVpv ("JSON", 0);
		1944	SvREADONLY_on (sv_json);
1791		1945
1792	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1946	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1793	}	1947	}
1794		1948
1795	PROTOTYPES: DISABLE	1949	PROTOTYPES: DISABLE
1796		1950
1797	void CLONE (...)	1951	void CLONE (...)
1798	CODE:	1952	CODE:
1799	json_stash = 0;	1953	json_stash = 0;
1800	json_boolean_stash = 0;	1954	types_boolean_stash = 0;
1801		1955
1802	void new (char *klass)	1956	void new (char *klass)
1803	PPCODE:	1957	PPCODE:
1804	{	1958	{
1805	SV *pv = NEWSV (0, sizeof (JSON));	1959	SV *pv = NEWSV (0, sizeof (JSON));
1806	SvPOK_only (pv);	1960	SvPOK_only (pv);
1807	json_init ((JSON *)SvPVX (pv));	1961	json_init ((JSON *)SvPVX (pv));
1808	XPUSHs (sv_2mortal (sv_bless (	1962	XPUSHs (sv_2mortal (sv_bless (
1809	newRV_noinc (pv),	1963	newRV_noinc (pv),
1810	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1964	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1825	shrink = F_SHRINK	1979	shrink = F_SHRINK
1826	allow_blessed = F_ALLOW_BLESSED	1980	allow_blessed = F_ALLOW_BLESSED
1827	convert_blessed = F_CONV_BLESSED	1981	convert_blessed = F_CONV_BLESSED
1828	relaxed = F_RELAXED	1982	relaxed = F_RELAXED
1829	allow_unknown = F_ALLOW_UNKNOWN	1983	allow_unknown = F_ALLOW_UNKNOWN
		1984	allow_tags = F_ALLOW_TAGS
1830	PPCODE:	1985	PPCODE:
1831	{	1986	{
1832	if (enable)	1987	if (enable)
1833	self->flags \|= ix;	1988	self->flags \|= ix;
1834	else	1989	else
…		…
1850	get_shrink = F_SHRINK	2005	get_shrink = F_SHRINK
1851	get_allow_blessed = F_ALLOW_BLESSED	2006	get_allow_blessed = F_ALLOW_BLESSED
1852	get_convert_blessed = F_CONV_BLESSED	2007	get_convert_blessed = F_CONV_BLESSED
1853	get_relaxed = F_RELAXED	2008	get_relaxed = F_RELAXED
1854	get_allow_unknown = F_ALLOW_UNKNOWN	2009	get_allow_unknown = F_ALLOW_UNKNOWN
		2010	get_allow_tags = F_ALLOW_TAGS
1855	PPCODE:	2011	PPCODE:
1856	XPUSHs (boolSV (self->flags & ix));	2012	XPUSHs (boolSV (self->flags & ix));
1857		2013
1858	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2014	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1859	PPCODE:	2015	PPCODE:
…		…
1887	}	2043	}
1888		2044
1889	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2045	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1890	PPCODE:	2046	PPCODE:
1891	{	2047	{
1892	if (!self->cb_sk_object)	2048	if (!self->cb_sk_object)
1893	self->cb_sk_object = newHV ();	2049	self->cb_sk_object = newHV ();
1894		2050
1895	if (SvOK (cb))	2051	if (SvOK (cb))
1896	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2052	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1897	else	2053	else
…		…
1908	XPUSHs (ST (0));	2064	XPUSHs (ST (0));
1909	}	2065	}
1910		2066
1911	void encode (JSON self, SV scalar)	2067	void encode (JSON self, SV scalar)
1912	PPCODE:	2068	PPCODE:
1913	XPUSHs (encode_json (scalar, self));	2069	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2070	XPUSHs (scalar);
1914		2071
1915	void decode (JSON self, SV jsonstr)	2072	void decode (JSON self, SV jsonstr)
1916	PPCODE:	2073	PPCODE:
1917	XPUSHs (decode_json (jsonstr, self, 0));	2074	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2075	XPUSHs (jsonstr);
1918		2076
1919	void decode_prefix (JSON self, SV jsonstr)	2077	void decode_prefix (JSON self, SV jsonstr)
1920	PPCODE:	2078	PPCODE:
1921	{	2079	{
		2080	SV *sv;
1922	char *offset;	2081	char *offset;
		2082	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1923	EXTEND (SP, 2);	2083	EXTEND (SP, 2);
1924	PUSHs (decode_json (jsonstr, self, &offset));	2084	PUSHs (sv);
1925	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2085	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1926	}	2086	}
1927		2087
1928	void incr_parse (JSON self, SV jsonstr = 0)	2088	void incr_parse (JSON self, SV jsonstr = 0)
1929	PPCODE:	2089	PPCODE:
1930	{	2090	{
1931	if (!self->incr_text)	2091	if (!self->incr_text)
1932	self->incr_text = newSVpvn ("", 0);	2092	self->incr_text = newSVpvn ("", 0);
		2093
		2094	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2095	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2096	if (DECODE_WANTS_OCTETS (self))
		2097	{
		2098	if (self->incr_pos)
		2099	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2100	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2101
		2102	sv_utf8_downgrade (self->incr_text, 0);
		2103	}
		2104	else
		2105	{
		2106	sv_utf8_upgrade (self->incr_text);
		2107
		2108	if (self->incr_pos)
		2109	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2110	- (U8 *)SvPVX (self->incr_text);
		2111	}
1933		2112
1934	// append data, if any	2113	// append data, if any
1935	if (jsonstr)	2114	if (jsonstr)
1936	{	2115	{
		2116	/* make sure both strings have same encoding */
		2117	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1937	if (SvUTF8 (jsonstr))	2118	if (SvUTF8 (jsonstr))
		2119	sv_utf8_downgrade (jsonstr, 0);
1938	{	2120	else
1939	if (!SvUTF8 (self->incr_text))
1940	{
1941	/* utf-8-ness differs, need to upgrade */
1942	sv_utf8_upgrade (self->incr_text);
1943
1944	if (self->incr_pos)
1945	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1946	- (U8 *)SvPVX (self->incr_text);
1947	}
1948	}
1949	else if (SvUTF8 (self->incr_text))
1950	sv_utf8_upgrade (jsonstr);	2121	sv_utf8_upgrade (jsonstr);
1951		2122
		2123	/* and then just blindly append */
1952	{	2124	{
1953	STRLEN len;	2125	STRLEN len;
1954	const char *str = SvPV (jsonstr, len);	2126	const char *str = SvPV (jsonstr, len);
1955	STRLEN cur = SvCUR (self->incr_text);	2127	STRLEN cur = SvCUR (self->incr_text);
1956		2128
…		…
1964	}	2136	}
1965		2137
1966	if (GIMME_V != G_VOID)	2138	if (GIMME_V != G_VOID)
1967	do	2139	do
1968	{	2140	{
		2141	SV *sv;
1969	char *offset;	2142	char *offset;
1970		2143
1971	if (!INCR_DONE (self))	2144	if (!INCR_DONE (self))
1972	{	2145	{
1973	incr_parse (self);	2146	incr_parse (self);
…		…
1975	if (self->incr_pos > self->max_size && self->max_size)	2148	if (self->incr_pos > self->max_size && self->max_size)
1976	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2149	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1977	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2150	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1978		2151
1979	if (!INCR_DONE (self))	2152	if (!INCR_DONE (self))
		2153	{
		2154	// as an optimisation, do not accumulate white space in the incr buffer
		2155	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2156	{
		2157	self->incr_pos = 0;
		2158	SvCUR_set (self->incr_text, 0);
		2159	}
		2160
1980	break;	2161	break;
		2162	}
1981	}	2163	}
1982		2164
1983	XPUSHs (decode_json (self->incr_text, self, &offset));	2165	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2166	XPUSHs (sv);
1984		2167
1985	self->incr_pos -= offset - SvPVX (self->incr_text);	2168	self->incr_pos -= offset - SvPVX (self->incr_text);
1986	self->incr_nest = 0;	2169	self->incr_nest = 0;
1987	self->incr_mode = 0;	2170	self->incr_mode = 0;
1988		2171
…		…
2032	SvREFCNT_dec (self->incr_text);	2215	SvREFCNT_dec (self->incr_text);
2033		2216
2034	PROTOTYPES: ENABLE	2217	PROTOTYPES: ENABLE
2035		2218
2036	void encode_json (SV *scalar)	2219	void encode_json (SV *scalar)
2037	ALIAS:
2038	to_json_ = 0
2039	encode_json = F_UTF8
2040	PPCODE:	2220	PPCODE:
2041	{	2221	{
2042	JSON json;	2222	JSON json;
2043	json_init (&json);	2223	json_init (&json);
2044	json.flags \|= ix;	2224	json.flags \|= F_UTF8;
2045	XPUSHs (encode_json (scalar, &json));	2225	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2226	XPUSHs (scalar);
2046	}	2227	}
2047		2228
2048	void decode_json (SV *jsonstr)	2229	void decode_json (SV *jsonstr)
2049	ALIAS:
2050	from_json_ = 0
2051	decode_json = F_UTF8
2052	PPCODE:	2230	PPCODE:
2053	{	2231	{
2054	JSON json;	2232	JSON json;
2055	json_init (&json);	2233	json_init (&json);
2056	json.flags \|= ix;	2234	json.flags \|= F_UTF8;
2057	XPUSHs (decode_json (jsonstr, &json, 0));	2235	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2236	XPUSHs (jsonstr);
2058	}	2237	}
2059		2238

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC vs. Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC