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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.52 by root, Mon Jul 2 02:57:11 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
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 <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
26	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
29	#define F_ALLOW_BLESSED 0x00000400UL	30	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL	31	#define F_CONV_BLESSED 0x00000800UL
		32	#define F_RELAXED 0x00001000UL
		33
31	#define F_MAXDEPTH 0xf8000000UL	34	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	35	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	36	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	37	#define S_MAXSIZE 20
35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
56	# define inline static	59	# define inline static
57	#endif	60	#endif
58		61
59	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
60	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
		64
		65	#ifdef USE_ITHREADS
		66	# define JSON_SLOW 1
		67	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		68	#else
		69	# define JSON_SLOW 0
		70	# define JSON_STASH json_stash
		71	#endif
61		72
62	static HV json_stash, json_boolean_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	74	static SV json_true, json_false;
64		75
65	typedef struct {	76	typedef struct {
…		…
306	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '['); encode_nl (enc);
307	++enc->indent;	318	++enc->indent;
308		319
309	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
310	{	321	{
		322	SV **svp = av_fetch (av, i, 0);
		323
311	encode_indent (enc);	324	encode_indent (enc);
312	encode_sv (enc, *av_fetch (av, i, 0));	325
		326	if (svp)
		327	encode_sv (enc, *svp);
		328	else
		329	encode_str (enc, "null", 4, 0);
313		330
314	if (i < len)	331	if (i < len)
315	encode_comma (enc);	332	encode_comma (enc);
316	}	333	}
317		334
…		…
320	--enc->indent;	337	--enc->indent;
321	encode_indent (enc); encode_ch (enc, ']');	338	encode_indent (enc); encode_ch (enc, ']');
322	}	339	}
323		340
324	static void	341	static void
325	encode_he (enc_t enc, HE he)	342	encode_hk (enc_t enc, HE he)
326	{	343	{
327	encode_ch (enc, '"');	344	encode_ch (enc, '"');
328		345
329	if (HeKLEN (he) == HEf_SVKEY)	346	if (HeKLEN (he) == HEf_SVKEY)
330	{	347	{
…		…
343	encode_ch (enc, '"');	360	encode_ch (enc, '"');
344		361
345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	362	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346	encode_ch (enc, ':');	363	encode_ch (enc, ':');
347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	364	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348	encode_sv (enc, HeVAL (he));
349	}	365	}
350		366
351	// compare hash entries, used when all keys are bytestrings	367	// compare hash entries, used when all keys are bytestrings
352	static int	368	static int
353	he_cmp_fast (const void a_, const void b_)	369	he_cmp_fast (const void a_, const void b_)
…		…
358	HE b = (HE **)b_;	374	HE b = (HE **)b_;
359		375
360	STRLEN la = HeKLEN (a);	376	STRLEN la = HeKLEN (a);
361	STRLEN lb = HeKLEN (b);	377	STRLEN lb = HeKLEN (b);
362		378
363	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	379	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
364	cmp = la - lb;	380	cmp = lb - la;
365		381
366	return cmp;	382	return cmp;
367	}	383	}
368		384
369	// compare hash entries, used when some keys are sv's or utf-x	385	// compare hash entries, used when some keys are sv's or utf-x
370	static int	386	static int
371	he_cmp_slow (const void a, const void b)	387	he_cmp_slow (const void a, const void b)
372	{	388	{
373	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	389	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
374	}	390	}
375		391
376	static void	392	static void
377	encode_hv (enc_t enc, HV hv)	393	encode_hv (enc_t enc, HV hv)
378	{	394	{
		395	HE *he;
379	int count, i;	396	int count;
380		397
381	if (enc->indent >= enc->maxdepth)	398	if (enc->indent >= enc->maxdepth)
382	croak ("data structure too deep (hit recursion limit)");	399	croak ("data structure too deep (hit recursion limit)");
383		400
384	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	401	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
385		402
386	if ((count = hv_iterinit (hv)))
387	{
388	// for canonical output we have to sort by keys first	403	// for canonical output we have to sort by keys first
389	// actually, this is mostly due to the stupid so-called	404	// actually, this is mostly due to the stupid so-called
390	// security workaround added somewhere in 5.8.x.	405	// security workaround added somewhere in 5.8.x.
391	// that randomises hash orderings	406	// that randomises hash orderings
392	if (enc->json.flags & F_CANONICAL)	407	if (enc->json.flags & F_CANONICAL)
		408	{
		409	int count = hv_iterinit (hv);
		410
		411	if (SvMAGICAL (hv))
393	{	412	{
		413	// need to count by iterating. could improve by dynamically building the vector below
		414	// but I don't care for the speed of this special case.
		415	// note also that we will run into undefined behaviour when the two iterations
		416	// do not result in the same count, something I might care for in some later release.
		417
		418	count = 0;
		419	while (hv_iternext (hv))
		420	++count;
		421
		422	hv_iterinit (hv);
		423	}
		424
		425	if (count)
		426	{
394	int fast = 1;	427	int i, fast = 1;
395	HE *he;
396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	428	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
397	HE *hes = _alloca (count sizeof (HE));	429	HE *hes = _alloca (count sizeof (HE));
398	#else	430	#else
399	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	431	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
400	#endif	432	#endif
…		…
427		459
428	FREETMPS;	460	FREETMPS;
429	LEAVE;	461	LEAVE;
430	}	462	}
431		463
432	for (i = 0; i < count; ++i)	464	while (count--)
433	{	465	{
434	encode_indent (enc);	466	encode_indent (enc);
		467	he = hes [count];
435	encode_he (enc, hes [i]);	468	encode_hk (enc, he);
		469	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
436		470
437	if (i < count - 1)	471	if (count)
438	encode_comma (enc);	472	encode_comma (enc);
439	}	473	}
440
441	encode_nl (enc);
442	}	474	}
		475	}
443	else	476	else
444	{	477	{
		478	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
445	HE *he = hv_iternext (hv);	479	if ((he = hv_iternext (hv)))
446
447	for (;;)	480	for (;;)
448	{	481	{
449	encode_indent (enc);	482	encode_indent (enc);
450	encode_he (enc, he);	483	encode_hk (enc, he);
		484	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
451		485
452	if (!(he = hv_iternext (hv)))	486	if (!(he = hv_iternext (hv)))
453	break;	487	break;
454		488
455	encode_comma (enc);	489	encode_comma (enc);
456	}	490	}
		491	}
457		492
458	encode_nl (enc);	493	encode_nl (enc);
459	}
460	}
461		494
462	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	495	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
463	}	496	}
464		497
465	// encode objects, arrays and special \0=false and \1=true values.	498	// encode objects, arrays and special \0=false and \1=true values.
…		…
471	SvGETMAGIC (sv);	504	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	505	svt = SvTYPE (sv);
473		506
474	if (expect_false (SvOBJECT (sv)))	507	if (expect_false (SvOBJECT (sv)))
475	{	508	{
		509	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		510	? json_boolean_stash
		511	: gv_stashpv ("JSON::XS::Boolean", 1);
		512
476	if (SvSTASH (sv) == json_boolean_stash)	513	if (SvSTASH (sv) == stash)
477	{	514	{
478	if (SvIV (sv))	515	if (SvIV (sv))
479	encode_str (enc, "true", 4, 0);	516	encode_str (enc, "true", 4, 0);
480	else	517	else
481	encode_str (enc, "false", 5, 0);	518	encode_str (enc, "false", 5, 0);
…		…
489	}	526	}
490	#endif	527	#endif
491	if (enc->json.flags & F_CONV_BLESSED)	528	if (enc->json.flags & F_CONV_BLESSED)
492	{	529	{
493	// we re-bless the reference to get overload and other niceties right	530	// we re-bless the reference to get overload and other niceties right
494	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	531	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
495		532
496	if (to_json)	533	if (to_json)
497	{	534	{
		535	dSP;
		536
498	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	537	ENTER; SAVETMPS; PUSHMARK (SP);
499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	538	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500		539
501	// calling with G_SCALAR ensures that we always get a 1 reutrn value	540	// calling with G_SCALAR ensures that we always get a 1 return value
502	// check anyways.
503	PUTBACK;	541	PUTBACK;
504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	542	call_sv ((SV *)GvCV (to_json), G_SCALAR);
505	SPAGAIN;	543	SPAGAIN;
506		544
		545	// catch this surprisingly common error
		546	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		547	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		548
		549	sv = POPs;
		550	PUTBACK;
		551
507	encode_sv (enc, POPs);	552	encode_sv (enc, sv);
508		553
509	FREETMPS; LEAVE;	554	FREETMPS; LEAVE;
510	}	555	}
511	else if (enc->json.flags & F_ALLOW_BLESSED)	556	else if (enc->json.flags & F_ALLOW_BLESSED)
512	encode_str (enc, "null", 4, 0);	557	encode_str (enc, "null", 4, 0);
…		…
655	U32 depth; // recursion depth	700	U32 depth; // recursion depth
656	U32 maxdepth; // recursion depth limit	701	U32 maxdepth; // recursion depth limit
657	} dec_t;	702	} dec_t;
658		703
659	inline void	704	inline void
		705	decode_comment (dec_t *dec)
		706	{
		707	// only '#'-style comments allowed a.t.m.
		708
		709	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		710	++dec->cur;
		711	}
		712
		713	inline void
660	decode_ws (dec_t *dec)	714	decode_ws (dec_t *dec)
661	{	715	{
662	for (;;)	716	for (;;)
663	{	717	{
664	char ch = *dec->cur;	718	char ch = *dec->cur;
665		719
666	if (ch > 0x20	720	if (ch > 0x20)
		721	{
		722	if (expect_false (ch == '#'))
		723	{
		724	if (dec->json.flags & F_RELAXED)
		725	decode_comment (dec);
		726	else
		727	break;
		728	}
		729	else
		730	break;
		731	}
667	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	732	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
668	break;	733	break; // parse error, but let higher level handle it, gives better error messages
669		734
670	++dec->cur;	735	++dec->cur;
671	}	736	}
672	}	737	}
673		738
…		…
922	is_nv = 1;	987	is_nv = 1;
923	}	988	}
924		989
925	if (!is_nv)	990	if (!is_nv)
926	{	991	{
		992	int len = dec->cur - start;
		993
927	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	994	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
928	if (*start == '-')	995	if (*start == '-')
929	switch (dec->cur - start)	996	switch (len)
930	{	997	{
931	case 2: return newSViv (-( start [1] - '0' * 1));	998	case 2: return newSViv (-( start [1] - '0' * 1));
932	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	999	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
933	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1000	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
934	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1001	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
935	}	1002	}
936	else	1003	else
937	switch (dec->cur - start)	1004	switch (len)
938	{	1005	{
939	case 1: return newSViv ( start [0] - '0' * 1);	1006	case 1: return newSViv ( start [0] - '0' * 1);
940	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1007	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
941	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1008	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
942	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1009	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
943	}	1010	}
944		1011
945	{	1012	{
946	UV uv;	1013	UV uv;
947	int numtype = grok_number (start, dec->cur - start, &uv);	1014	int numtype = grok_number (start, len, &uv);
948	if (numtype & IS_NUMBER_IN_UV)	1015	if (numtype & IS_NUMBER_IN_UV)
949	if (numtype & IS_NUMBER_NEG)	1016	if (numtype & IS_NUMBER_NEG)
950	{	1017	{
951	if (uv < (UV)IV_MIN)	1018	if (uv < (UV)IV_MIN)
952	return newSViv (-(IV)uv);	1019	return newSViv (-(IV)uv);
953	}	1020	}
954	else	1021	else
955	return newSVuv (uv);	1022	return newSVuv (uv);
956
957	// here would likely be the place for bigint support
958	}	1023	}
959	}
960		1024
961	// if we ever support bigint or bigfloat, this is the place for bigfloat	1025	len -= *start == '-' ? 1 : 0;
		1026
		1027	// does not fit into IV or UV, try NV
		1028	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1029	#if defined (LDBL_DIG)
		1030	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1031	#endif
		1032	)
		1033	// fits into NV without loss of precision
		1034	return newSVnv (Atof (start));
		1035
		1036	// everything else fails, convert it to a string
		1037	return newSVpvn (start, dec->cur - start);
		1038	}
		1039
		1040	// loss of precision here
962	return newSVnv (Atof (start));	1041	return newSVnv (Atof (start));
963		1042
964	fail:	1043	fail:
965	return 0;	1044	return 0;
966	}	1045	}
…		…
996		1075
997	if (*dec->cur != ',')	1076	if (*dec->cur != ',')
998	ERR (", or ] expected while parsing array");	1077	ERR (", or ] expected while parsing array");
999		1078
1000	++dec->cur;	1079	++dec->cur;
		1080
		1081	decode_ws (dec);
		1082
		1083	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1084	{
		1085	++dec->cur;
		1086	break;
		1087	}
1001	}	1088	}
1002		1089
1003	DEC_DEC_DEPTH;	1090	DEC_DEC_DEPTH;
1004	return newRV_noinc ((SV *)av);	1091	return newRV_noinc ((SV *)av);
1005		1092
…		…
1021	if (*dec->cur == '}')	1108	if (*dec->cur == '}')
1022	++dec->cur;	1109	++dec->cur;
1023	else	1110	else
1024	for (;;)	1111	for (;;)
1025	{	1112	{
1026	decode_ws (dec); EXPECT_CH ('"');	1113	EXPECT_CH ('"');
1027		1114
1028	// heuristic: assume that	1115	// heuristic: assume that
1029	// a) decode_str + hv_store_ent are abysmally slow.	1116	// a) decode_str + hv_store_ent are abysmally slow.
1030	// b) most hash keys are short, simple ascii text.	1117	// b) most hash keys are short, simple ascii text.
1031	// => try to "fast-match" such strings to avoid	1118	// => try to "fast-match" such strings to avoid
…		…
1045	if (!key)	1132	if (!key)
1046	goto fail;	1133	goto fail;
1047		1134
1048	decode_ws (dec); EXPECT_CH (':');	1135	decode_ws (dec); EXPECT_CH (':');
1049		1136
		1137	decode_ws (dec);
1050	value = decode_sv (dec);	1138	value = decode_sv (dec);
1051	if (!value)	1139	if (!value)
1052	{	1140	{
1053	SvREFCNT_dec (key);	1141	SvREFCNT_dec (key);
1054	goto fail;	1142	goto fail;
…		…
1066	int len = p - key;	1154	int len = p - key;
1067	dec->cur = p + 1;	1155	dec->cur = p + 1;
1068		1156
1069	decode_ws (dec); EXPECT_CH (':');	1157	decode_ws (dec); EXPECT_CH (':');
1070		1158
		1159	decode_ws (dec);
1071	value = decode_sv (dec);	1160	value = decode_sv (dec);
1072	if (!value)	1161	if (!value)
1073	goto fail;	1162	goto fail;
1074		1163
1075	hv_store (hv, key, len, value, 0);	1164	hv_store (hv, key, len, value, 0);
…		…
1091		1180
1092	if (*dec->cur != ',')	1181	if (*dec->cur != ',')
1093	ERR (", or } expected while parsing object/hash");	1182	ERR (", or } expected while parsing object/hash");
1094		1183
1095	++dec->cur;	1184	++dec->cur;
		1185
		1186	decode_ws (dec);
		1187
		1188	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1189	{
		1190	++dec->cur;
		1191	break;
		1192	}
1096	}	1193	}
1097		1194
1098	DEC_DEC_DEPTH;	1195	DEC_DEC_DEPTH;
1099	sv = newRV_noinc ((SV *)hv);	1196	sv = newRV_noinc ((SV *)hv);
1100		1197
…		…
1113	// might want to optimise this for common cases.	1210	// might want to optimise this for common cases.
1114	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1211	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1115		1212
1116	if (cb)	1213	if (cb)
1117	{	1214	{
		1215	dSP;
1118	int count;	1216	int count;
1119	ENTER; SAVETMPS;
1120		1217
1121	dSP; PUSHMARK (SP);	1218	ENTER; SAVETMPS; PUSHMARK (SP);
1122	XPUSHs (HeVAL (he));	1219	XPUSHs (HeVAL (he));
1123		1220
1124	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1221	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1125		1222
1126	if (count == 1)	1223	if (count == 1)
…		…
1134	}	1231	}
1135	}	1232	}
1136		1233
1137	if (dec->json.cb_object)	1234	if (dec->json.cb_object)
1138	{	1235	{
		1236	dSP;
1139	int count;	1237	int count;
1140	ENTER; SAVETMPS;
1141		1238
1142	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	1239	ENTER; SAVETMPS; PUSHMARK (SP);
1143	XPUSHs (sv_2mortal (sv));	1240	XPUSHs (sv_2mortal (sv));
1144		1241
1145	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1242	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1146		1243
1147	if (count == 1)	1244	if (count == 1)
…		…
1165	}	1262	}
1166		1263
1167	static SV *	1264	static SV *
1168	decode_sv (dec_t *dec)	1265	decode_sv (dec_t *dec)
1169	{	1266	{
1170	decode_ws (dec);
1171
1172	// the beauty of JSON: you need exactly one character lookahead	1267	// the beauty of JSON: you need exactly one character lookahead
1173	// to parse anything.	1268	// to parse anything.
1174	switch (*dec->cur)	1269	switch (*dec->cur)
1175	{	1270	{
1176	case '"': ++dec->cur; return decode_str (dec);	1271	case '"': ++dec->cur; return decode_str (dec);
…		…
1184		1279
1185	case 't':	1280	case 't':
1186	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1281	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1187	{	1282	{
1188	dec->cur += 4;	1283	dec->cur += 4;
		1284	#if JSON_SLOW
		1285	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1286	#endif
1189	return SvREFCNT_inc (json_true);	1287	return SvREFCNT_inc (json_true);
1190	}	1288	}
1191	else	1289	else
1192	ERR ("'true' expected");	1290	ERR ("'true' expected");
1193		1291
…		…
1195		1293
1196	case 'f':	1294	case 'f':
1197	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1295	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1198	{	1296	{
1199	dec->cur += 5;	1297	dec->cur += 5;
		1298	#if JSON_SLOW
		1299	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1300	#endif
1200	return SvREFCNT_inc (json_false);	1301	return SvREFCNT_inc (json_false);
1201	}	1302	}
1202	else	1303	else
1203	ERR ("'false' expected");	1304	ERR ("'false' expected");
1204		1305
…		…
1254		1355
1255	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1356	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1256	dec.json.flags \|= F_HOOK;	1357	dec.json.flags \|= F_HOOK;
1257		1358
1258	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1359	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1360
		1361	decode_ws (&dec);
1259	sv = decode_sv (&dec);	1362	sv = decode_sv (&dec);
1260		1363
1261	if (!(offset_return \|\| !sv))	1364	if (!(offset_return \|\| !sv))
1262	{	1365	{
1263	// check for trailing garbage	1366	// check for trailing garbage
…		…
1331	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1434	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1332	}	1435	}
1333		1436
1334	PROTOTYPES: DISABLE	1437	PROTOTYPES: DISABLE
1335		1438
		1439	void CLONE (...)
		1440	CODE:
		1441	json_stash = 0;
		1442	json_boolean_stash = 0;
		1443
1336	void new (char *klass)	1444	void new (char *klass)
1337	PPCODE:	1445	PPCODE:
1338	{	1446	{
1339	SV *pv = NEWSV (0, sizeof (JSON));	1447	SV *pv = NEWSV (0, sizeof (JSON));
1340	SvPOK_only (pv);	1448	SvPOK_only (pv);
1341	Zero (SvPVX (pv), 1, JSON);	1449	Zero (SvPVX (pv), 1, JSON);
1342	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1450	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1343	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1451	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1344	}	1452	}
1345		1453
1346	void ascii (JSON *self, int enable = 1)	1454	void ascii (JSON *self, int enable = 1)
1347	ALIAS:	1455	ALIAS:
1348	ascii = F_ASCII	1456	ascii = F_ASCII
…		…
1355	pretty = F_PRETTY	1463	pretty = F_PRETTY
1356	allow_nonref = F_ALLOW_NONREF	1464	allow_nonref = F_ALLOW_NONREF
1357	shrink = F_SHRINK	1465	shrink = F_SHRINK
1358	allow_blessed = F_ALLOW_BLESSED	1466	allow_blessed = F_ALLOW_BLESSED
1359	convert_blessed = F_CONV_BLESSED	1467	convert_blessed = F_CONV_BLESSED
		1468	relaxed = F_RELAXED
1360	PPCODE:	1469	PPCODE:
1361	{	1470	{
1362	if (enable)	1471	if (enable)
1363	self->flags \|= ix;	1472	self->flags \|= ix;
1364	else	1473	else

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.52 by root, Mon Jul 2 02:57:11 2007 UTC vs. Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.52 by root, Mon Jul 2 02:57:11 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC