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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.118 by root, Fri Oct 25 20:27:57 2013 UTC vs.
Revision 1.136 by root, Thu Nov 15 22:35:35 2018 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 64 // initial scalar size to be allocated
43	#define INDENT_STEP 3 // spaces per indentation level	56	#define INDENT_STEP 3 // spaces per indentation level
44		57
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	58	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
46		59
47	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)	60	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
…		…
65	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	78	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
66		79
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
71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	83	# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
		84	# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
		85	# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
72	#else	86	#else
73	# define JSON_SLOW 0
74	# define JSON_STASH json_stash	87	# define JSON_STASH json_stash
		88	# define BOOL_STASH bool_stash
		89	# define GET_BOOL(value) bool_ ## value
75	#endif	90	#endif
76		91
77	// the amount of HEs to allocate on the stack, when sorting keys	92	// the amount of HEs to allocate on the stack, when sorting keys
78	#define STACK_HES 64	93	#define STACK_HES 64
79		94
80	static HV json_stash, json_boolean_stash; // JSON::XS::	95	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
81	static SV json_true, json_false;	96	static SV bool_false, bool_true;
		97	static SV *sv_json;
82		98
83	enum {	99	enum {
84	INCR_M_WS = 0, // initial whitespace skipping, must be 0	100	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		101	INCR_M_TFN, // inside true/false/null
		102	INCR_M_NUM, // inside number
85	INCR_M_STR, // inside string	103	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	104	INCR_M_BS, // inside backslash
87	INCR_M_C0, // inside comment in initial whitespace sequence	105	INCR_M_C0, // inside comment in initial whitespace sequence
88	INCR_M_C1, // inside comment in other places	106	INCR_M_C1, // inside comment in other places
89	INCR_M_JSON // outside anything, count nesting	107	INCR_M_JSON // outside anything, count nesting
…		…
102	// for the incremental parser	120	// for the incremental parser
103	SV *incr_text; // the source text so far	121	SV *incr_text; // the source text so far
104	STRLEN incr_pos; // the current offset into the text	122	STRLEN incr_pos; // the current offset into the text
105	int incr_nest; // {[]}-nesting level	123	int incr_nest; // {[]}-nesting level
106	unsigned char incr_mode;	124	unsigned char incr_mode;
		125
		126	SV v_false, v_true;
107	} JSON;	127	} JSON;
108		128
109	INLINE void	129	INLINE void
110	json_init (JSON *json)	130	json_init (JSON *json)
111	{	131	{
112	Zero (json, 1, JSON);	132	static const JSON init = { F_ALLOW_NONREF, 512 };
113	json->max_depth = 512;	133
		134	*json = init;
114	}	135	}
115		136
116	/////////////////////////////////////////////////////////////////////////////	137	/////////////////////////////////////////////////////////////////////////////
117	// utility functions	138	// utility functions
118		139
…		…
140	SvPV_renew (sv, SvCUR (sv) + 1);	161	SvPV_renew (sv, SvCUR (sv) + 1);
141	#endif	162	#endif
142	}	163	}
143	}	164	}
144		165
		166	/* adds two STRLENs together, slow, and with paranoia */
		167	STRLEN
		168	strlen_sum (STRLEN l1, STRLEN l2)
		169	{
		170	size_t sum = l1 + l2;
		171
		172	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
		173	croak ("JSON::XS: string size overflow");
		174
		175	return sum;
		176	}
		177
		178	/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
		179	static char *
		180	json_sv_grow (SV *sv, size_t len1, size_t len2)
		181	{
		182	len1 = strlen_sum (len1, len2);
		183	len1 = strlen_sum (len1, len1 >> 1);
		184
		185	if (len1 > 4096 - 24)
		186	len1 = (len1 \| 4095) - 24;
		187
		188	return SvGROW (sv, len1);
		189	}
		190
145	// decode an utf-8 character and return it, or (UV)-1 in	191	// decode a utf-8 character and return it, or (UV)-1 in
146	// case of an error.	192	// case of an error.
147	// we special-case "safe" characters from U+80 .. U+7FF,	193	// we special-case "safe" characters from U+80 .. U+7FF,
148	// but use the very good perl function to parse anything else.	194	// but use the very good perl function to parse anything else.
149	// note that we never call this function for a ascii codepoints	195	// note that we never call this function for a ascii codepoints
150	INLINE UV	196	INLINE UV
…		…
287	// a recursion depth of ten gives us >>500 bits	333	// a recursion depth of ten gives us >>500 bits
288	json_atof_scan1 (s, &accum, &expo, 0, 10);	334	json_atof_scan1 (s, &accum, &expo, 0, 10);
289		335
290	return neg ? -accum : accum;	336	return neg ? -accum : accum;
291	}	337	}
		338
		339	// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
		340	static int
		341	ref_bool_type (SV *sv)
		342	{
		343	svtype svt = SvTYPE (sv);
		344
		345	if (svt < SVt_PVAV)
		346	{
		347	STRLEN len = 0;
		348	char *pv = svt ? SvPV (sv, len) : 0;
		349
		350	if (len == 1)
		351	if (*pv == '1')
		352	return 1;
		353	else if (*pv == '0')
		354	return 0;
		355	}
		356
		357	return -1;
		358	}
		359
		360	// returns whether scalar is not a reference in the sense of allow_nonref
		361	static int
		362	json_nonref (SV *scalar)
		363	{
		364	if (!SvROK (scalar))
		365	return 1;
		366
		367	scalar = SvRV (scalar);
		368
		369	if (SvTYPE (scalar) >= SVt_PVMG)
		370	{
		371	if (SvSTASH (scalar) == bool_stash)
		372	return 1;
		373
		374	if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
		375	return 1;
		376	}
		377
		378	return 0;
		379	}
		380
292	/////////////////////////////////////////////////////////////////////////////	381	/////////////////////////////////////////////////////////////////////////////
293	// encoder	382	// encoder
294		383
295	// structure used for encoding JSON	384	// structure used for encoding JSON
296	typedef struct	385	typedef struct
…		…
304	} enc_t;	393	} enc_t;
305		394
306	INLINE void	395	INLINE void
307	need (enc_t *enc, STRLEN len)	396	need (enc_t *enc, STRLEN len)
308	{	397	{
309	if (expect_false (enc->cur + len >= enc->end))	398	if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
310	{	399	{
311	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	400	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
312	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	401	char *buf = json_sv_grow (enc->sv, cur, len);
313	enc->cur = SvPVX (enc->sv) + cur;	402	enc->cur = buf + cur;
314	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	403	enc->end = buf + SvLEN (enc->sv) - 1;
315	}	404	}
316	}	405	}
317		406
318	INLINE void	407	INLINE void
319	encode_ch (enc_t *enc, char ch)	408	encode_ch (enc_t *enc, char ch)
…		…
335		424
336	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case	425	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
337	{	426	{
338	if (expect_false (ch == '"')) // but with slow exceptions	427	if (expect_false (ch == '"')) // but with slow exceptions
339	{	428	{
340	need (enc, len += 1);	429	need (enc, len + 1);
341	*enc->cur++ = '\\';	430	*enc->cur++ = '\\';
342	*enc->cur++ = '"';	431	*enc->cur++ = '"';
343	}	432	}
344	else if (expect_false (ch == '\\'))	433	else if (expect_false (ch == '\\'))
345	{	434	{
346	need (enc, len += 1);	435	need (enc, len + 1);
347	*enc->cur++ = '\\';	436	*enc->cur++ = '\\';
348	*enc->cur++ = '\\';	437	*enc->cur++ = '\\';
349	}	438	}
350	else	439	else
351	*enc->cur++ = ch;	440	*enc->cur++ = ch;
…		…
354	}	443	}
355	else	444	else
356	{	445	{
357	switch (ch)	446	switch (ch)
358	{	447	{
359	case '\010': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;	448	case '\010': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;
360	case '\011': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;	449	case '\011': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;
361	case '\012': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;	450	case '\012': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;
362	case '\014': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;	451	case '\014': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;
363	case '\015': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;	452	case '\015': need (enc, len + 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;
364		453
365	default:	454	default:
366	{	455	{
367	STRLEN clen;	456	STRLEN clen;
368	UV uch;	457	UV uch;
…		…
384	if (uch >= 0x10000UL)	473	if (uch >= 0x10000UL)
385	{	474	{
386	if (uch >= 0x110000UL)	475	if (uch >= 0x110000UL)
387	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	476	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
388		477
389	need (enc, len += 11);	478	need (enc, len + 11);
390	sprintf (enc->cur, "\\u%04x\\u%04x",	479	sprintf (enc->cur, "\\u%04x\\u%04x",
391	(int)((uch - 0x10000) / 0x400 + 0xD800),	480	(int)((uch - 0x10000) / 0x400 + 0xD800),
392	(int)((uch - 0x10000) % 0x400 + 0xDC00));	481	(int)((uch - 0x10000) % 0x400 + 0xDC00));
393	enc->cur += 12;	482	enc->cur += 12;
394	}	483	}
395	else	484	else
396	{	485	{
397	need (enc, len += 5);	486	need (enc, len + 5);
398	*enc->cur++ = '\\';	487	*enc->cur++ = '\\';
399	*enc->cur++ = 'u';	488	*enc->cur++ = 'u';
400	*enc->cur++ = PL_hexdigit [ uch >> 12 ];	489	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
401	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];	490	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
402	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];	491	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
…		…
410	*enc->cur++ = uch;	499	*enc->cur++ = uch;
411	str += clen;	500	str += clen;
412	}	501	}
413	else if (is_utf8)	502	else if (is_utf8)
414	{	503	{
415	need (enc, len += clen);	504	need (enc, len + clen);
416	do	505	do
417	{	506	{
418	enc->cur++ = str++;	507	enc->cur++ = str++;
419	}	508	}
420	while (--clen);	509	while (--clen);
421	}	510	}
422	else	511	else
423	{	512	{
424	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	513	need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
425	enc->cur = encode_utf8 (enc->cur, uch);	514	enc->cur = encode_utf8 (enc->cur, uch);
426	++str;	515	++str;
427	}	516	}
428	}	517	}
429	}	518	}
…		…
682	// encode objects, arrays and special \0=false and \1=true values.	771	// encode objects, arrays and special \0=false and \1=true values.
683	static void	772	static void
684	encode_rv (enc_t enc, SV sv)	773	encode_rv (enc_t enc, SV sv)
685	{	774	{
686	svtype svt;	775	svtype svt;
		776	GV *method;
687		777
688	SvGETMAGIC (sv);	778	SvGETMAGIC (sv);
689	svt = SvTYPE (sv);	779	svt = SvTYPE (sv);
690		780
691	if (expect_false (SvOBJECT (sv)))	781	if (expect_false (SvOBJECT (sv)))
692	{	782	{
693	HV *stash = !JSON_SLOW \|\| json_boolean_stash	783	HV *stash = SvSTASH (sv);
694	? json_boolean_stash
695	: gv_stashpv ("JSON::XS::Boolean", 1);
696		784
697	if (SvSTASH (sv) == stash)	785	if (stash == bool_stash)
698	{	786	{
699	if (SvIV (sv))
700	encode_str (enc, "true", 4, 0);	787	if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
701	else
702	encode_str (enc, "false", 5, 0);	788	else encode_str (enc, "false", 5, 0);
703	}	789	}
		790	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		791	{
		792	int count;
		793	dSP;
		794
		795	ENTER; SAVETMPS;
		796	PUSHMARK (SP);
		797	EXTEND (SP, 2);
		798	// we re-bless the reference to get overload and other niceties right
		799	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		800	PUSHs (sv_json);
		801
		802	PUTBACK;
		803	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		804	SPAGAIN;
		805
		806	// catch this surprisingly common error
		807	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		808	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		809
		810	encode_ch (enc, '(');
		811	encode_ch (enc, '"');
		812	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		813	encode_ch (enc, '"');
		814	encode_ch (enc, ')');
		815	encode_ch (enc, '[');
		816
		817	if (count)
		818	{
		819	int i;
		820
		821	for (i = 0; i < count - 1; ++i)
		822	{
		823	encode_sv (enc, SP[i + 1 - count]);
		824	encode_ch (enc, ',');
		825	}
		826
		827	encode_sv (enc, TOPs);
		828	SP -= count;
		829	}
		830
		831	encode_ch (enc, ']');
		832
		833	FREETMPS; LEAVE;
		834	}
		835	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		836	{
		837	dSP;
		838
		839	ENTER; SAVETMPS;
		840	PUSHMARK (SP);
		841	// we re-bless the reference to get overload and other niceties right
		842	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		843
		844	// calling with G_SCALAR ensures that we always get a 1 return value
		845	PUTBACK;
		846	call_sv ((SV *)GvCV (method), G_SCALAR);
		847	SPAGAIN;
		848
		849	// catch this surprisingly common error
		850	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		851	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		852
		853	sv = POPs;
		854	PUTBACK;
		855
		856	encode_sv (enc, sv);
		857
		858	FREETMPS; LEAVE;
		859	}
		860	else if (enc->json.flags & F_ALLOW_BLESSED)
		861	encode_str (enc, "null", 4, 0);
704	else	862	else
705	{
706	#if 0
707	if (0 && sv_derived_from (rv, "JSON::Literal"))
708	{
709	// not yet
710	}
711	#endif
712	if (enc->json.flags & F_CONV_BLESSED)
713	{
714	// we re-bless the reference to get overload and other niceties right
715	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
716
717	if (to_json)
718	{
719	dSP;
720
721	ENTER; SAVETMPS; PUSHMARK (SP);
722	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
723
724	// calling with G_SCALAR ensures that we always get a 1 return value
725	PUTBACK;
726	call_sv ((SV *)GvCV (to_json), G_SCALAR);
727	SPAGAIN;
728
729	// catch this surprisingly common error
730	if (SvROK (TOPs) && SvRV (TOPs) == sv)
731	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
732
733	sv = POPs;
734	PUTBACK;
735
736	encode_sv (enc, sv);
737
738	FREETMPS; LEAVE;
739	}
740	else if (enc->json.flags & F_ALLOW_BLESSED)
741	encode_str (enc, "null", 4, 0);
742	else
743	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
744	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
745	}
746	else if (enc->json.flags & F_ALLOW_BLESSED)
747	encode_str (enc, "null", 4, 0);
748	else
749	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	863	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
750	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	864	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
751	}
752	}	865	}
753	else if (svt == SVt_PVHV)	866	else if (svt == SVt_PVHV)
754	encode_hv (enc, (HV *)sv);	867	encode_hv (enc, (HV *)sv);
755	else if (svt == SVt_PVAV)	868	else if (svt == SVt_PVAV)
756	encode_av (enc, (AV *)sv);	869	encode_av (enc, (AV *)sv);
757	else if (svt < SVt_PVAV)	870	else if (svt < SVt_PVAV)
758	{	871	{
759	STRLEN len = 0;	872	int bool_type = ref_bool_type (sv);
760	char *pv = svt ? SvPV (sv, len) : 0;
761		873
762	if (len == 1 && *pv == '1')	874	if (bool_type == 1)
763	encode_str (enc, "true", 4, 0);	875	encode_str (enc, "true", 4, 0);
764	else if (len == 1 && *pv == '0')	876	else if (bool_type == 0)
765	encode_str (enc, "false", 5, 0);	877	encode_str (enc, "false", 5, 0);
766	else if (enc->json.flags & F_ALLOW_UNKNOWN)	878	else if (enc->json.flags & F_ALLOW_UNKNOWN)
767	encode_str (enc, "null", 4, 0);	879	encode_str (enc, "null", 4, 0);
768	else	880	else
769	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	881	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
…		…
852	static SV *	964	static SV *
853	encode_json (SV scalar, JSON json)	965	encode_json (SV scalar, JSON json)
854	{	966	{
855	enc_t enc;	967	enc_t enc;
856		968
857	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	969	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
858	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	970	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
859		971
860	enc.json = *json;	972	enc.json = *json;
861	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	973	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
862	enc.cur = SvPVX (enc.sv);	974	enc.cur = SvPVX (enc.sv);
…		…
1069	cur++ = dec_cur++;	1181	cur++ = dec_cur++;
1070	while (--clen);	1182	while (--clen);
1071		1183
1072	utf8 = 1;	1184	utf8 = 1;
1073	}	1185	}
		1186	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1187	*cur++ = ch;
1074	else	1188	else
1075	{	1189	{
1076	--dec_cur;	1190	--dec_cur;
1077		1191
1078	if (!ch)	1192	if (!ch)
…		…
1088		1202
1089	if (sv)	1203	if (sv)
1090	{	1204	{
1091	STRLEN cur = SvCUR (sv);	1205	STRLEN cur = SvCUR (sv);
1092		1206
1093	if (SvLEN (sv) <= cur + len)	1207	if (SvLEN (sv) - cur <= len)
1094	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	1208	json_sv_grow (sv, cur, len);
1095		1209
1096	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1210	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1097	SvCUR_set (sv, SvCUR (sv) + len);	1211	SvCUR_set (sv, SvCUR (sv) + len);
1098	}	1212	}
1099	else	1213	else
…		…
1400		1514
1401	hv_iterinit (hv);	1515	hv_iterinit (hv);
1402	he = hv_iternext (hv);	1516	he = hv_iternext (hv);
1403	hv_iterinit (hv);	1517	hv_iterinit (hv);
1404		1518
1405	// the next line creates a mortal sv each time its called.	1519	// the next line creates a mortal sv each time it's called.
1406	// might want to optimise this for common cases.	1520	// might want to optimise this for common cases.
1407	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1521	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1408		1522
1409	if (cb)	1523	if (cb)
1410	{	1524	{
1411	dSP;	1525	dSP;
1412	int count;	1526	int count;
1413		1527
1414	ENTER; SAVETMPS; PUSHMARK (SP);	1528	ENTER; SAVETMPS;
		1529	PUSHMARK (SP);
1415	XPUSHs (HeVAL (he));	1530	XPUSHs (HeVAL (he));
1416	sv_2mortal (sv);	1531	sv_2mortal (sv);
1417		1532
1418	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1533	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1419		1534
…		…
1421	{	1536	{
1422	sv = newSVsv (POPs);	1537	sv = newSVsv (POPs);
1423	FREETMPS; LEAVE;	1538	FREETMPS; LEAVE;
1424	return sv;	1539	return sv;
1425	}	1540	}
		1541	else if (count)
		1542	croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1426		1543
1427	SvREFCNT_inc (sv);	1544	SvREFCNT_inc (sv);
1428	FREETMPS; LEAVE;	1545	FREETMPS; LEAVE;
1429	}	1546	}
1430	}	1547	}
…		…
1432	if (dec->json.cb_object)	1549	if (dec->json.cb_object)
1433	{	1550	{
1434	dSP;	1551	dSP;
1435	int count;	1552	int count;
1436		1553
1437	ENTER; SAVETMPS; PUSHMARK (SP);	1554	ENTER; SAVETMPS;
		1555	PUSHMARK (SP);
1438	XPUSHs (sv_2mortal (sv));	1556	XPUSHs (sv_2mortal (sv));
1439		1557
1440	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1558	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1441		1559
1442	if (count == 1)	1560	if (count == 1)
1443	{	1561	{
1444	sv = newSVsv (POPs);	1562	sv = newSVsv (POPs);
1445	FREETMPS; LEAVE;	1563	FREETMPS; LEAVE;
1446	return sv;	1564	return sv;
1447	}	1565	}
		1566	else if (count)
		1567	croak ("filter_json_object callbacks must not return more than one scalar");
1448		1568
1449	SvREFCNT_inc (sv);	1569	SvREFCNT_inc (sv);
1450	FREETMPS; LEAVE;	1570	FREETMPS; LEAVE;
1451	}	1571	}
1452	}	1572	}
…		…
1458	DEC_DEC_DEPTH;	1578	DEC_DEC_DEPTH;
1459	return 0;	1579	return 0;
1460	}	1580	}
1461		1581
1462	static SV *	1582	static SV *
		1583	decode_tag (dec_t *dec)
		1584	{
		1585	SV *tag = 0;
		1586	SV *val = 0;
		1587
		1588	if (!(dec->json.flags & F_ALLOW_TAGS))
		1589	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1590
		1591	++dec->cur;
		1592
		1593	decode_ws (dec);
		1594
		1595	tag = decode_sv (dec);
		1596	if (!tag)
		1597	goto fail;
		1598
		1599	if (!SvPOK (tag))
		1600	ERR ("malformed JSON string, (tag) must be a string");
		1601
		1602	decode_ws (dec);
		1603
		1604	if (*dec->cur != ')')
		1605	ERR (") expected after tag");
		1606
		1607	++dec->cur;
		1608
		1609	decode_ws (dec);
		1610
		1611	val = decode_sv (dec);
		1612	if (!val)
		1613	goto fail;
		1614
		1615	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1616	ERR ("malformed JSON string, tag value must be an array");
		1617
		1618	{
		1619	AV av = (AV )SvRV (val);
		1620	int i, len = av_len (av) + 1;
		1621	HV *stash = gv_stashsv (tag, 0);
		1622	SV *sv;
		1623
		1624	if (!stash)
		1625	ERR ("cannot decode perl-object (package does not exist)");
		1626
		1627	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1628
		1629	if (!method)
		1630	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1631
		1632	dSP;
		1633
		1634	ENTER; SAVETMPS;
		1635	PUSHMARK (SP);
		1636	EXTEND (SP, len + 2);
		1637	// we re-bless the reference to get overload and other niceties right
		1638	PUSHs (tag);
		1639	PUSHs (sv_json);
		1640
		1641	for (i = 0; i < len; ++i)
		1642	PUSHs (*av_fetch (av, i, 1));
		1643
		1644	PUTBACK;
		1645	call_sv ((SV *)GvCV (method), G_SCALAR);
		1646	SPAGAIN;
		1647
		1648	SvREFCNT_dec (tag);
		1649	SvREFCNT_dec (val);
		1650	sv = SvREFCNT_inc (POPs);
		1651
		1652	PUTBACK;
		1653
		1654	FREETMPS; LEAVE;
		1655
		1656	return sv;
		1657	}
		1658
		1659	fail:
		1660	SvREFCNT_dec (tag);
		1661	SvREFCNT_dec (val);
		1662	return 0;
		1663	}
		1664
		1665	static SV *
1463	decode_sv (dec_t *dec)	1666	decode_sv (dec_t *dec)
1464	{	1667	{
1465	// the beauty of JSON: you need exactly one character lookahead	1668	// the beauty of JSON: you need exactly one character lookahead
1466	// to parse everything.	1669	// to parse everything.
1467	switch (*dec->cur)	1670	switch (*dec->cur)
1468	{	1671	{
1469	case '"': ++dec->cur; return decode_str (dec);	1672	case '"': ++dec->cur; return decode_str (dec);
1470	case '[': ++dec->cur; return decode_av (dec);	1673	case '[': ++dec->cur; return decode_av (dec);
1471	case '{': ++dec->cur; return decode_hv (dec);	1674	case '{': ++dec->cur; return decode_hv (dec);
		1675	case '(': return decode_tag (dec);
1472		1676
1473	case '-':	1677	case '-':
1474	case '0': case '1': case '2': case '3': case '4':	1678	case '0': case '1': case '2': case '3': case '4':
1475	case '5': case '6': case '7': case '8': case '9':	1679	case '5': case '6': case '7': case '8': case '9':
1476	return decode_num (dec);	1680	return decode_num (dec);
1477		1681
		1682	case 'f':
		1683	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
		1684	{
		1685	dec->cur += 5;
		1686
		1687	if (expect_false (!dec->json.v_false))
		1688	dec->json.v_false = GET_BOOL (false);
		1689
		1690	return newSVsv (dec->json.v_false);
		1691	}
		1692	else
		1693	ERR ("'false' expected");
		1694
		1695	break;
		1696
1478	case 't':	1697	case 't':
1479	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1698	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1480	{	1699	{
1481	dec->cur += 4;	1700	dec->cur += 4;
1482	#if JSON_SLOW	1701
1483	json_true = get_bool ("JSON::XS::true");	1702	if (expect_false (!dec->json.v_true))
1484	#endif	1703	dec->json.v_true = GET_BOOL (true);
		1704
1485	return newSVsv (json_true);	1705	return newSVsv (dec->json.v_true);
1486	}	1706	}
1487	else	1707	else
1488	ERR ("'true' expected");	1708	ERR ("'true' expected");
1489
1490	break;
1491
1492	case 'f':
1493	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1494	{
1495	dec->cur += 5;
1496	#if JSON_SLOW
1497	json_false = get_bool ("JSON::XS::false");
1498	#endif
1499	return newSVsv (json_false);
1500	}
1501	else
1502	ERR ("'false' expected");
1503		1709
1504	break;	1710	break;
1505		1711
1506	case 'n':	1712	case 'n':
1507	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))	1713	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
…		…
1513	ERR ("'null' expected");	1719	ERR ("'null' expected");
1514		1720
1515	break;	1721	break;
1516		1722
1517	default:	1723	default:
1518	ERR ("malformed JSON string, neither array, object, number, string or atom");	1724	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1519	break;	1725	break;
1520	}	1726	}
1521		1727
1522	fail:	1728	fail:
1523	return 0;	1729	return 0;
1524	}	1730	}
1525		1731
1526	static SV *	1732	static SV *
1527	decode_json (SV string, JSON json, char **offset_return)	1733	decode_json (SV string, JSON json, STRLEN *offset_return)
1528	{	1734	{
1529	dec_t dec;	1735	dec_t dec;
1530	SV *sv;	1736	SV *sv;
1531		1737
1532	/* work around bugs in 5.10 where manipulating magic values	1738	/* work around bugs in 5.10 where manipulating magic values
1533	* makes perl ignore the magic in subsequent accesses.	1739	* makes perl ignore the magic in subsequent accesses.
1534	* also make a copy of non-PV values, to get them into a clean	1740	* also make a copy of non-PV values, to get them into a clean
1535	* state (SvPV should do that, but it's buggy, see below).	1741	* state (SvPV should do that, but it's buggy, see below).
		1742	*
		1743	* SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
		1744	* as reported by Reini Urban.
1536	*/	1745	*/
1537	/SvGETMAGIC (string);/	1746	/SvGETMAGIC (string);/
1538	if (SvMAGICAL (string) \|\| !SvPOK (string))	1747	if (SvMAGICAL (string) \|\| !SvPOK (string) \|\| SvIsCOW_shared_hash (string))
1539	string = sv_2mortal (newSVsv (string));	1748	string = sv_2mortal (newSVsv (string));
1540		1749
1541	SvUPGRADE (string, SVt_PV);	1750	SvUPGRADE (string, SVt_PV);
1542		1751
1543	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1752	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1582		1791
1583	decode_ws (&dec);	1792	decode_ws (&dec);
1584	sv = decode_sv (&dec);	1793	sv = decode_sv (&dec);
1585		1794
1586	if (offset_return)	1795	if (offset_return)
1587	*offset_return = dec.cur;	1796	*offset_return = dec.cur - SvPVX (string);
1588		1797	else if (sv)
1589	if (!(offset_return \|\| !sv))
1590	{	1798	{
1591	// check for trailing garbage	1799	// check for trailing garbage
1592	decode_ws (&dec);	1800	decode_ws (&dec);
1593		1801
1594	if (*dec.cur)	1802	if (dec.cur != dec.end)
1595	{	1803	{
1596	dec.err = "garbage after JSON object";	1804	dec.err = "garbage after JSON object";
1597	SvREFCNT_dec (sv);	1805	SvREFCNT_dec (sv);
1598	sv = 0;	1806	sv = 0;
1599	}	1807	}
…		…
1618	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1826	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1619	}	1827	}
1620		1828
1621	sv = sv_2mortal (sv);	1829	sv = sv_2mortal (sv);
1622		1830
1623	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1831	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1624	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1832	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1625		1833
1626	return sv;	1834	return sv;
1627	}	1835	}
1628		1836
…		…
1637	// the state machine here is a bit convoluted and could be simplified a lot	1845	// the state machine here is a bit convoluted and could be simplified a lot
1638	// but this would make it slower, so...	1846	// but this would make it slower, so...
1639		1847
1640	for (;;)	1848	for (;;)
1641	{	1849	{
1642	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
1643	switch (self->incr_mode)	1850	switch (self->incr_mode)
1644	{	1851	{
		1852	// reached end of a scalar, see if we are inside a nested structure or not
		1853	end_of_scalar:
		1854	self->incr_mode = INCR_M_JSON;
		1855
		1856	if (self->incr_nest) // end of a scalar inside array, object or tag
		1857	goto incr_m_json;
		1858	else // end of scalar outside structure, json text ends here
		1859	goto interrupt;
		1860
1645	// only used for initial whitespace skipping	1861	// only used for initial whitespace skipping
1646	case INCR_M_WS:	1862	case INCR_M_WS:
1647	for (;;)	1863	for (;;)
1648	{	1864	{
1649	if (*p > 0x20)	1865	if (*p > 0x20)
…		…
1691	++p;	1907	++p;
1692	}	1908	}
1693		1909
1694	break;	1910	break;
1695		1911
		1912	// inside true/false/null
		1913	case INCR_M_TFN:
		1914	incr_m_tfn:
		1915	for (;;)
		1916	switch (*p++)
		1917	{
		1918	case 'r': case 'u': case 'e': // tRUE, falsE, nUll
		1919	case 'a': case 'l': case 's': // fALSe, nuLL
		1920	// allowed
		1921	break;
		1922
		1923	default:
		1924	--p;
		1925	goto end_of_scalar;
		1926	}
		1927
		1928	// inside a number
		1929	case INCR_M_NUM:
		1930	incr_m_num:
		1931	for (;;)
		1932	switch (*p++)
		1933	{
		1934	case 'e': case 'E': case '.': case '+':
		1935	case '-':
		1936	case '0': case '1': case '2': case '3': case '4':
		1937	case '5': case '6': case '7': case '8': case '9':
		1938	// allowed
		1939	break;
		1940
		1941	default:
		1942	--p;
		1943	goto end_of_scalar;
		1944	}
		1945
1696	// inside a string	1946	// inside a string
1697	case INCR_M_STR:	1947	case INCR_M_STR:
1698	incr_m_str:	1948	incr_m_str:
1699	for (;;)	1949	for (;;)
1700	{	1950	{
1701	if (*p == '"')	1951	if (*p == '"')
1702	{	1952	{
1703	++p;	1953	++p;
1704	self->incr_mode = INCR_M_JSON;
1705
1706	if (!self->incr_nest)
1707	goto interrupt;
1708
1709	goto incr_m_json;	1954	goto end_of_scalar;
1710	}	1955	}
1711	else if (*p == '\\')	1956	else if (*p == '\\')
1712	{	1957	{
1713	++p; // "virtually" consumes character after \	1958	++p; // "virtually" consumes character after \
1714		1959
…		…
1744	--p; // do not eat the whitespace, let the next round do it	1989	--p; // do not eat the whitespace, let the next round do it
1745	goto interrupt;	1990	goto interrupt;
1746	}	1991	}
1747	break;	1992	break;
1748		1993
		1994	// the following three blocks handle scalars. this makes the parser
		1995	// more strict than required inside arrays or objects, and could
		1996	// be moved to a special case on the toplevel (except strings)
		1997	case 't':
		1998	case 'f':
		1999	case 'n':
		2000	self->incr_mode = INCR_M_TFN;
		2001	goto incr_m_tfn;
		2002
		2003	case '-':
		2004	case '0': case '1': case '2': case '3': case '4':
		2005	case '5': case '6': case '7': case '8': case '9':
		2006	self->incr_mode = INCR_M_NUM;
		2007	goto incr_m_num;
		2008
1749	case '"':	2009	case '"':
1750	self->incr_mode = INCR_M_STR;	2010	self->incr_mode = INCR_M_STR;
1751	goto incr_m_str;	2011	goto incr_m_str;
1752		2012
1753	case '[':	2013	case '[':
1754	case '{':	2014	case '{':
		2015	case '(':
1755	if (++self->incr_nest > self->max_depth)	2016	if (++self->incr_nest > self->max_depth)
1756	croak (ERR_NESTING_EXCEEDED);	2017	croak (ERR_NESTING_EXCEEDED);
1757	break;	2018	break;
1758		2019
1759	case ']':	2020	case ']':
1760	case '}':	2021	case '}':
1761	if (--self->incr_nest <= 0)	2022	if (--self->incr_nest <= 0)
1762	goto interrupt;	2023	goto interrupt;
		2024	break;
		2025
		2026	case ')':
		2027	--self->incr_nest;
1763	break;	2028	break;
1764		2029
1765	case '#':	2030	case '#':
1766	self->incr_mode = INCR_M_C1;	2031	self->incr_mode = INCR_M_C1;
1767	goto incr_m_c;	2032	goto incr_m_c;
…		…
1793	i >= '0' && i <= '9' ? i - '0'	2058	i >= '0' && i <= '9' ? i - '0'
1794	: i >= 'a' && i <= 'f' ? i - 'a' + 10	2059	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1795	: i >= 'A' && i <= 'F' ? i - 'A' + 10	2060	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1796	: -1;	2061	: -1;
1797		2062
1798	json_stash = gv_stashpv ("JSON::XS" , 1);	2063	json_stash = gv_stashpv ("JSON::XS" , 1);
1799	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	2064	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1800
1801	json_true = get_bool ("JSON::XS::true");
1802	json_false = get_bool ("JSON::XS::false");	2065	bool_false = get_bool ("Types::Serialiser::false");
		2066	bool_true = get_bool ("Types::Serialiser::true");
		2067
		2068	sv_json = newSVpv ("JSON", 0);
		2069	SvREADONLY_on (sv_json);
1803		2070
1804	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	2071	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1805	}	2072	}
1806		2073
1807	PROTOTYPES: DISABLE	2074	PROTOTYPES: DISABLE
1808		2075
1809	void CLONE (...)	2076	void CLONE (...)
1810	CODE:	2077	CODE:
		2078	// as long as these writes are atomic, the race should not matter
		2079	// as existing threads either already use 0, or use the old value,
		2080	// which is sitll correct for the initial thread.
1811	json_stash = 0;	2081	json_stash = 0;
1812	json_boolean_stash = 0;	2082	bool_stash = 0;
		2083	bool_false = 0;
		2084	bool_true = 0;
1813		2085
1814	void new (char *klass)	2086	void new (char *klass)
1815	PPCODE:	2087	PPCODE:
1816	{	2088	{
1817	SV *pv = NEWSV (0, sizeof (JSON));	2089	SV *pv = NEWSV (0, sizeof (JSON));
…		…
1820	XPUSHs (sv_2mortal (sv_bless (	2092	XPUSHs (sv_2mortal (sv_bless (
1821	newRV_noinc (pv),	2093	newRV_noinc (pv),
1822	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	2094	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1823	)));	2095	)));
1824	}	2096	}
		2097
		2098	void boolean_values (JSON self, SV v_false = 0, SV *v_true = 0)
		2099	PPCODE:
		2100	self->v_false = newSVsv (v_false);
		2101	self->v_true = newSVsv (v_true);
		2102	XPUSHs (ST (0));
		2103
		2104	void get_boolean_values (JSON *self)
		2105	PPCODE:
		2106	if (self->v_false && self->v_true)
		2107	{
		2108	EXTEND (SP, 2);
		2109	PUSHs (self->v_false);
		2110	PUSHs (self->v_true);
		2111	}
1825		2112
1826	void ascii (JSON *self, int enable = 1)	2113	void ascii (JSON *self, int enable = 1)
1827	ALIAS:	2114	ALIAS:
1828	ascii = F_ASCII	2115	ascii = F_ASCII
1829	latin1 = F_LATIN1	2116	latin1 = F_LATIN1
…		…
1837	shrink = F_SHRINK	2124	shrink = F_SHRINK
1838	allow_blessed = F_ALLOW_BLESSED	2125	allow_blessed = F_ALLOW_BLESSED
1839	convert_blessed = F_CONV_BLESSED	2126	convert_blessed = F_CONV_BLESSED
1840	relaxed = F_RELAXED	2127	relaxed = F_RELAXED
1841	allow_unknown = F_ALLOW_UNKNOWN	2128	allow_unknown = F_ALLOW_UNKNOWN
		2129	allow_tags = F_ALLOW_TAGS
1842	PPCODE:	2130	PPCODE:
1843	{	2131	{
1844	if (enable)	2132	if (enable)
1845	self->flags \|= ix;	2133	self->flags \|= ix;
1846	else	2134	else
…		…
1862	get_shrink = F_SHRINK	2150	get_shrink = F_SHRINK
1863	get_allow_blessed = F_ALLOW_BLESSED	2151	get_allow_blessed = F_ALLOW_BLESSED
1864	get_convert_blessed = F_CONV_BLESSED	2152	get_convert_blessed = F_CONV_BLESSED
1865	get_relaxed = F_RELAXED	2153	get_relaxed = F_RELAXED
1866	get_allow_unknown = F_ALLOW_UNKNOWN	2154	get_allow_unknown = F_ALLOW_UNKNOWN
		2155	get_allow_tags = F_ALLOW_TAGS
1867	PPCODE:	2156	PPCODE:
1868	XPUSHs (boolSV (self->flags & ix));	2157	XPUSHs (boolSV (self->flags & ix));
1869		2158
1870	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2159	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1871	PPCODE:	2160	PPCODE:
…		…
1932		2221
1933	void decode_prefix (JSON self, SV jsonstr)	2222	void decode_prefix (JSON self, SV jsonstr)
1934	PPCODE:	2223	PPCODE:
1935	{	2224	{
1936	SV *sv;	2225	SV *sv;
1937	char *offset;	2226	STRLEN offset;
1938	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;	2227	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1939	EXTEND (SP, 2);	2228	EXTEND (SP, 2);
1940	PUSHs (sv);	2229	PUSHs (sv);
1941	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2230	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1942	}	2231	}
1943		2232
1944	void incr_parse (JSON self, SV jsonstr = 0)	2233	void incr_parse (JSON self, SV jsonstr = 0)
1945	PPCODE:	2234	PPCODE:
1946	{	2235	{
…		…
1980	{	2269	{
1981	STRLEN len;	2270	STRLEN len;
1982	const char *str = SvPV (jsonstr, len);	2271	const char *str = SvPV (jsonstr, len);
1983	STRLEN cur = SvCUR (self->incr_text);	2272	STRLEN cur = SvCUR (self->incr_text);
1984		2273
1985	if (SvLEN (self->incr_text) <= cur + len)	2274	if (SvLEN (self->incr_text) - cur <= len)
1986	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	2275	json_sv_grow (self->incr_text, cur, len);
1987		2276
1988	Move (str, SvEND (self->incr_text), len, char);	2277	Move (str, SvEND (self->incr_text), len, char);
1989	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	2278	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1990	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	2279	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1991	}	2280	}
…		…
1993		2282
1994	if (GIMME_V != G_VOID)	2283	if (GIMME_V != G_VOID)
1995	do	2284	do
1996	{	2285	{
1997	SV *sv;	2286	SV *sv;
1998	char *offset;	2287	STRLEN offset;
1999		2288
2000	if (!INCR_DONE (self))	2289	if (!INCR_DONE (self))
2001	{	2290	{
2002	incr_parse (self);	2291	incr_parse (self);
2003		2292
…		…
2019	}	2308	}
2020		2309
2021	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;	2310	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2022	XPUSHs (sv);	2311	XPUSHs (sv);
2023		2312
2024	self->incr_pos -= offset - SvPVX (self->incr_text);	2313	self->incr_pos -= offset;
2025	self->incr_nest = 0;	2314	self->incr_nest = 0;
2026	self->incr_mode = 0;	2315	self->incr_mode = 0;
2027		2316
2028	sv_chop (self->incr_text, offset);	2317	sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2029	}	2318	}
2030	while (GIMME_V == G_ARRAY);	2319	while (GIMME_V == G_ARRAY);
2031	}	2320	}
2032		2321
2033	SV incr_text (JSON self)	2322	SV incr_text (JSON self)
…		…
2064	self->incr_mode = 0;	2353	self->incr_mode = 0;
2065	}	2354	}
2066		2355
2067	void DESTROY (JSON *self)	2356	void DESTROY (JSON *self)
2068	CODE:	2357	CODE:
		2358	SvREFCNT_dec (self->v_false);
		2359	SvREFCNT_dec (self->v_true);
2069	SvREFCNT_dec (self->cb_sk_object);	2360	SvREFCNT_dec (self->cb_sk_object);
2070	SvREFCNT_dec (self->cb_object);	2361	SvREFCNT_dec (self->cb_object);
2071	SvREFCNT_dec (self->incr_text);	2362	SvREFCNT_dec (self->incr_text);
2072		2363
2073	PROTOTYPES: ENABLE	2364	PROTOTYPES: ENABLE

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.118 by root, Fri Oct 25 20:27:57 2013 UTC vs. Revision 1.136 by root, Thu Nov 15 22:35:35 2018 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.118 by root, Fri Oct 25 20:27:57 2013 UTC vs.
Revision 1.136 by root, Thu Nov 15 22:35:35 2018 UTC