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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC vs.
Revision 1.128 by root, Fri Oct 7 05:18:48 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
…		…
65	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"	79	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66		80
67	#ifdef USE_ITHREADS	81	#ifdef USE_ITHREADS
68	# define JSON_SLOW 1	82	# define JSON_SLOW 1
69	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	83	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		84	# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
70	#else	85	#else
71	# define JSON_SLOW 0	86	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	87	# define JSON_STASH json_stash
		88	# define BOOL_STASH bool_stash
73	#endif	89	#endif
74		90
75	static HV json_stash, json_boolean_stash; // JSON::XS::	91	// the amount of HEs to allocate on the stack, when sorting keys
76	static SV json_true, json_false;	92	#define STACK_HES 64
		93
		94	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
		95	static SV bool_true, bool_false, *sv_json;
77		96
78	enum {	97	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	98	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	99	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	100	INCR_M_BS, // inside backslash
…		…
258	}	277	}
259		278
260	// this relies greatly on the quality of the pow ()	279	// this relies greatly on the quality of the pow ()
261	// implementation of the platform, but a good	280	// implementation of the platform, but a good
262	// implementation is hard to beat.	281	// implementation is hard to beat.
		282	// (IEEE 754 conformant ones are required to be exact)
263	if (postdp) *expo -= eaccum;	283	if (postdp) *expo -= eaccum;
264	accum += uaccum Perl_pow (10., *expo);	284	accum += uaccum Perl_pow (10., *expo);
265	*expo += eaccum;	285	*expo += eaccum;
266	}	286	}
267		287
…		…
281	// a recursion depth of ten gives us >>500 bits	301	// a recursion depth of ten gives us >>500 bits
282	json_atof_scan1 (s, &accum, &expo, 0, 10);	302	json_atof_scan1 (s, &accum, &expo, 0, 10);
283		303
284	return neg ? -accum : accum;	304	return neg ? -accum : accum;
285	}	305	}
		306
		307	// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
		308	static int
		309	ref_bool_type (SV *sv)
		310	{
		311	svtype svt = SvTYPE (sv);
		312
		313	if (svt < SVt_PVAV)
		314	{
		315	STRLEN len = 0;
		316	char *pv = svt ? SvPV (sv, len) : 0;
		317
		318	if (len == 1)
		319	if (*pv == '1')
		320	return 1;
		321	else if (*pv == '0')
		322	return 0;
		323	}
		324
		325	return -1;
		326	}
		327
		328	// returns whether scalar is not a reference in the sense of allow_nonref
		329	static int
		330	json_nonref (SV *scalar)
		331	{
		332	if (!SvROK (scalar))
		333	return 1;
		334
		335	scalar = SvRV (scalar);
		336
		337	if (SvTYPE (scalar) >= SVt_PVMG)
		338	{
		339	if (SvSTASH (scalar) == bool_stash)
		340	return 1;
		341
		342	if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
		343	return 1;
		344	}
		345
		346	return 0;
		347	}
		348
286	/////////////////////////////////////////////////////////////////////////////	349	/////////////////////////////////////////////////////////////////////////////
287	// encoder	350	// encoder
288		351
289	// structure used for encoding JSON	352	// structure used for encoding JSON
290	typedef struct	353	typedef struct
…		…
477		540
478	if (enc->indent >= enc->json.max_depth)	541	if (enc->indent >= enc->json.max_depth)
479	croak (ERR_NESTING_EXCEEDED);	542	croak (ERR_NESTING_EXCEEDED);
480		543
481	encode_ch (enc, '[');	544	encode_ch (enc, '[');
482		545
483	if (len >= 0)	546	if (len >= 0)
484	{	547	{
485	encode_nl (enc); ++enc->indent;	548	encode_nl (enc); ++enc->indent;
486		549
487	for (i = 0; i <= len; ++i)	550	for (i = 0; i <= len; ++i)
…		…
499	encode_comma (enc);	562	encode_comma (enc);
500	}	563	}
501		564
502	encode_nl (enc); --enc->indent; encode_indent (enc);	565	encode_nl (enc); --enc->indent; encode_indent (enc);
503	}	566	}
504		567
505	encode_ch (enc, ']');	568	encode_ch (enc, ']');
506	}	569	}
507		570
508	static void	571	static void
509	encode_hk (enc_t enc, HE he)	572	encode_hk (enc_t enc, HE he)
…		…
513	if (HeKLEN (he) == HEf_SVKEY)	576	if (HeKLEN (he) == HEf_SVKEY)
514	{	577	{
515	SV *sv = HeSVKEY (he);	578	SV *sv = HeSVKEY (he);
516	STRLEN len;	579	STRLEN len;
517	char *str;	580	char *str;
518		581
519	SvGETMAGIC (sv);	582	SvGETMAGIC (sv);
520	str = SvPV (sv, len);	583	str = SvPV (sv, len);
521		584
522	encode_str (enc, str, len, SvUTF8 (sv));	585	encode_str (enc, str, len, SvUTF8 (sv));
523	}	586	}
…		…
589	}	652	}
590		653
591	if (count)	654	if (count)
592	{	655	{
593	int i, fast = 1;	656	int i, fast = 1;
594	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	657	HE *hes_stack [STACK_HES];
595	HE *hes = _alloca (count sizeof (HE));	658	HE **hes = hes_stack;
596	#else	659
597	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	660	// allocate larger arrays on the heap
598	#endif	661	if (count > STACK_HES)
		662	{
		663	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		664	hes = (HE **)SvPVX (sv);
		665	}
599		666
600	i = 0;	667	i = 0;
601	while ((he = hv_iternext (hv)))	668	while ((he = hv_iternext (hv)))
602	{	669	{
603	hes [i++] = he;	670	hes [i++] = he;
…		…
672	// encode objects, arrays and special \0=false and \1=true values.	739	// encode objects, arrays and special \0=false and \1=true values.
673	static void	740	static void
674	encode_rv (enc_t enc, SV sv)	741	encode_rv (enc_t enc, SV sv)
675	{	742	{
676	svtype svt;	743	svtype svt;
		744	GV *method;
677		745
678	SvGETMAGIC (sv);	746	SvGETMAGIC (sv);
679	svt = SvTYPE (sv);	747	svt = SvTYPE (sv);
680		748
681	if (expect_false (SvOBJECT (sv)))	749	if (expect_false (SvOBJECT (sv)))
682	{	750	{
683	HV *stash = !JSON_SLOW \|\| json_boolean_stash	751	HV *stash = SvSTASH (sv);
684	? json_boolean_stash
685	: gv_stashpv ("JSON::XS::Boolean", 1);
686		752
687	if (SvSTASH (sv) == stash)	753	if (stash == bool_stash)
688	{	754	{
689	if (SvIV (sv))	755	if (SvIV (sv))
690	encode_str (enc, "true", 4, 0);	756	encode_str (enc, "true", 4, 0);
691	else	757	else
692	encode_str (enc, "false", 5, 0);	758	encode_str (enc, "false", 5, 0);
693	}	759	}
		760	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		761	{
		762	int count;
		763	dSP;
		764
		765	ENTER; SAVETMPS;
		766	SAVESTACK_POS ();
		767	PUSHMARK (SP);
		768	EXTEND (SP, 2);
		769	// we re-bless the reference to get overload and other niceties right
		770	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		771	PUSHs (sv_json);
		772
		773	PUTBACK;
		774	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		775	SPAGAIN;
		776
		777	// catch this surprisingly common error
		778	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		779	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		780
		781	encode_ch (enc, '(');
		782	encode_ch (enc, '"');
		783	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		784	encode_ch (enc, '"');
		785	encode_ch (enc, ')');
		786	encode_ch (enc, '[');
		787
		788	while (count)
		789	{
		790	encode_sv (enc, SP[1 - count--]);
		791
		792	if (count)
		793	encode_ch (enc, ',');
		794	}
		795
		796	encode_ch (enc, ']');
		797
		798	FREETMPS; LEAVE;
		799	}
		800	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		801	{
		802	dSP;
		803
		804	ENTER; SAVETMPS;
		805	PUSHMARK (SP);
		806	// we re-bless the reference to get overload and other niceties right
		807	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		808
		809	// calling with G_SCALAR ensures that we always get a 1 return value
		810	PUTBACK;
		811	call_sv ((SV *)GvCV (method), G_SCALAR);
		812	SPAGAIN;
		813
		814	// catch this surprisingly common error
		815	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		816	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		817
		818	sv = POPs;
		819	PUTBACK;
		820
		821	encode_sv (enc, sv);
		822
		823	FREETMPS; LEAVE;
		824	}
		825	else if (enc->json.flags & F_ALLOW_BLESSED)
		826	encode_str (enc, "null", 4, 0);
694	else	827	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",	828	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))));	829	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741	}
742	}	830	}
743	else if (svt == SVt_PVHV)	831	else if (svt == SVt_PVHV)
744	encode_hv (enc, (HV *)sv);	832	encode_hv (enc, (HV *)sv);
745	else if (svt == SVt_PVAV)	833	else if (svt == SVt_PVAV)
746	encode_av (enc, (AV *)sv);	834	encode_av (enc, (AV *)sv);
747	else if (svt < SVt_PVAV)	835	else if (svt < SVt_PVAV)
748	{	836	{
749	STRLEN len = 0;	837	int bool_type = ref_bool_type (sv);
750	char *pv = svt ? SvPV (sv, len) : 0;
751		838
752	if (len == 1 && *pv == '1')	839	if (bool_type == 1)
753	encode_str (enc, "true", 4, 0);	840	encode_str (enc, "true", 4, 0);
754	else if (len == 1 && *pv == '0')	841	else if (bool_type == 0)
755	encode_str (enc, "false", 5, 0);	842	encode_str (enc, "false", 5, 0);
756	else if (enc->json.flags & F_ALLOW_UNKNOWN)	843	else if (enc->json.flags & F_ALLOW_UNKNOWN)
757	encode_str (enc, "null", 4, 0);	844	encode_str (enc, "null", 4, 0);
758	else	845	else
759	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	846	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
…		…
822	}	909	}
823	else	910	else
824	{	911	{
825	// large integer, use the (rather slow) snprintf way.	912	// large integer, use the (rather slow) snprintf way.
826	need (enc, IVUV_MAXCHARS);	913	need (enc, IVUV_MAXCHARS);
827	enc->cur +=	914	enc->cur +=
828	SvIsUV(sv)	915	SvIsUV(sv)
829	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	916	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	917	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831	}	918	}
832	}	919	}
833	else if (SvROK (sv))	920	else if (SvROK (sv))
834	encode_rv (enc, SvRV (sv));	921	encode_rv (enc, SvRV (sv));
835	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	922	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
836	encode_str (enc, "null", 4, 0);	923	encode_str (enc, "null", 4, 0);
837	else	924	else
838	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	925	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
839	SvPV_nolen (sv), SvFLAGS (sv));	926	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840	}	927	}
841		928
842	static SV *	929	static SV *
843	encode_json (SV scalar, JSON json)	930	encode_json (SV scalar, JSON json)
844	{	931	{
845	enc_t enc;	932	enc_t enc;
846		933
847	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	934	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
848	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	935	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
849		936
850	enc.json = *json;	937	enc.json = *json;
851	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	938	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
852	enc.cur = SvPVX (enc.sv);	939	enc.cur = SvPVX (enc.sv);
…		…
1059	cur++ = dec_cur++;	1146	cur++ = dec_cur++;
1060	while (--clen);	1147	while (--clen);
1061		1148
1062	utf8 = 1;	1149	utf8 = 1;
1063	}	1150	}
		1151	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1152	*cur++ = ch;
1064	else	1153	else
1065	{	1154	{
1066	--dec_cur;	1155	--dec_cur;
1067		1156
1068	if (!ch)	1157	if (!ch)
…		…
1256	if (*dec->cur == ']')	1345	if (*dec->cur == ']')
1257	{	1346	{
1258	++dec->cur;	1347	++dec->cur;
1259	break;	1348	break;
1260	}	1349	}
1261		1350
1262	if (*dec->cur != ',')	1351	if (*dec->cur != ',')
1263	ERR (", or ] expected while parsing array");	1352	ERR (", or ] expected while parsing array");
1264		1353
1265	++dec->cur;	1354	++dec->cur;
1266		1355
…		…
1390		1479
1391	hv_iterinit (hv);	1480	hv_iterinit (hv);
1392	he = hv_iternext (hv);	1481	he = hv_iternext (hv);
1393	hv_iterinit (hv);	1482	hv_iterinit (hv);
1394		1483
1395	// the next line creates a mortal sv each time its called.	1484	// the next line creates a mortal sv each time it's called.
1396	// might want to optimise this for common cases.	1485	// might want to optimise this for common cases.
1397	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1486	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1398		1487
1399	if (cb)	1488	if (cb)
1400	{	1489	{
1401	dSP;	1490	dSP;
1402	int count;	1491	int count;
1403		1492
1404	ENTER; SAVETMPS; PUSHMARK (SP);	1493	ENTER; SAVETMPS;
		1494	SAVESTACK_POS ();
		1495	PUSHMARK (SP);
1405	XPUSHs (HeVAL (he));	1496	XPUSHs (HeVAL (he));
		1497	sv_2mortal (sv);
1406		1498
1407	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1499	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1408		1500
1409	if (count == 1)	1501	if (count == 1)
1410	{	1502	{
1411	sv = newSVsv (POPs);	1503	sv = newSVsv (POPs);
1412	FREETMPS; LEAVE;	1504	FREETMPS; LEAVE;
1413	return sv;	1505	return sv;
1414	}	1506	}
1415		1507
		1508	SvREFCNT_inc (sv);
1416	FREETMPS; LEAVE;	1509	FREETMPS; LEAVE;
1417	}	1510	}
1418	}	1511	}
1419		1512
1420	if (dec->json.cb_object)	1513	if (dec->json.cb_object)
1421	{	1514	{
1422	dSP;	1515	dSP;
1423	int count;	1516	int count;
1424		1517
1425	ENTER; SAVETMPS; PUSHMARK (SP);	1518	ENTER; SAVETMPS;
		1519	SAVESTACK_POS ();
		1520	PUSHMARK (SP);
1426	XPUSHs (sv_2mortal (sv));	1521	XPUSHs (sv_2mortal (sv));
1427		1522
1428	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1523	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1429		1524
1430	if (count == 1)	1525	if (count == 1)
…		…
1446	DEC_DEC_DEPTH;	1541	DEC_DEC_DEPTH;
1447	return 0;	1542	return 0;
1448	}	1543	}
1449		1544
1450	static SV *	1545	static SV *
		1546	decode_tag (dec_t *dec)
		1547	{
		1548	SV *tag = 0;
		1549	SV *val = 0;
		1550
		1551	if (!(dec->json.flags & F_ALLOW_TAGS))
		1552	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1553
		1554	++dec->cur;
		1555
		1556	decode_ws (dec);
		1557
		1558	tag = decode_sv (dec);
		1559	if (!tag)
		1560	goto fail;
		1561
		1562	if (!SvPOK (tag))
		1563	ERR ("malformed JSON string, (tag) must be a string");
		1564
		1565	decode_ws (dec);
		1566
		1567	if (*dec->cur != ')')
		1568	ERR (") expected after tag");
		1569
		1570	++dec->cur;
		1571
		1572	decode_ws (dec);
		1573
		1574	val = decode_sv (dec);
		1575	if (!val)
		1576	goto fail;
		1577
		1578	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1579	ERR ("malformed JSON string, tag value must be an array");
		1580
		1581	{
		1582	AV av = (AV )SvRV (val);
		1583	int i, len = av_len (av) + 1;
		1584	HV *stash = gv_stashsv (tag, 0);
		1585	SV *sv;
		1586
		1587	if (!stash)
		1588	ERR ("cannot decode perl-object (package does not exist)");
		1589
		1590	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1591
		1592	if (!method)
		1593	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1594
		1595	dSP;
		1596
		1597	ENTER; SAVETMPS;
		1598	PUSHMARK (SP);
		1599	EXTEND (SP, len + 2);
		1600	// we re-bless the reference to get overload and other niceties right
		1601	PUSHs (tag);
		1602	PUSHs (sv_json);
		1603
		1604	for (i = 0; i < len; ++i)
		1605	PUSHs (*av_fetch (av, i, 1));
		1606
		1607	PUTBACK;
		1608	call_sv ((SV *)GvCV (method), G_SCALAR);
		1609	SPAGAIN;
		1610
		1611	SvREFCNT_dec (tag);
		1612	SvREFCNT_dec (val);
		1613	sv = SvREFCNT_inc (POPs);
		1614
		1615	PUTBACK;
		1616
		1617	FREETMPS; LEAVE;
		1618
		1619	return sv;
		1620	}
		1621
		1622	fail:
		1623	SvREFCNT_dec (tag);
		1624	SvREFCNT_dec (val);
		1625	return 0;
		1626	}
		1627
		1628	static SV *
1451	decode_sv (dec_t *dec)	1629	decode_sv (dec_t *dec)
1452	{	1630	{
1453	// the beauty of JSON: you need exactly one character lookahead	1631	// the beauty of JSON: you need exactly one character lookahead
1454	// to parse everything.	1632	// to parse everything.
1455	switch (*dec->cur)	1633	switch (*dec->cur)
1456	{	1634	{
1457	case '"': ++dec->cur; return decode_str (dec);	1635	case '"': ++dec->cur; return decode_str (dec);
1458	case '[': ++dec->cur; return decode_av (dec);	1636	case '[': ++dec->cur; return decode_av (dec);
1459	case '{': ++dec->cur; return decode_hv (dec);	1637	case '{': ++dec->cur; return decode_hv (dec);
		1638	case '(': return decode_tag (dec);
1460		1639
1461	case '-':	1640	case '-':
1462	case '0': case '1': case '2': case '3': case '4':	1641	case '0': case '1': case '2': case '3': case '4':
1463	case '5': case '6': case '7': case '8': case '9':	1642	case '5': case '6': case '7': case '8': case '9':
1464	return decode_num (dec);	1643	return decode_num (dec);
…		…
1466	case 't':	1645	case 't':
1467	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1646	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1468	{	1647	{
1469	dec->cur += 4;	1648	dec->cur += 4;
1470	#if JSON_SLOW	1649	#if JSON_SLOW
1471	json_true = get_bool ("JSON::XS::true");	1650	bool_true = get_bool ("Types::Serialiser::true");
1472	#endif	1651	#endif
1473	return newSVsv (json_true);	1652	return newSVsv (bool_true);
1474	}	1653	}
1475	else	1654	else
1476	ERR ("'true' expected");	1655	ERR ("'true' expected");
1477		1656
1478	break;	1657	break;
…		…
1480	case 'f':	1659	case 'f':
1481	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1660	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1482	{	1661	{
1483	dec->cur += 5;	1662	dec->cur += 5;
1484	#if JSON_SLOW	1663	#if JSON_SLOW
1485	json_false = get_bool ("JSON::XS::false");	1664	bool_false = get_bool ("Types::Serialiser::false");
1486	#endif	1665	#endif
1487	return newSVsv (json_false);	1666	return newSVsv (bool_false);
1488	}	1667	}
1489	else	1668	else
1490	ERR ("'false' expected");	1669	ERR ("'false' expected");
1491		1670
1492	break;	1671	break;
…		…
1501	ERR ("'null' expected");	1680	ERR ("'null' expected");
1502		1681
1503	break;	1682	break;
1504		1683
1505	default:	1684	default:
1506	ERR ("malformed JSON string, neither array, object, number, string or atom");	1685	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1507	break;	1686	break;
1508	}	1687	}
1509		1688
1510	fail:	1689	fail:
1511	return 0;	1690	return 0;
…		…
1516	{	1695	{
1517	dec_t dec;	1696	dec_t dec;
1518	SV *sv;	1697	SV *sv;
1519		1698
1520	/* work around bugs in 5.10 where manipulating magic values	1699	/* work around bugs in 5.10 where manipulating magic values
1521	* will perl ignore the magic in subsequent accesses	1700	* makes perl ignore the magic in subsequent accesses.
		1701	* also make a copy of non-PV values, to get them into a clean
		1702	* state (SvPV should do that, but it's buggy, see below).
		1703	*
		1704	* SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
		1705	* as reported by Reini Urban.
1522	*/	1706	*/
1523	/SvGETMAGIC (string);/	1707	/SvGETMAGIC (string);/
1524	if (SvMAGICAL (string))	1708	if (SvMAGICAL (string) \|\| !SvPOK (string) \|\| SvIsCOW_shared_hash (string))
1525	string = sv_2mortal (newSVsv (string));	1709	string = sv_2mortal (newSVsv (string));
1526		1710
1527	SvUPGRADE (string, SVt_PV);	1711	SvUPGRADE (string, SVt_PV);
1528		1712
1529	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1713	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1546	if (offset > json->max_size && json->max_size)	1730	if (offset > json->max_size && json->max_size)
1547	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1731	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1548	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1732	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549	}	1733	}
1550		1734
1551	if (json->flags & F_UTF8)	1735	if (DECODE_WANTS_OCTETS (json))
1552	sv_utf8_downgrade (string, 0);	1736	sv_utf8_downgrade (string, 0);
1553	else	1737	else
1554	sv_utf8_upgrade (string);	1738	sv_utf8_upgrade (string);
1555		1739
1556	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1740	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1598	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1782	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1599	LEAVE;	1783	LEAVE;
1600		1784
1601	croak ("%s, at character offset %d (before \"%s\")",	1785	croak ("%s, at character offset %d (before \"%s\")",
1602	dec.err,	1786	dec.err,
1603	ptr_to_index (string, dec.cur),	1787	(int)ptr_to_index (string, dec.cur),
1604	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1788	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1605	}	1789	}
1606		1790
1607	sv = sv_2mortal (sv);	1791	sv = sv_2mortal (sv);
1608		1792
1609	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1793	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1610	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1794	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1611		1795
1612	return sv;	1796	return sv;
1613	}	1797	}
1614		1798
…		…
1736	self->incr_mode = INCR_M_STR;	1920	self->incr_mode = INCR_M_STR;
1737	goto incr_m_str;	1921	goto incr_m_str;
1738		1922
1739	case '[':	1923	case '[':
1740	case '{':	1924	case '{':
		1925	case '(':
1741	if (++self->incr_nest > self->max_depth)	1926	if (++self->incr_nest > self->max_depth)
1742	croak (ERR_NESTING_EXCEEDED);	1927	croak (ERR_NESTING_EXCEEDED);
1743	break;	1928	break;
1744		1929
1745	case ']':	1930	case ']':
1746	case '}':	1931	case '}':
1747	if (--self->incr_nest <= 0)	1932	if (--self->incr_nest <= 0)
1748	goto interrupt;	1933	goto interrupt;
		1934	break;
		1935
		1936	case ')':
		1937	--self->incr_nest;
1749	break;	1938	break;
1750		1939
1751	case '#':	1940	case '#':
1752	self->incr_mode = INCR_M_C1;	1941	self->incr_mode = INCR_M_C1;
1753	goto incr_m_c;	1942	goto incr_m_c;
…		…
1779	i >= '0' && i <= '9' ? i - '0'	1968	i >= '0' && i <= '9' ? i - '0'
1780	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1969	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1781	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1970	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1782	: -1;	1971	: -1;
1783		1972
1784	json_stash = gv_stashpv ("JSON::XS" , 1);	1973	json_stash = gv_stashpv ("JSON::XS" , 1);
1785	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1974	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1786
1787	json_true = get_bool ("JSON::XS::true");	1975	bool_true = get_bool ("Types::Serialiser::true");
1788	json_false = get_bool ("JSON::XS::false");	1976	bool_false = get_bool ("Types::Serialiser::false");
		1977
		1978	sv_json = newSVpv ("JSON", 0);
		1979	SvREADONLY_on (sv_json);
1789		1980
1790	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1981	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1791	}	1982	}
1792		1983
1793	PROTOTYPES: DISABLE	1984	PROTOTYPES: DISABLE
1794		1985
1795	void CLONE (...)	1986	void CLONE (...)
1796	CODE:	1987	CODE:
1797	json_stash = 0;	1988	json_stash = 0;
1798	json_boolean_stash = 0;	1989	bool_stash = 0;
1799		1990
1800	void new (char *klass)	1991	void new (char *klass)
1801	PPCODE:	1992	PPCODE:
1802	{	1993	{
1803	SV *pv = NEWSV (0, sizeof (JSON));	1994	SV *pv = NEWSV (0, sizeof (JSON));
1804	SvPOK_only (pv);	1995	SvPOK_only (pv);
1805	json_init ((JSON *)SvPVX (pv));	1996	json_init ((JSON *)SvPVX (pv));
1806	XPUSHs (sv_2mortal (sv_bless (	1997	XPUSHs (sv_2mortal (sv_bless (
1807	newRV_noinc (pv),	1998	newRV_noinc (pv),
1808	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1999	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1823	shrink = F_SHRINK	2014	shrink = F_SHRINK
1824	allow_blessed = F_ALLOW_BLESSED	2015	allow_blessed = F_ALLOW_BLESSED
1825	convert_blessed = F_CONV_BLESSED	2016	convert_blessed = F_CONV_BLESSED
1826	relaxed = F_RELAXED	2017	relaxed = F_RELAXED
1827	allow_unknown = F_ALLOW_UNKNOWN	2018	allow_unknown = F_ALLOW_UNKNOWN
		2019	allow_tags = F_ALLOW_TAGS
1828	PPCODE:	2020	PPCODE:
1829	{	2021	{
1830	if (enable)	2022	if (enable)
1831	self->flags \|= ix;	2023	self->flags \|= ix;
1832	else	2024	else
…		…
1848	get_shrink = F_SHRINK	2040	get_shrink = F_SHRINK
1849	get_allow_blessed = F_ALLOW_BLESSED	2041	get_allow_blessed = F_ALLOW_BLESSED
1850	get_convert_blessed = F_CONV_BLESSED	2042	get_convert_blessed = F_CONV_BLESSED
1851	get_relaxed = F_RELAXED	2043	get_relaxed = F_RELAXED
1852	get_allow_unknown = F_ALLOW_UNKNOWN	2044	get_allow_unknown = F_ALLOW_UNKNOWN
		2045	get_allow_tags = F_ALLOW_TAGS
1853	PPCODE:	2046	PPCODE:
1854	XPUSHs (boolSV (self->flags & ix));	2047	XPUSHs (boolSV (self->flags & ix));
1855		2048
1856	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2049	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1857	PPCODE:	2050	PPCODE:
…		…
1885	}	2078	}
1886		2079
1887	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2080	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1888	PPCODE:	2081	PPCODE:
1889	{	2082	{
1890	if (!self->cb_sk_object)	2083	if (!self->cb_sk_object)
1891	self->cb_sk_object = newHV ();	2084	self->cb_sk_object = newHV ();
1892		2085
1893	if (SvOK (cb))	2086	if (SvOK (cb))
1894	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2087	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1895	else	2088	else
…		…
1906	XPUSHs (ST (0));	2099	XPUSHs (ST (0));
1907	}	2100	}
1908		2101
1909	void encode (JSON self, SV scalar)	2102	void encode (JSON self, SV scalar)
1910	PPCODE:	2103	PPCODE:
1911	XPUSHs (encode_json (scalar, self));	2104	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2105	XPUSHs (scalar);
1912		2106
1913	void decode (JSON self, SV jsonstr)	2107	void decode (JSON self, SV jsonstr)
1914	PPCODE:	2108	PPCODE:
1915	XPUSHs (decode_json (jsonstr, self, 0));	2109	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2110	XPUSHs (jsonstr);
1916		2111
1917	void decode_prefix (JSON self, SV jsonstr)	2112	void decode_prefix (JSON self, SV jsonstr)
1918	PPCODE:	2113	PPCODE:
1919	{	2114	{
		2115	SV *sv;
1920	char *offset;	2116	char *offset;
		2117	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1921	EXTEND (SP, 2);	2118	EXTEND (SP, 2);
1922	PUSHs (decode_json (jsonstr, self, &offset));	2119	PUSHs (sv);
1923	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2120	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1924	}	2121	}
1925		2122
1926	void incr_parse (JSON self, SV jsonstr = 0)	2123	void incr_parse (JSON self, SV jsonstr = 0)
1927	PPCODE:	2124	PPCODE:
1928	{	2125	{
1929	if (!self->incr_text)	2126	if (!self->incr_text)
1930	self->incr_text = newSVpvn ("", 0);	2127	self->incr_text = newSVpvn ("", 0);
		2128
		2129	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2130	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2131	if (DECODE_WANTS_OCTETS (self))
		2132	{
		2133	if (self->incr_pos)
		2134	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2135	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2136
		2137	sv_utf8_downgrade (self->incr_text, 0);
		2138	}
		2139	else
		2140	{
		2141	sv_utf8_upgrade (self->incr_text);
		2142
		2143	if (self->incr_pos)
		2144	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2145	- (U8 *)SvPVX (self->incr_text);
		2146	}
1931		2147
1932	// append data, if any	2148	// append data, if any
1933	if (jsonstr)	2149	if (jsonstr)
1934	{	2150	{
		2151	/* make sure both strings have same encoding */
		2152	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1935	if (SvUTF8 (jsonstr))	2153	if (SvUTF8 (jsonstr))
		2154	sv_utf8_downgrade (jsonstr, 0);
1936	{	2155	else
1937	if (!SvUTF8 (self->incr_text))
1938	{
1939	/* utf-8-ness differs, need to upgrade */
1940	sv_utf8_upgrade (self->incr_text);
1941
1942	if (self->incr_pos)
1943	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1944	- (U8 *)SvPVX (self->incr_text);
1945	}
1946	}
1947	else if (SvUTF8 (self->incr_text))
1948	sv_utf8_upgrade (jsonstr);	2156	sv_utf8_upgrade (jsonstr);
1949		2157
		2158	/* and then just blindly append */
1950	{	2159	{
1951	STRLEN len;	2160	STRLEN len;
1952	const char *str = SvPV (jsonstr, len);	2161	const char *str = SvPV (jsonstr, len);
1953	STRLEN cur = SvCUR (self->incr_text);	2162	STRLEN cur = SvCUR (self->incr_text);
1954		2163
…		…
1962	}	2171	}
1963		2172
1964	if (GIMME_V != G_VOID)	2173	if (GIMME_V != G_VOID)
1965	do	2174	do
1966	{	2175	{
		2176	SV *sv;
1967	char *offset;	2177	char *offset;
1968		2178
1969	if (!INCR_DONE (self))	2179	if (!INCR_DONE (self))
1970	{	2180	{
1971	incr_parse (self);	2181	incr_parse (self);
…		…
1973	if (self->incr_pos > self->max_size && self->max_size)	2183	if (self->incr_pos > self->max_size && self->max_size)
1974	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2184	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1975	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2185	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976		2186
1977	if (!INCR_DONE (self))	2187	if (!INCR_DONE (self))
		2188	{
		2189	// as an optimisation, do not accumulate white space in the incr buffer
		2190	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2191	{
		2192	self->incr_pos = 0;
		2193	SvCUR_set (self->incr_text, 0);
		2194	}
		2195
1978	break;	2196	break;
		2197	}
1979	}	2198	}
1980		2199
1981	XPUSHs (decode_json (self->incr_text, self, &offset));	2200	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2201	XPUSHs (sv);
1982		2202
1983	self->incr_pos -= offset - SvPVX (self->incr_text);	2203	self->incr_pos -= offset - SvPVX (self->incr_text);
1984	self->incr_nest = 0;	2204	self->incr_nest = 0;
1985	self->incr_mode = 0;	2205	self->incr_mode = 0;
1986		2206
…		…
2030	SvREFCNT_dec (self->incr_text);	2250	SvREFCNT_dec (self->incr_text);
2031		2251
2032	PROTOTYPES: ENABLE	2252	PROTOTYPES: ENABLE
2033		2253
2034	void encode_json (SV *scalar)	2254	void encode_json (SV *scalar)
2035	ALIAS:
2036	to_json_ = 0
2037	encode_json = F_UTF8
2038	PPCODE:	2255	PPCODE:
2039	{	2256	{
2040	JSON json;	2257	JSON json;
2041	json_init (&json);	2258	json_init (&json);
2042	json.flags \|= ix;	2259	json.flags \|= F_UTF8;
2043	XPUSHs (encode_json (scalar, &json));	2260	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2261	XPUSHs (scalar);
2044	}	2262	}
2045		2263
2046	void decode_json (SV *jsonstr)	2264	void decode_json (SV *jsonstr)
2047	ALIAS:
2048	from_json_ = 0
2049	decode_json = F_UTF8
2050	PPCODE:	2265	PPCODE:
2051	{	2266	{
2052	JSON json;	2267	JSON json;
2053	json_init (&json);	2268	json_init (&json);
2054	json.flags \|= ix;	2269	json.flags \|= F_UTF8;
2055	XPUSHs (decode_json (jsonstr, &json, 0));	2270	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2271	XPUSHs (jsonstr);
2056	}	2272	}
2057		2273

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC vs. Revision 1.128 by root, Fri Oct 7 05:18:48 2016 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC vs.
Revision 1.128 by root, Fri Oct 7 05:18:48 2016 UTC