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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs.
Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC

…		…
6	#include <string.h>	6	#include <string.h>
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
		11	#include <inttypes.h>
11		12
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	13	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	14	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	15	#endif
15		16
16	// some old perls do not have this, try to make it work, no	17	// 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.	18	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	19	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	20	# define UTF8_MAXBYTES 13
		21	#endif
		22
		23	// compatibility with perl <5.18
		24	#ifndef HvNAMELEN_get
		25	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		26	#endif
		27	#ifndef HvNAMELEN
		28	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		29	#endif
		30	#ifndef HvNAMEUTF8
		31	# define HvNAMEUTF8(hv) 0
20	#endif	32	#endif
21		33
22	// three extra for rounding, sign, and end of string	34	// three extra for rounding, sign, and end of string
23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)	35	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24		36
…		…
33	#define F_SHRINK 0x00000200UL	45	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	46	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	47	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	48	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	49	#define F_ALLOW_UNKNOWN 0x00002000UL
		50	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	51	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		52
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	53	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		54
42	#define INIT_SIZE 32 // initial scalar size to be allocated	55	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
67	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"	80	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68		81
69	#ifdef USE_ITHREADS	82	#ifdef USE_ITHREADS
70	# define JSON_SLOW 1	83	# define JSON_SLOW 1
71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	84	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		85	# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
72	#else	86	#else
73	# define JSON_SLOW 0	87	# define JSON_SLOW 0
74	# define JSON_STASH json_stash	88	# define JSON_STASH json_stash
		89	# define BOOL_STASH bool_stash
75	#endif	90	#endif
76		91
77	static HV json_stash, json_boolean_stash; // JSON::XS::	92	// the amount of HEs to allocate on the stack, when sorting keys
78	static SV json_true, json_false;	93	#define STACK_HES 64
		94
		95	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
		96	static SV bool_true, bool_false, *sv_json;
79		97
80	enum {	98	enum {
81	INCR_M_WS = 0, // initial whitespace skipping, must be 0	99	INCR_M_WS = 0, // initial whitespace skipping, must be 0
82	INCR_M_STR, // inside string	100	INCR_M_STR, // inside string
83	INCR_M_BS, // inside backslash	101	INCR_M_BS, // inside backslash
…		…
137	SvPV_renew (sv, SvCUR (sv) + 1);	155	SvPV_renew (sv, SvCUR (sv) + 1);
138	#endif	156	#endif
139	}	157	}
140	}	158	}
141		159
		160	/* adds two STRLENs together, slow, and with paranoia */
		161	STRLEN
		162	strlen_sum (STRLEN l1, STRLEN l2)
		163	{
		164	size_t sum = l1 + l2;
		165
		166	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
		167	croak ("JSON::XS: string size overflow");
		168
		169	return sum;
		170	}
		171
		172	/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
		173	static char *
		174	json_sv_grow (SV *sv, size_t len1, size_t len2)
		175	{
		176	len1 = strlen_sum (len1, len2);
		177	len1 = strlen_sum (len1, len1 >> 1);
		178
		179	if (len1 > 4096 - 24)
		180	len1 = (len1 \| 4095) - 24;
		181
		182	return SvGROW (sv, len1);
		183	}
		184
142	// decode an utf-8 character and return it, or (UV)-1 in	185	// decode a utf-8 character and return it, or (UV)-1 in
143	// case of an error.	186	// case of an error.
144	// we special-case "safe" characters from U+80 .. U+7FF,	187	// we special-case "safe" characters from U+80 .. U+7FF,
145	// but use the very good perl function to parse anything else.	188	// but use the very good perl function to parse anything else.
146	// note that we never call this function for a ascii codepoints	189	// note that we never call this function for a ascii codepoints
147	INLINE UV	190	INLINE UV
…		…
284	// a recursion depth of ten gives us >>500 bits	327	// a recursion depth of ten gives us >>500 bits
285	json_atof_scan1 (s, &accum, &expo, 0, 10);	328	json_atof_scan1 (s, &accum, &expo, 0, 10);
286		329
287	return neg ? -accum : accum;	330	return neg ? -accum : accum;
288	}	331	}
		332
		333	// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
		334	static int
		335	ref_bool_type (SV *sv)
		336	{
		337	svtype svt = SvTYPE (sv);
		338
		339	if (svt < SVt_PVAV)
		340	{
		341	STRLEN len = 0;
		342	char *pv = svt ? SvPV (sv, len) : 0;
		343
		344	if (len == 1)
		345	if (*pv == '1')
		346	return 1;
		347	else if (*pv == '0')
		348	return 0;
		349	}
		350
		351	return -1;
		352	}
		353
		354	// returns whether scalar is not a reference in the sense of allow_nonref
		355	static int
		356	json_nonref (SV *scalar)
		357	{
		358	if (!SvROK (scalar))
		359	return 1;
		360
		361	scalar = SvRV (scalar);
		362
		363	if (SvTYPE (scalar) >= SVt_PVMG)
		364	{
		365	if (SvSTASH (scalar) == bool_stash)
		366	return 1;
		367
		368	if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
		369	return 1;
		370	}
		371
		372	return 0;
		373	}
		374
289	/////////////////////////////////////////////////////////////////////////////	375	/////////////////////////////////////////////////////////////////////////////
290	// encoder	376	// encoder
291		377
292	// structure used for encoding JSON	378	// structure used for encoding JSON
293	typedef struct	379	typedef struct
…		…
301	} enc_t;	387	} enc_t;
302		388
303	INLINE void	389	INLINE void
304	need (enc_t *enc, STRLEN len)	390	need (enc_t *enc, STRLEN len)
305	{	391	{
306	if (expect_false (enc->cur + len >= enc->end))	392	if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
307	{	393	{
308	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	394	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
309	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	395	char *buf = json_sv_grow (enc->sv, cur, len);
310	enc->cur = SvPVX (enc->sv) + cur;	396	enc->cur = buf + cur;
311	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	397	enc->end = buf + SvLEN (enc->sv) - 1;
312	}	398	}
313	}	399	}
314		400
315	INLINE void	401	INLINE void
316	encode_ch (enc_t *enc, char ch)	402	encode_ch (enc_t *enc, char ch)
…		…
332		418
333	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case	419	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
334	{	420	{
335	if (expect_false (ch == '"')) // but with slow exceptions	421	if (expect_false (ch == '"')) // but with slow exceptions
336	{	422	{
337	need (enc, len += 1);	423	need (enc, len + 1);
338	*enc->cur++ = '\\';	424	*enc->cur++ = '\\';
339	*enc->cur++ = '"';	425	*enc->cur++ = '"';
340	}	426	}
341	else if (expect_false (ch == '\\'))	427	else if (expect_false (ch == '\\'))
342	{	428	{
343	need (enc, len += 1);	429	need (enc, len + 1);
344	*enc->cur++ = '\\';	430	*enc->cur++ = '\\';
345	*enc->cur++ = '\\';	431	*enc->cur++ = '\\';
346	}	432	}
347	else	433	else
348	*enc->cur++ = ch;	434	*enc->cur++ = ch;
…		…
351	}	437	}
352	else	438	else
353	{	439	{
354	switch (ch)	440	switch (ch)
355	{	441	{
356	case '\010': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;	442	case '\010': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;
357	case '\011': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;	443	case '\011': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;
358	case '\012': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;	444	case '\012': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;
359	case '\014': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;	445	case '\014': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;
360	case '\015': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;	446	case '\015': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;
361		447
362	default:	448	default:
363	{	449	{
364	STRLEN clen;	450	STRLEN clen;
365	UV uch;	451	UV uch;
…		…
381	if (uch >= 0x10000UL)	467	if (uch >= 0x10000UL)
382	{	468	{
383	if (uch >= 0x110000UL)	469	if (uch >= 0x110000UL)
384	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	470	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
385		471
386	need (enc, len += 11);	472	need (enc, len + 11);
387	sprintf (enc->cur, "\\u%04x\\u%04x",	473	sprintf (enc->cur, "\\u%04x\\u%04x",
388	(int)((uch - 0x10000) / 0x400 + 0xD800),	474	(int)((uch - 0x10000) / 0x400 + 0xD800),
389	(int)((uch - 0x10000) % 0x400 + 0xDC00));	475	(int)((uch - 0x10000) % 0x400 + 0xDC00));
390	enc->cur += 12;	476	enc->cur += 12;
391	}	477	}
392	else	478	else
393	{	479	{
394	need (enc, len += 5);	480	need (enc, len + 5);
395	*enc->cur++ = '\\';	481	*enc->cur++ = '\\';
396	*enc->cur++ = 'u';	482	*enc->cur++ = 'u';
397	*enc->cur++ = PL_hexdigit [ uch >> 12 ];	483	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
398	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];	484	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
399	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];	485	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
…		…
407	*enc->cur++ = uch;	493	*enc->cur++ = uch;
408	str += clen;	494	str += clen;
409	}	495	}
410	else if (is_utf8)	496	else if (is_utf8)
411	{	497	{
412	need (enc, len += clen);	498	need (enc, len + clen);
413	do	499	do
414	{	500	{
415	enc->cur++ = str++;	501	enc->cur++ = str++;
416	}	502	}
417	while (--clen);	503	while (--clen);
418	}	504	}
419	else	505	else
420	{	506	{
421	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	507	need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
422	enc->cur = encode_utf8 (enc->cur, uch);	508	enc->cur = encode_utf8 (enc->cur, uch);
423	++str;	509	++str;
424	}	510	}
425	}	511	}
426	}	512	}
…		…
480		566
481	if (enc->indent >= enc->json.max_depth)	567	if (enc->indent >= enc->json.max_depth)
482	croak (ERR_NESTING_EXCEEDED);	568	croak (ERR_NESTING_EXCEEDED);
483		569
484	encode_ch (enc, '[');	570	encode_ch (enc, '[');
485		571
486	if (len >= 0)	572	if (len >= 0)
487	{	573	{
488	encode_nl (enc); ++enc->indent;	574	encode_nl (enc); ++enc->indent;
489		575
490	for (i = 0; i <= len; ++i)	576	for (i = 0; i <= len; ++i)
…		…
502	encode_comma (enc);	588	encode_comma (enc);
503	}	589	}
504		590
505	encode_nl (enc); --enc->indent; encode_indent (enc);	591	encode_nl (enc); --enc->indent; encode_indent (enc);
506	}	592	}
507		593
508	encode_ch (enc, ']');	594	encode_ch (enc, ']');
509	}	595	}
510		596
511	static void	597	static void
512	encode_hk (enc_t enc, HE he)	598	encode_hk (enc_t enc, HE he)
…		…
516	if (HeKLEN (he) == HEf_SVKEY)	602	if (HeKLEN (he) == HEf_SVKEY)
517	{	603	{
518	SV *sv = HeSVKEY (he);	604	SV *sv = HeSVKEY (he);
519	STRLEN len;	605	STRLEN len;
520	char *str;	606	char *str;
521		607
522	SvGETMAGIC (sv);	608	SvGETMAGIC (sv);
523	str = SvPV (sv, len);	609	str = SvPV (sv, len);
524		610
525	encode_str (enc, str, len, SvUTF8 (sv));	611	encode_str (enc, str, len, SvUTF8 (sv));
526	}	612	}
…		…
592	}	678	}
593		679
594	if (count)	680	if (count)
595	{	681	{
596	int i, fast = 1;	682	int i, fast = 1;
597	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	683	HE *hes_stack [STACK_HES];
598	HE *hes = _alloca (count sizeof (HE));	684	HE **hes = hes_stack;
599	#else	685
600	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	686	// allocate larger arrays on the heap
601	#endif	687	if (count > STACK_HES)
		688	{
		689	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		690	hes = (HE **)SvPVX (sv);
		691	}
602		692
603	i = 0;	693	i = 0;
604	while ((he = hv_iternext (hv)))	694	while ((he = hv_iternext (hv)))
605	{	695	{
606	hes [i++] = he;	696	hes [i++] = he;
…		…
675	// encode objects, arrays and special \0=false and \1=true values.	765	// encode objects, arrays and special \0=false and \1=true values.
676	static void	766	static void
677	encode_rv (enc_t enc, SV sv)	767	encode_rv (enc_t enc, SV sv)
678	{	768	{
679	svtype svt;	769	svtype svt;
		770	GV *method;
680		771
681	SvGETMAGIC (sv);	772	SvGETMAGIC (sv);
682	svt = SvTYPE (sv);	773	svt = SvTYPE (sv);
683		774
684	if (expect_false (SvOBJECT (sv)))	775	if (expect_false (SvOBJECT (sv)))
685	{	776	{
686	HV *stash = !JSON_SLOW \|\| json_boolean_stash	777	HV *stash = SvSTASH (sv);
687	? json_boolean_stash
688	: gv_stashpv ("JSON::XS::Boolean", 1);
689		778
690	if (SvSTASH (sv) == stash)	779	if (stash == bool_stash)
691	{	780	{
692	if (SvIV (sv))	781	if (SvIV (sv))
693	encode_str (enc, "true", 4, 0);	782	encode_str (enc, "true", 4, 0);
694	else	783	else
695	encode_str (enc, "false", 5, 0);	784	encode_str (enc, "false", 5, 0);
696	}	785	}
		786	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		787	{
		788	int count;
		789	dSP;
		790
		791	ENTER; SAVETMPS;
		792	SAVESTACK_POS ();
		793	PUSHMARK (SP);
		794	EXTEND (SP, 2);
		795	// we re-bless the reference to get overload and other niceties right
		796	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		797	PUSHs (sv_json);
		798
		799	PUTBACK;
		800	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		801	SPAGAIN;
		802
		803	// catch this surprisingly common error
		804	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		805	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		806
		807	encode_ch (enc, '(');
		808	encode_ch (enc, '"');
		809	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		810	encode_ch (enc, '"');
		811	encode_ch (enc, ')');
		812	encode_ch (enc, '[');
		813
		814	while (count)
		815	{
		816	encode_sv (enc, SP[1 - count--]);
		817
		818	if (count)
		819	encode_ch (enc, ',');
		820	}
		821
		822	encode_ch (enc, ']');
		823
		824	FREETMPS; LEAVE;
		825	}
		826	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		827	{
		828	dSP;
		829
		830	ENTER; SAVETMPS;
		831	PUSHMARK (SP);
		832	// we re-bless the reference to get overload and other niceties right
		833	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		834
		835	// calling with G_SCALAR ensures that we always get a 1 return value
		836	PUTBACK;
		837	call_sv ((SV *)GvCV (method), G_SCALAR);
		838	SPAGAIN;
		839
		840	// catch this surprisingly common error
		841	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		842	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		843
		844	sv = POPs;
		845	PUTBACK;
		846
		847	encode_sv (enc, sv);
		848
		849	FREETMPS; LEAVE;
		850	}
		851	else if (enc->json.flags & F_ALLOW_BLESSED)
		852	encode_str (enc, "null", 4, 0);
697	else	853	else
698	{
699	#if 0
700	if (0 && sv_derived_from (rv, "JSON::Literal"))
701	{
702	// not yet
703	}
704	#endif
705	if (enc->json.flags & F_CONV_BLESSED)
706	{
707	// we re-bless the reference to get overload and other niceties right
708	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
709
710	if (to_json)
711	{
712	dSP;
713
714	ENTER; SAVETMPS; PUSHMARK (SP);
715	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
716
717	// calling with G_SCALAR ensures that we always get a 1 return value
718	PUTBACK;
719	call_sv ((SV *)GvCV (to_json), G_SCALAR);
720	SPAGAIN;
721
722	// catch this surprisingly common error
723	if (SvROK (TOPs) && SvRV (TOPs) == sv)
724	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725
726	sv = POPs;
727	PUTBACK;
728
729	encode_sv (enc, sv);
730
731	FREETMPS; LEAVE;
732	}
733	else if (enc->json.flags & F_ALLOW_BLESSED)
734	encode_str (enc, "null", 4, 0);
735	else
736	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
737	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
738	}
739	else if (enc->json.flags & F_ALLOW_BLESSED)
740	encode_str (enc, "null", 4, 0);
741	else
742	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	854	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
743	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	855	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744	}
745	}	856	}
746	else if (svt == SVt_PVHV)	857	else if (svt == SVt_PVHV)
747	encode_hv (enc, (HV *)sv);	858	encode_hv (enc, (HV *)sv);
748	else if (svt == SVt_PVAV)	859	else if (svt == SVt_PVAV)
749	encode_av (enc, (AV *)sv);	860	encode_av (enc, (AV *)sv);
750	else if (svt < SVt_PVAV)	861	else if (svt < SVt_PVAV)
751	{	862	{
752	STRLEN len = 0;	863	int bool_type = ref_bool_type (sv);
753	char *pv = svt ? SvPV (sv, len) : 0;
754		864
755	if (len == 1 && *pv == '1')	865	if (bool_type == 1)
756	encode_str (enc, "true", 4, 0);	866	encode_str (enc, "true", 4, 0);
757	else if (len == 1 && *pv == '0')	867	else if (bool_type == 0)
758	encode_str (enc, "false", 5, 0);	868	encode_str (enc, "false", 5, 0);
759	else if (enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (enc->json.flags & F_ALLOW_UNKNOWN)
760	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
761	else	871	else
762	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	872	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
…		…
825	}	935	}
826	else	936	else
827	{	937	{
828	// large integer, use the (rather slow) snprintf way.	938	// large integer, use the (rather slow) snprintf way.
829	need (enc, IVUV_MAXCHARS);	939	need (enc, IVUV_MAXCHARS);
830	enc->cur +=	940	enc->cur +=
831	SvIsUV(sv)	941	SvIsUV(sv)
832	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	942	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	943	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834	}	944	}
835	}	945	}
836	else if (SvROK (sv))	946	else if (SvROK (sv))
837	encode_rv (enc, SvRV (sv));	947	encode_rv (enc, SvRV (sv));
838	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	948	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
839	encode_str (enc, "null", 4, 0);	949	encode_str (enc, "null", 4, 0);
840	else	950	else
841	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	951	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842	SvPV_nolen (sv), SvFLAGS (sv));	952	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843	}	953	}
844		954
845	static SV *	955	static SV *
846	encode_json (SV scalar, JSON json)	956	encode_json (SV scalar, JSON json)
847	{	957	{
848	enc_t enc;	958	enc_t enc;
849		959
850	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	960	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
851	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	961	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852		962
853	enc.json = *json;	963	enc.json = *json;
854	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	964	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855	enc.cur = SvPVX (enc.sv);	965	enc.cur = SvPVX (enc.sv);
…		…
1062	cur++ = dec_cur++;	1172	cur++ = dec_cur++;
1063	while (--clen);	1173	while (--clen);
1064		1174
1065	utf8 = 1;	1175	utf8 = 1;
1066	}	1176	}
		1177	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1178	*cur++ = ch;
1067	else	1179	else
1068	{	1180	{
1069	--dec_cur;	1181	--dec_cur;
1070		1182
1071	if (!ch)	1183	if (!ch)
…		…
1081		1193
1082	if (sv)	1194	if (sv)
1083	{	1195	{
1084	STRLEN cur = SvCUR (sv);	1196	STRLEN cur = SvCUR (sv);
1085		1197
1086	if (SvLEN (sv) <= cur + len)	1198	if (SvLEN (sv) - cur <= len)
1087	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	1199	json_sv_grow (sv, cur, len);
1088		1200
1089	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1201	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1090	SvCUR_set (sv, SvCUR (sv) + len);	1202	SvCUR_set (sv, SvCUR (sv) + len);
1091	}	1203	}
1092	else	1204	else
…		…
1259	if (*dec->cur == ']')	1371	if (*dec->cur == ']')
1260	{	1372	{
1261	++dec->cur;	1373	++dec->cur;
1262	break;	1374	break;
1263	}	1375	}
1264		1376
1265	if (*dec->cur != ',')	1377	if (*dec->cur != ',')
1266	ERR (", or ] expected while parsing array");	1378	ERR (", or ] expected while parsing array");
1267		1379
1268	++dec->cur;	1380	++dec->cur;
1269		1381
…		…
1393		1505
1394	hv_iterinit (hv);	1506	hv_iterinit (hv);
1395	he = hv_iternext (hv);	1507	he = hv_iternext (hv);
1396	hv_iterinit (hv);	1508	hv_iterinit (hv);
1397		1509
1398	// the next line creates a mortal sv each time its called.	1510	// the next line creates a mortal sv each time it's called.
1399	// might want to optimise this for common cases.	1511	// might want to optimise this for common cases.
1400	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1512	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401		1513
1402	if (cb)	1514	if (cb)
1403	{	1515	{
1404	dSP;	1516	dSP;
1405	int count;	1517	int count;
1406		1518
1407	ENTER; SAVETMPS; PUSHMARK (SP);	1519	ENTER; SAVETMPS;
		1520	SAVESTACK_POS ();
		1521	PUSHMARK (SP);
1408	XPUSHs (HeVAL (he));	1522	XPUSHs (HeVAL (he));
1409	sv_2mortal (sv);	1523	sv_2mortal (sv);
1410		1524
1411	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1525	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412		1526
…		…
1425	if (dec->json.cb_object)	1539	if (dec->json.cb_object)
1426	{	1540	{
1427	dSP;	1541	dSP;
1428	int count;	1542	int count;
1429		1543
1430	ENTER; SAVETMPS; PUSHMARK (SP);	1544	ENTER; SAVETMPS;
		1545	SAVESTACK_POS ();
		1546	PUSHMARK (SP);
1431	XPUSHs (sv_2mortal (sv));	1547	XPUSHs (sv_2mortal (sv));
1432		1548
1433	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1549	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434		1550
1435	if (count == 1)	1551	if (count == 1)
…		…
1451	DEC_DEC_DEPTH;	1567	DEC_DEC_DEPTH;
1452	return 0;	1568	return 0;
1453	}	1569	}
1454		1570
1455	static SV *	1571	static SV *
		1572	decode_tag (dec_t *dec)
		1573	{
		1574	SV *tag = 0;
		1575	SV *val = 0;
		1576
		1577	if (!(dec->json.flags & F_ALLOW_TAGS))
		1578	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1579
		1580	++dec->cur;
		1581
		1582	decode_ws (dec);
		1583
		1584	tag = decode_sv (dec);
		1585	if (!tag)
		1586	goto fail;
		1587
		1588	if (!SvPOK (tag))
		1589	ERR ("malformed JSON string, (tag) must be a string");
		1590
		1591	decode_ws (dec);
		1592
		1593	if (*dec->cur != ')')
		1594	ERR (") expected after tag");
		1595
		1596	++dec->cur;
		1597
		1598	decode_ws (dec);
		1599
		1600	val = decode_sv (dec);
		1601	if (!val)
		1602	goto fail;
		1603
		1604	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1605	ERR ("malformed JSON string, tag value must be an array");
		1606
		1607	{
		1608	AV av = (AV )SvRV (val);
		1609	int i, len = av_len (av) + 1;
		1610	HV *stash = gv_stashsv (tag, 0);
		1611	SV *sv;
		1612
		1613	if (!stash)
		1614	ERR ("cannot decode perl-object (package does not exist)");
		1615
		1616	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1617
		1618	if (!method)
		1619	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1620
		1621	dSP;
		1622
		1623	ENTER; SAVETMPS;
		1624	PUSHMARK (SP);
		1625	EXTEND (SP, len + 2);
		1626	// we re-bless the reference to get overload and other niceties right
		1627	PUSHs (tag);
		1628	PUSHs (sv_json);
		1629
		1630	for (i = 0; i < len; ++i)
		1631	PUSHs (*av_fetch (av, i, 1));
		1632
		1633	PUTBACK;
		1634	call_sv ((SV *)GvCV (method), G_SCALAR);
		1635	SPAGAIN;
		1636
		1637	SvREFCNT_dec (tag);
		1638	SvREFCNT_dec (val);
		1639	sv = SvREFCNT_inc (POPs);
		1640
		1641	PUTBACK;
		1642
		1643	FREETMPS; LEAVE;
		1644
		1645	return sv;
		1646	}
		1647
		1648	fail:
		1649	SvREFCNT_dec (tag);
		1650	SvREFCNT_dec (val);
		1651	return 0;
		1652	}
		1653
		1654	static SV *
1456	decode_sv (dec_t *dec)	1655	decode_sv (dec_t *dec)
1457	{	1656	{
1458	// the beauty of JSON: you need exactly one character lookahead	1657	// the beauty of JSON: you need exactly one character lookahead
1459	// to parse everything.	1658	// to parse everything.
1460	switch (*dec->cur)	1659	switch (*dec->cur)
1461	{	1660	{
1462	case '"': ++dec->cur; return decode_str (dec);	1661	case '"': ++dec->cur; return decode_str (dec);
1463	case '[': ++dec->cur; return decode_av (dec);	1662	case '[': ++dec->cur; return decode_av (dec);
1464	case '{': ++dec->cur; return decode_hv (dec);	1663	case '{': ++dec->cur; return decode_hv (dec);
		1664	case '(': return decode_tag (dec);
1465		1665
1466	case '-':	1666	case '-':
1467	case '0': case '1': case '2': case '3': case '4':	1667	case '0': case '1': case '2': case '3': case '4':
1468	case '5': case '6': case '7': case '8': case '9':	1668	case '5': case '6': case '7': case '8': case '9':
1469	return decode_num (dec);	1669	return decode_num (dec);
…		…
1471	case 't':	1671	case 't':
1472	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1672	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473	{	1673	{
1474	dec->cur += 4;	1674	dec->cur += 4;
1475	#if JSON_SLOW	1675	#if JSON_SLOW
1476	json_true = get_bool ("JSON::XS::true");	1676	bool_true = get_bool ("Types::Serialiser::true");
1477	#endif	1677	#endif
1478	return newSVsv (json_true);	1678	return newSVsv (bool_true);
1479	}	1679	}
1480	else	1680	else
1481	ERR ("'true' expected");	1681	ERR ("'true' expected");
1482		1682
1483	break;	1683	break;
…		…
1485	case 'f':	1685	case 'f':
1486	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1686	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487	{	1687	{
1488	dec->cur += 5;	1688	dec->cur += 5;
1489	#if JSON_SLOW	1689	#if JSON_SLOW
1490	json_false = get_bool ("JSON::XS::false");	1690	bool_false = get_bool ("Types::Serialiser::false");
1491	#endif	1691	#endif
1492	return newSVsv (json_false);	1692	return newSVsv (bool_false);
1493	}	1693	}
1494	else	1694	else
1495	ERR ("'false' expected");	1695	ERR ("'false' expected");
1496		1696
1497	break;	1697	break;
…		…
1506	ERR ("'null' expected");	1706	ERR ("'null' expected");
1507		1707
1508	break;	1708	break;
1509		1709
1510	default:	1710	default:
1511	ERR ("malformed JSON string, neither array, object, number, string or atom");	1711	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512	break;	1712	break;
1513	}	1713	}
1514		1714
1515	fail:	1715	fail:
1516	return 0;	1716	return 0;
1517	}	1717	}
1518		1718
1519	static SV *	1719	static SV *
1520	decode_json (SV string, JSON json, char **offset_return)	1720	decode_json (SV string, JSON json, STRLEN *offset_return)
1521	{	1721	{
1522	dec_t dec;	1722	dec_t dec;
1523	SV *sv;	1723	SV *sv;
1524		1724
1525	/* work around bugs in 5.10 where manipulating magic values	1725	/* work around bugs in 5.10 where manipulating magic values
1526	* will perl ignore the magic in subsequent accesses.	1726	* makes perl ignore the magic in subsequent accesses.
1527	* also make a copy of non-PV values, to get them into a clean	1727	* also make a copy of non-PV values, to get them into a clean
1528	* state (SvPV should do that, but it's buggy, see below).	1728	* state (SvPV should do that, but it's buggy, see below).
		1729	*
		1730	* SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
		1731	* as reported by Reini Urban.
1529	*/	1732	*/
1530	/SvGETMAGIC (string);/	1733	/SvGETMAGIC (string);/
1531	if (SvMAGICAL (string) \|\| !SvPOK (string))	1734	if (SvMAGICAL (string) \|\| !SvPOK (string) \|\| SvIsCOW_shared_hash (string))
1532	string = sv_2mortal (newSVsv (string));	1735	string = sv_2mortal (newSVsv (string));
1533		1736
1534	SvUPGRADE (string, SVt_PV);	1737	SvUPGRADE (string, SVt_PV);
1535		1738
1536	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1739	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1575		1778
1576	decode_ws (&dec);	1779	decode_ws (&dec);
1577	sv = decode_sv (&dec);	1780	sv = decode_sv (&dec);
1578		1781
1579	if (offset_return)	1782	if (offset_return)
1580	*offset_return = dec.cur;	1783	*offset_return = dec.cur - SvPVX (string);
1581		1784	else if (sv)
1582	if (!(offset_return \|\| !sv))
1583	{	1785	{
1584	// check for trailing garbage	1786	// check for trailing garbage
1585	decode_ws (&dec);	1787	decode_ws (&dec);
1586		1788
1587	if (*dec.cur)	1789	if (*dec.cur)
…		…
1605	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1807	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1606	LEAVE;	1808	LEAVE;
1607		1809
1608	croak ("%s, at character offset %d (before \"%s\")",	1810	croak ("%s, at character offset %d (before \"%s\")",
1609	dec.err,	1811	dec.err,
1610	ptr_to_index (string, dec.cur),	1812	(int)ptr_to_index (string, dec.cur),
1611	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1813	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612	}	1814	}
1613		1815
1614	sv = sv_2mortal (sv);	1816	sv = sv_2mortal (sv);
1615		1817
1616	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1818	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1617	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1819	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1618		1820
1619	return sv;	1821	return sv;
1620	}	1822	}
1621		1823
…		…
1743	self->incr_mode = INCR_M_STR;	1945	self->incr_mode = INCR_M_STR;
1744	goto incr_m_str;	1946	goto incr_m_str;
1745		1947
1746	case '[':	1948	case '[':
1747	case '{':	1949	case '{':
		1950	case '(':
1748	if (++self->incr_nest > self->max_depth)	1951	if (++self->incr_nest > self->max_depth)
1749	croak (ERR_NESTING_EXCEEDED);	1952	croak (ERR_NESTING_EXCEEDED);
1750	break;	1953	break;
1751		1954
1752	case ']':	1955	case ']':
1753	case '}':	1956	case '}':
1754	if (--self->incr_nest <= 0)	1957	if (--self->incr_nest <= 0)
1755	goto interrupt;	1958	goto interrupt;
		1959	break;
		1960
		1961	case ')':
		1962	--self->incr_nest;
1756	break;	1963	break;
1757		1964
1758	case '#':	1965	case '#':
1759	self->incr_mode = INCR_M_C1;	1966	self->incr_mode = INCR_M_C1;
1760	goto incr_m_c;	1967	goto incr_m_c;
…		…
1786	i >= '0' && i <= '9' ? i - '0'	1993	i >= '0' && i <= '9' ? i - '0'
1787	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1994	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1788	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1995	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1789	: -1;	1996	: -1;
1790		1997
1791	json_stash = gv_stashpv ("JSON::XS" , 1);	1998	json_stash = gv_stashpv ("JSON::XS" , 1);
1792	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1999	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793
1794	json_true = get_bool ("JSON::XS::true");	2000	bool_true = get_bool ("Types::Serialiser::true");
1795	json_false = get_bool ("JSON::XS::false");	2001	bool_false = get_bool ("Types::Serialiser::false");
		2002
		2003	sv_json = newSVpv ("JSON", 0);
		2004	SvREADONLY_on (sv_json);
1796		2005
1797	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	2006	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798	}	2007	}
1799		2008
1800	PROTOTYPES: DISABLE	2009	PROTOTYPES: DISABLE
1801		2010
1802	void CLONE (...)	2011	void CLONE (...)
1803	CODE:	2012	CODE:
1804	json_stash = 0;	2013	json_stash = 0;
1805	json_boolean_stash = 0;	2014	bool_stash = 0;
1806		2015
1807	void new (char *klass)	2016	void new (char *klass)
1808	PPCODE:	2017	PPCODE:
1809	{	2018	{
1810	SV *pv = NEWSV (0, sizeof (JSON));	2019	SV *pv = NEWSV (0, sizeof (JSON));
1811	SvPOK_only (pv);	2020	SvPOK_only (pv);
1812	json_init ((JSON *)SvPVX (pv));	2021	json_init ((JSON *)SvPVX (pv));
1813	XPUSHs (sv_2mortal (sv_bless (	2022	XPUSHs (sv_2mortal (sv_bless (
1814	newRV_noinc (pv),	2023	newRV_noinc (pv),
1815	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	2024	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1830	shrink = F_SHRINK	2039	shrink = F_SHRINK
1831	allow_blessed = F_ALLOW_BLESSED	2040	allow_blessed = F_ALLOW_BLESSED
1832	convert_blessed = F_CONV_BLESSED	2041	convert_blessed = F_CONV_BLESSED
1833	relaxed = F_RELAXED	2042	relaxed = F_RELAXED
1834	allow_unknown = F_ALLOW_UNKNOWN	2043	allow_unknown = F_ALLOW_UNKNOWN
		2044	allow_tags = F_ALLOW_TAGS
1835	PPCODE:	2045	PPCODE:
1836	{	2046	{
1837	if (enable)	2047	if (enable)
1838	self->flags \|= ix;	2048	self->flags \|= ix;
1839	else	2049	else
…		…
1855	get_shrink = F_SHRINK	2065	get_shrink = F_SHRINK
1856	get_allow_blessed = F_ALLOW_BLESSED	2066	get_allow_blessed = F_ALLOW_BLESSED
1857	get_convert_blessed = F_CONV_BLESSED	2067	get_convert_blessed = F_CONV_BLESSED
1858	get_relaxed = F_RELAXED	2068	get_relaxed = F_RELAXED
1859	get_allow_unknown = F_ALLOW_UNKNOWN	2069	get_allow_unknown = F_ALLOW_UNKNOWN
		2070	get_allow_tags = F_ALLOW_TAGS
1860	PPCODE:	2071	PPCODE:
1861	XPUSHs (boolSV (self->flags & ix));	2072	XPUSHs (boolSV (self->flags & ix));
1862		2073
1863	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2074	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864	PPCODE:	2075	PPCODE:
…		…
1892	}	2103	}
1893		2104
1894	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2105	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1895	PPCODE:	2106	PPCODE:
1896	{	2107	{
1897	if (!self->cb_sk_object)	2108	if (!self->cb_sk_object)
1898	self->cb_sk_object = newHV ();	2109	self->cb_sk_object = newHV ();
1899		2110
1900	if (SvOK (cb))	2111	if (SvOK (cb))
1901	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2112	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902	else	2113	else
…		…
1913	XPUSHs (ST (0));	2124	XPUSHs (ST (0));
1914	}	2125	}
1915		2126
1916	void encode (JSON self, SV scalar)	2127	void encode (JSON self, SV scalar)
1917	PPCODE:	2128	PPCODE:
1918	XPUSHs (encode_json (scalar, self));	2129	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2130	XPUSHs (scalar);
1919		2131
1920	void decode (JSON self, SV jsonstr)	2132	void decode (JSON self, SV jsonstr)
1921	PPCODE:	2133	PPCODE:
1922	XPUSHs (decode_json (jsonstr, self, 0));	2134	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2135	XPUSHs (jsonstr);
1923		2136
1924	void decode_prefix (JSON self, SV jsonstr)	2137	void decode_prefix (JSON self, SV jsonstr)
1925	PPCODE:	2138	PPCODE:
1926	{	2139	{
1927	char *offset;	2140	SV *sv;
		2141	STRLEN offset;
		2142	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928	EXTEND (SP, 2);	2143	EXTEND (SP, 2);
1929	PUSHs (decode_json (jsonstr, self, &offset));	2144	PUSHs (sv);
1930	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2145	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1931	}	2146	}
1932		2147
1933	void incr_parse (JSON self, SV jsonstr = 0)	2148	void incr_parse (JSON self, SV jsonstr = 0)
1934	PPCODE:	2149	PPCODE:
1935	{	2150	{
…		…
1969	{	2184	{
1970	STRLEN len;	2185	STRLEN len;
1971	const char *str = SvPV (jsonstr, len);	2186	const char *str = SvPV (jsonstr, len);
1972	STRLEN cur = SvCUR (self->incr_text);	2187	STRLEN cur = SvCUR (self->incr_text);
1973		2188
1974	if (SvLEN (self->incr_text) <= cur + len)	2189	if (SvLEN (self->incr_text) - cur <= len)
1975	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	2190	json_sv_grow (self->incr_text, cur, len);
1976		2191
1977	Move (str, SvEND (self->incr_text), len, char);	2192	Move (str, SvEND (self->incr_text), len, char);
1978	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	2193	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1979	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	2194	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1980	}	2195	}
1981	}	2196	}
1982		2197
1983	if (GIMME_V != G_VOID)	2198	if (GIMME_V != G_VOID)
1984	do	2199	do
1985	{	2200	{
		2201	SV *sv;
1986	char *offset;	2202	STRLEN offset;
1987		2203
1988	if (!INCR_DONE (self))	2204	if (!INCR_DONE (self))
1989	{	2205	{
1990	incr_parse (self);	2206	incr_parse (self);
1991		2207
…		…
1994	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2210	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1995		2211
1996	if (!INCR_DONE (self))	2212	if (!INCR_DONE (self))
1997	{	2213	{
1998	// as an optimisation, do not accumulate white space in the incr buffer	2214	// as an optimisation, do not accumulate white space in the incr buffer
1999	if (self->incr_mode == INCR_M_WS)	2215	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2216	{
		2217	self->incr_pos = 0;
2000	SvCUR_set (self->incr_text, 0);	2218	SvCUR_set (self->incr_text, 0);
		2219	}
2001		2220
2002	break;	2221	break;
2003	}	2222	}
2004	}	2223	}
2005		2224
2006	XPUSHs (decode_json (self->incr_text, self, &offset));	2225	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2226	XPUSHs (sv);
2007		2227
2008	self->incr_pos -= offset - SvPVX (self->incr_text);	2228	self->incr_pos -= offset;
2009	self->incr_nest = 0;	2229	self->incr_nest = 0;
2010	self->incr_mode = 0;	2230	self->incr_mode = 0;
2011		2231
2012	sv_chop (self->incr_text, offset);	2232	sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2013	}	2233	}
2014	while (GIMME_V == G_ARRAY);	2234	while (GIMME_V == G_ARRAY);
2015	}	2235	}
2016		2236
2017	SV incr_text (JSON self)	2237	SV incr_text (JSON self)
…		…
2055	SvREFCNT_dec (self->incr_text);	2275	SvREFCNT_dec (self->incr_text);
2056		2276
2057	PROTOTYPES: ENABLE	2277	PROTOTYPES: ENABLE
2058		2278
2059	void encode_json (SV *scalar)	2279	void encode_json (SV *scalar)
2060	ALIAS:
2061	to_json_ = 0
2062	encode_json = F_UTF8
2063	PPCODE:	2280	PPCODE:
2064	{	2281	{
2065	JSON json;	2282	JSON json;
2066	json_init (&json);	2283	json_init (&json);
2067	json.flags \|= ix;	2284	json.flags \|= F_UTF8;
2068	XPUSHs (encode_json (scalar, &json));	2285	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2286	XPUSHs (scalar);
2069	}	2287	}
2070		2288
2071	void decode_json (SV *jsonstr)	2289	void decode_json (SV *jsonstr)
2072	ALIAS:
2073	from_json_ = 0
2074	decode_json = F_UTF8
2075	PPCODE:	2290	PPCODE:
2076	{	2291	{
2077	JSON json;	2292	JSON json;
2078	json_init (&json);	2293	json_init (&json);
2079	json.flags \|= ix;	2294	json.flags \|= F_UTF8;
2080	XPUSHs (decode_json (jsonstr, &json, 0));	2295	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2296	XPUSHs (jsonstr);
2081	}	2297	}
2082		2298

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs. Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs.
Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC