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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.67 by root, Wed Nov 28 14:01:01 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
25	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
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 // NYI	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
		38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		39
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	40	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	41	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		42
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	43	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
56	#endif	60	#endif
57		61
58	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
59	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
60		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
		72
61	static HV json_stash, json_boolean_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	74	static SV json_true, json_false;
63		75
64	typedef struct json {	76	typedef struct {
65	U32 flags;	77	U32 flags;
		78	SV *cb_object;
		79	HV *cb_sk_object;
66	} JSON__XS;	80	} JSON;
67		81
68	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	83	// utility functions
70		84
71	static UV *	85	inline void
72	SvJSON (SV *sv)
73	{
74	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
75	croak ("object is not of type JSON::XS");
76
77	return &SvUVX (SvRV (sv));
78	}
79
80	static void
81	shrink (SV *sv)	86	shrink (SV *sv)
82	{	87	{
83	sv_utf8_downgrade (sv, 1);	88	sv_utf8_downgrade (sv, 1);
84	if (SvLEN (sv) > SvCUR (sv) + 1)	89	if (SvLEN (sv) > SvCUR (sv) + 1)
85	{	90	{
…		…
120	typedef struct	125	typedef struct
121	{	126	{
122	char *cur; // SvPVX (sv) + current output position	127	char *cur; // SvPVX (sv) + current output position
123	char *end; // SvEND (sv)	128	char *end; // SvEND (sv)
124	SV *sv; // result scalar	129	SV *sv; // result scalar
125	struct json json;	130	JSON json;
126	U32 indent; // indentation level	131	U32 indent; // indentation level
127	U32 maxdepth; // max. indentation/recursion level	132	U32 maxdepth; // max. indentation/recursion level
128	} enc_t;	133	} enc_t;
129		134
130	inline void	135	inline void
…		…
307	int i, len = av_len (av);	312	int i, len = av_len (av);
308		313
309	if (enc->indent >= enc->maxdepth)	314	if (enc->indent >= enc->maxdepth)
310	croak ("data structure too deep (hit recursion limit)");	315	croak ("data structure too deep (hit recursion limit)");
311		316
312	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '[');
313	++enc->indent;	318
		319	if (len >= 0)
		320	{
		321	encode_nl (enc); ++enc->indent;
314		322
315	for (i = 0; i <= len; ++i)	323	for (i = 0; i <= len; ++i)
316	{	324	{
		325	SV **svp = av_fetch (av, i, 0);
		326
317	encode_indent (enc);	327	encode_indent (enc);
318	encode_sv (enc, *av_fetch (av, i, 0));
319		328
		329	if (svp)
		330	encode_sv (enc, *svp);
		331	else
		332	encode_str (enc, "null", 4, 0);
		333
320	if (i < len)	334	if (i < len)
321	encode_comma (enc);	335	encode_comma (enc);
322	}	336	}
323		337
		338	encode_nl (enc); --enc->indent; encode_indent (enc);
		339	}
		340
324	encode_nl (enc);	341	encode_ch (enc, ']');
325
326	--enc->indent;
327	encode_indent (enc); encode_ch (enc, ']');
328	}	342	}
329		343
330	static void	344	static void
331	encode_he (enc_t enc, HE he)	345	encode_hk (enc_t enc, HE he)
332	{	346	{
333	encode_ch (enc, '"');	347	encode_ch (enc, '"');
334		348
335	if (HeKLEN (he) == HEf_SVKEY)	349	if (HeKLEN (he) == HEf_SVKEY)
336	{	350	{
…		…
349	encode_ch (enc, '"');	363	encode_ch (enc, '"');
350		364
351	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	365	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352	encode_ch (enc, ':');	366	encode_ch (enc, ':');
353	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	367	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354	encode_sv (enc, HeVAL (he));
355	}	368	}
356		369
357	// compare hash entries, used when all keys are bytestrings	370	// compare hash entries, used when all keys are bytestrings
358	static int	371	static int
359	he_cmp_fast (const void a_, const void b_)	372	he_cmp_fast (const void a_, const void b_)
…		…
364	HE b = (HE **)b_;	377	HE b = (HE **)b_;
365		378
366	STRLEN la = HeKLEN (a);	379	STRLEN la = HeKLEN (a);
367	STRLEN lb = HeKLEN (b);	380	STRLEN lb = HeKLEN (b);
368		381
369	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	382	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370	cmp = la - lb;	383	cmp = lb - la;
371		384
372	return cmp;	385	return cmp;
373	}	386	}
374		387
375	// compare hash entries, used when some keys are sv's or utf-x	388	// compare hash entries, used when some keys are sv's or utf-x
376	static int	389	static int
377	he_cmp_slow (const void a, const void b)	390	he_cmp_slow (const void a, const void b)
378	{	391	{
379	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	392	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
380	}	393	}
381		394
382	static void	395	static void
383	encode_hv (enc_t enc, HV hv)	396	encode_hv (enc_t enc, HV hv)
384	{	397	{
		398	HE *he;
385	int count, i;	399	int count;
386		400
387	if (enc->indent >= enc->maxdepth)	401	if (enc->indent >= enc->maxdepth)
388	croak ("data structure too deep (hit recursion limit)");	402	croak ("data structure too deep (hit recursion limit)");
389		403
390	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	404	encode_ch (enc, '{');
391		405
392	if ((count = hv_iterinit (hv)))
393	{
394	// for canonical output we have to sort by keys first	406	// for canonical output we have to sort by keys first
395	// actually, this is mostly due to the stupid so-called	407	// actually, this is mostly due to the stupid so-called
396	// security workaround added somewhere in 5.8.x.	408	// security workaround added somewhere in 5.8.x.
397	// that randomises hash orderings	409	// that randomises hash orderings
398	if (enc->json.flags & F_CANONICAL)	410	if (enc->json.flags & F_CANONICAL)
		411	{
		412	int count = hv_iterinit (hv);
		413
		414	if (SvMAGICAL (hv))
399	{	415	{
		416	// need to count by iterating. could improve by dynamically building the vector below
		417	// but I don't care for the speed of this special case.
		418	// note also that we will run into undefined behaviour when the two iterations
		419	// do not result in the same count, something I might care for in some later release.
		420
		421	count = 0;
		422	while (hv_iternext (hv))
		423	++count;
		424
		425	hv_iterinit (hv);
		426	}
		427
		428	if (count)
		429	{
400	int fast = 1;	430	int i, fast = 1;
401	HE *he;
402	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	431	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
403	HE *hes = _alloca (count sizeof (HE));	432	HE *hes = _alloca (count sizeof (HE));
404	#else	433	#else
405	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	434	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
406	#endif	435	#endif
…		…
433		462
434	FREETMPS;	463	FREETMPS;
435	LEAVE;	464	LEAVE;
436	}	465	}
437		466
438	for (i = 0; i < count; ++i)	467	encode_nl (enc); ++enc->indent;
		468
		469	while (count--)
439	{	470	{
440	encode_indent (enc);	471	encode_indent (enc);
		472	he = hes [count];
441	encode_he (enc, hes [i]);	473	encode_hk (enc, he);
		474	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442		475
443	if (i < count - 1)	476	if (count)
444	encode_comma (enc);	477	encode_comma (enc);
445	}	478	}
446		479
447	encode_nl (enc);	480	encode_nl (enc); --enc->indent; encode_indent (enc);
448	}	481	}
		482	}
449	else	483	else
		484	{
		485	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		486	if ((he = hv_iternext (hv)))
450	{	487	{
451	HE *he = hv_iternext (hv);	488	encode_nl (enc); ++enc->indent;
452		489
453	for (;;)	490	for (;;)
454	{	491	{
455	encode_indent (enc);	492	encode_indent (enc);
456	encode_he (enc, he);	493	encode_hk (enc, he);
		494	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457		495
458	if (!(he = hv_iternext (hv)))	496	if (!(he = hv_iternext (hv)))
459	break;	497	break;
460		498
461	encode_comma (enc);	499	encode_comma (enc);
462	}	500	}
463		501
464	encode_nl (enc);	502	encode_nl (enc); --enc->indent; encode_indent (enc);
465	}	503	}
466	}	504	}
467		505
468	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	506	encode_ch (enc, '}');
469	}	507	}
470		508
471	// encode objects, arrays and special \0=false and \1=true values.	509	// encode objects, arrays and special \0=false and \1=true values.
472	static void	510	static void
473	encode_rv (enc_t enc, SV sv)	511	encode_rv (enc_t enc, SV sv)
…		…
477	SvGETMAGIC (sv);	515	SvGETMAGIC (sv);
478	svt = SvTYPE (sv);	516	svt = SvTYPE (sv);
479		517
480	if (expect_false (SvOBJECT (sv)))	518	if (expect_false (SvOBJECT (sv)))
481	{	519	{
		520	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		521	? json_boolean_stash
		522	: gv_stashpv ("JSON::XS::Boolean", 1);
		523
482	if (SvSTASH (sv) == json_boolean_stash)	524	if (SvSTASH (sv) == stash)
483	{	525	{
484	if (SvIV (sv) == 0)	526	if (SvIV (sv))
		527	encode_str (enc, "true", 4, 0);
		528	else
485	encode_str (enc, "false", 5, 0);	529	encode_str (enc, "false", 5, 0);
486	else
487	encode_str (enc, "true", 4, 0);
488	}	530	}
489	else	531	else
490	{	532	{
491	#if 0	533	#if 0
492	if (0 && sv_derived_from (rv, "JSON::Literal"))	534	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
495	}	537	}
496	#endif	538	#endif
497	if (enc->json.flags & F_CONV_BLESSED)	539	if (enc->json.flags & F_CONV_BLESSED)
498	{	540	{
499	// we re-bless the reference to get overload and other niceties right	541	// we re-bless the reference to get overload and other niceties right
500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	542	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501		543
502	if (to_json)	544	if (to_json)
503	{	545	{
504	dSP;	546	dSP;
505	ENTER;	547
506	SAVETMPS;
507	PUSHMARK (SP);	548	ENTER; SAVETMPS; PUSHMARK (SP);
508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	549	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509		550
510	// calling with G_SCALAR ensures that we always get a 1 reutrn value	551	// calling with G_SCALAR ensures that we always get a 1 return value
511	// check anyways.
512	PUTBACK;	552	PUTBACK;
513	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	553	call_sv ((SV *)GvCV (to_json), G_SCALAR);
514	SPAGAIN;	554	SPAGAIN;
515		555
		556	// catch this surprisingly common error
		557	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		558	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		559
		560	sv = POPs;
		561	PUTBACK;
		562
516	encode_sv (enc, POPs);	563	encode_sv (enc, sv);
517		564
518	FREETMPS;	565	FREETMPS; LEAVE;
519	LEAVE;
520	}	566	}
521	else if (enc->json.flags & F_ALLOW_BLESSED)	567	else if (enc->json.flags & F_ALLOW_BLESSED)
522	encode_str (enc, "null", 4, 0);	568	encode_str (enc, "null", 4, 0);
523	else	569	else
524	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	570	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
535	encode_hv (enc, (HV *)sv);	581	encode_hv (enc, (HV *)sv);
536	else if (svt == SVt_PVAV)	582	else if (svt == SVt_PVAV)
537	encode_av (enc, (AV *)sv);	583	encode_av (enc, (AV *)sv);
538	else if (svt < SVt_PVAV)	584	else if (svt < SVt_PVAV)
539	{	585	{
540	if (SvNIOK (sv) && SvIV (sv) == 0)	586	STRLEN len = 0;
		587	char *pv = svt ? SvPV (sv, len) : 0;
		588
		589	if (len == 1 && *pv == '1')
		590	encode_str (enc, "true", 4, 0);
		591	else if (len == 1 && *pv == '0')
541	encode_str (enc, "false", 5, 0);	592	encode_str (enc, "false", 5, 0);
542	else if (SvNIOK (sv) && SvIV (sv) == 1)
543	encode_str (enc, "true", 4, 0);
544	else	593	else
545	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	594	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
546	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	595	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547	}	596	}
548	else	597	else
…		…
618	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	667	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
619	SvPV_nolen (sv), SvFLAGS (sv));	668	SvPV_nolen (sv), SvFLAGS (sv));
620	}	669	}
621		670
622	static SV *	671	static SV *
623	encode_json (SV scalar, struct json json)	672	encode_json (SV scalar, JSON json)
624	{	673	{
625	enc_t enc;	674	enc_t enc;
626		675
627	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	676	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	677	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
…		…
656	typedef struct	705	typedef struct
657	{	706	{
658	char *cur; // current parser pointer	707	char *cur; // current parser pointer
659	char *end; // end of input string	708	char *end; // end of input string
660	const char *err; // parse error, if != 0	709	const char *err; // parse error, if != 0
661	struct json json;	710	JSON json;
662	U32 depth; // recursion depth	711	U32 depth; // recursion depth
663	U32 maxdepth; // recursion depth limit	712	U32 maxdepth; // recursion depth limit
664	} dec_t;	713	} dec_t;
665		714
666	inline void	715	inline void
		716	decode_comment (dec_t *dec)
		717	{
		718	// only '#'-style comments allowed a.t.m.
		719
		720	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		721	++dec->cur;
		722	}
		723
		724	inline void
667	decode_ws (dec_t *dec)	725	decode_ws (dec_t *dec)
668	{	726	{
669	for (;;)	727	for (;;)
670	{	728	{
671	char ch = *dec->cur;	729	char ch = *dec->cur;
672		730
673	if (ch > 0x20	731	if (ch > 0x20)
		732	{
		733	if (expect_false (ch == '#'))
		734	{
		735	if (dec->json.flags & F_RELAXED)
		736	decode_comment (dec);
		737	else
		738	break;
		739	}
		740	else
		741	break;
		742	}
674	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	743	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
675	break;	744	break; // parse error, but let higher level handle it, gives better error messages
676		745
677	++dec->cur;	746	++dec->cur;
678	}	747	}
679	}	748	}
680		749
…		…
929	is_nv = 1;	998	is_nv = 1;
930	}	999	}
931		1000
932	if (!is_nv)	1001	if (!is_nv)
933	{	1002	{
		1003	int len = dec->cur - start;
		1004
934	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1005	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
935	if (*start == '-')	1006	if (*start == '-')
936	switch (dec->cur - start)	1007	switch (len)
937	{	1008	{
938	case 2: return newSViv (-( start [1] - '0' * 1));	1009	case 2: return newSViv (-( start [1] - '0' * 1));
939	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1010	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
940	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1011	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
941	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1012	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
942	}	1013	}
943	else	1014	else
944	switch (dec->cur - start)	1015	switch (len)
945	{	1016	{
946	case 1: return newSViv ( start [0] - '0' * 1);	1017	case 1: return newSViv ( start [0] - '0' * 1);
947	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1018	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
948	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1019	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
949	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1020	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
950	}	1021	}
951		1022
952	{	1023	{
953	UV uv;	1024	UV uv;
954	int numtype = grok_number (start, dec->cur - start, &uv);	1025	int numtype = grok_number (start, len, &uv);
955	if (numtype & IS_NUMBER_IN_UV)	1026	if (numtype & IS_NUMBER_IN_UV)
956	if (numtype & IS_NUMBER_NEG)	1027	if (numtype & IS_NUMBER_NEG)
957	{	1028	{
958	if (uv < (UV)IV_MIN)	1029	if (uv < (UV)IV_MIN)
959	return newSViv (-(IV)uv);	1030	return newSViv (-(IV)uv);
960	}	1031	}
961	else	1032	else
962	return newSVuv (uv);	1033	return newSVuv (uv);
963
964	// here would likely be the place for bigint support
965	}	1034	}
966	}
967		1035
968	// if we ever support bigint or bigfloat, this is the place for bigfloat	1036	len -= *start == '-' ? 1 : 0;
		1037
		1038	// does not fit into IV or UV, try NV
		1039	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1040	#if defined (LDBL_DIG)
		1041	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1042	#endif
		1043	)
		1044	// fits into NV without loss of precision
		1045	return newSVnv (Atof (start));
		1046
		1047	// everything else fails, convert it to a string
		1048	return newSVpvn (start, dec->cur - start);
		1049	}
		1050
		1051	// loss of precision here
969	return newSVnv (Atof (start));	1052	return newSVnv (Atof (start));
970		1053
971	fail:	1054	fail:
972	return 0;	1055	return 0;
973	}	1056	}
…		…
1003		1086
1004	if (*dec->cur != ',')	1087	if (*dec->cur != ',')
1005	ERR (", or ] expected while parsing array");	1088	ERR (", or ] expected while parsing array");
1006		1089
1007	++dec->cur;	1090	++dec->cur;
		1091
		1092	decode_ws (dec);
		1093
		1094	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1095	{
		1096	++dec->cur;
		1097	break;
		1098	}
1008	}	1099	}
1009		1100
1010	DEC_DEC_DEPTH;	1101	DEC_DEC_DEPTH;
1011	return newRV_noinc ((SV *)av);	1102	return newRV_noinc ((SV *)av);
1012		1103
…		…
1017	}	1108	}
1018		1109
1019	static SV *	1110	static SV *
1020	decode_hv (dec_t *dec)	1111	decode_hv (dec_t *dec)
1021	{	1112	{
		1113	SV *sv;
1022	HV *hv = newHV ();	1114	HV *hv = newHV ();
1023		1115
1024	DEC_INC_DEPTH;	1116	DEC_INC_DEPTH;
1025	decode_ws (dec);	1117	decode_ws (dec);
1026		1118
1027	if (*dec->cur == '}')	1119	if (*dec->cur == '}')
1028	++dec->cur;	1120	++dec->cur;
1029	else	1121	else
1030	for (;;)	1122	for (;;)
1031	{	1123	{
1032	decode_ws (dec); EXPECT_CH ('"');	1124	EXPECT_CH ('"');
1033		1125
1034	// heuristic: assume that	1126	// heuristic: assume that
1035	// a) decode_str + hv_store_ent are abysmally slow.	1127	// a) decode_str + hv_store_ent are abysmally slow.
1036	// b) most hash keys are short, simple ascii text.	1128	// b) most hash keys are short, simple ascii text.
1037	// => try to "fast-match" such strings to avoid	1129	// => try to "fast-match" such strings to avoid
…		…
1051	if (!key)	1143	if (!key)
1052	goto fail;	1144	goto fail;
1053		1145
1054	decode_ws (dec); EXPECT_CH (':');	1146	decode_ws (dec); EXPECT_CH (':');
1055		1147
		1148	decode_ws (dec);
1056	value = decode_sv (dec);	1149	value = decode_sv (dec);
1057	if (!value)	1150	if (!value)
1058	{	1151	{
1059	SvREFCNT_dec (key);	1152	SvREFCNT_dec (key);
1060	goto fail;	1153	goto fail;
…		…
1072	int len = p - key;	1165	int len = p - key;
1073	dec->cur = p + 1;	1166	dec->cur = p + 1;
1074		1167
1075	decode_ws (dec); EXPECT_CH (':');	1168	decode_ws (dec); EXPECT_CH (':');
1076		1169
		1170	decode_ws (dec);
1077	value = decode_sv (dec);	1171	value = decode_sv (dec);
1078	if (!value)	1172	if (!value)
1079	goto fail;	1173	goto fail;
1080		1174
1081	hv_store (hv, key, len, value, 0);	1175	hv_store (hv, key, len, value, 0);
…		…
1097		1191
1098	if (*dec->cur != ',')	1192	if (*dec->cur != ',')
1099	ERR (", or } expected while parsing object/hash");	1193	ERR (", or } expected while parsing object/hash");
1100		1194
1101	++dec->cur;	1195	++dec->cur;
		1196
		1197	decode_ws (dec);
		1198
		1199	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1200	{
		1201	++dec->cur;
		1202	break;
		1203	}
1102	}	1204	}
1103		1205
1104	DEC_DEC_DEPTH;	1206	DEC_DEC_DEPTH;
1105	return newRV_noinc ((SV *)hv);	1207	sv = newRV_noinc ((SV *)hv);
		1208
		1209	// check filter callbacks
		1210	if (dec->json.flags & F_HOOK)
		1211	{
		1212	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1213	{
		1214	HE cb, he;
		1215
		1216	hv_iterinit (hv);
		1217	he = hv_iternext (hv);
		1218	hv_iterinit (hv);
		1219
		1220	// the next line creates a mortal sv each time its called.
		1221	// might want to optimise this for common cases.
		1222	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1223
		1224	if (cb)
		1225	{
		1226	dSP;
		1227	int count;
		1228
		1229	ENTER; SAVETMPS; PUSHMARK (SP);
		1230	XPUSHs (HeVAL (he));
		1231
		1232	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1233
		1234	if (count == 1)
		1235	{
		1236	sv = newSVsv (POPs);
		1237	FREETMPS; LEAVE;
		1238	return sv;
		1239	}
		1240
		1241	FREETMPS; LEAVE;
		1242	}
		1243	}
		1244
		1245	if (dec->json.cb_object)
		1246	{
		1247	dSP;
		1248	int count;
		1249
		1250	ENTER; SAVETMPS; PUSHMARK (SP);
		1251	XPUSHs (sv_2mortal (sv));
		1252
		1253	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1254
		1255	if (count == 1)
		1256	{
		1257	sv = newSVsv (POPs);
		1258	FREETMPS; LEAVE;
		1259	return sv;
		1260	}
		1261
		1262	SvREFCNT_inc (sv);
		1263	FREETMPS; LEAVE;
		1264	}
		1265	}
		1266
		1267	return sv;
1106		1268
1107	fail:	1269	fail:
1108	SvREFCNT_dec (hv);	1270	SvREFCNT_dec (hv);
1109	DEC_DEC_DEPTH;	1271	DEC_DEC_DEPTH;
1110	return 0;	1272	return 0;
1111	}	1273	}
1112		1274
1113	static SV *	1275	static SV *
1114	decode_sv (dec_t *dec)	1276	decode_sv (dec_t *dec)
1115	{	1277	{
1116	decode_ws (dec);
1117
1118	// the beauty of JSON: you need exactly one character lookahead	1278	// the beauty of JSON: you need exactly one character lookahead
1119	// to parse anything.	1279	// to parse anything.
1120	switch (*dec->cur)	1280	switch (*dec->cur)
1121	{	1281	{
1122	case '"': ++dec->cur; return decode_str (dec);	1282	case '"': ++dec->cur; return decode_str (dec);
…		…
1130		1290
1131	case 't':	1291	case 't':
1132	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1292	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1133	{	1293	{
1134	dec->cur += 4;	1294	dec->cur += 4;
		1295	#if JSON_SLOW
		1296	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1297	#endif
1135	return SvREFCNT_inc (json_true);	1298	return SvREFCNT_inc (json_true);
1136	}	1299	}
1137	else	1300	else
1138	ERR ("'true' expected");	1301	ERR ("'true' expected");
1139		1302
…		…
1141		1304
1142	case 'f':	1305	case 'f':
1143	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1306	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1144	{	1307	{
1145	dec->cur += 5;	1308	dec->cur += 5;
		1309	#if JSON_SLOW
		1310	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1311	#endif
1146	return SvREFCNT_inc (json_false);	1312	return SvREFCNT_inc (json_false);
1147	}	1313	}
1148	else	1314	else
1149	ERR ("'false' expected");	1315	ERR ("'false' expected");
1150		1316
…		…
1169	fail:	1335	fail:
1170	return 0;	1336	return 0;
1171	}	1337	}
1172		1338
1173	static SV *	1339	static SV *
1174	decode_json (SV string, struct json json, UV *offset_return)	1340	decode_json (SV string, JSON json, UV *offset_return)
1175	{	1341	{
1176	dec_t dec;	1342	dec_t dec;
1177	UV offset;	1343	UV offset;
1178	SV *sv;	1344	SV *sv;
1179		1345
…		…
1196	dec.end = SvEND (string);	1362	dec.end = SvEND (string);
1197	dec.err = 0;	1363	dec.err = 0;
1198	dec.depth = 0;	1364	dec.depth = 0;
1199	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1365	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1200		1366
		1367	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1368	dec.json.flags \|= F_HOOK;
		1369
1201	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1370	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1371
		1372	decode_ws (&dec);
1202	sv = decode_sv (&dec);	1373	sv = decode_sv (&dec);
1203		1374
1204	if (!(offset_return \|\| !sv))	1375	if (!(offset_return \|\| !sv))
1205	{	1376	{
1206	// check for trailing garbage	1377	// check for trailing garbage
…		…
1274	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1445	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1275	}	1446	}
1276		1447
1277	PROTOTYPES: DISABLE	1448	PROTOTYPES: DISABLE
1278		1449
1279	SV new (char dummy)	1450	void CLONE (...)
1280	CODE:	1451	CODE:
1281	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1452	json_stash = 0;
1282	OUTPUT:	1453	json_boolean_stash = 0;
1283	RETVAL
1284		1454
		1455	void new (char *klass)
		1456	PPCODE:
		1457	{
		1458	SV *pv = NEWSV (0, sizeof (JSON));
		1459	SvPOK_only (pv);
		1460	Zero (SvPVX (pv), 1, JSON);
		1461	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1462	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
		1463	}
		1464
1285	SV ascii (SV self, int enable = 1)	1465	void ascii (JSON *self, int enable = 1)
1286	ALIAS:	1466	ALIAS:
1287	ascii = F_ASCII	1467	ascii = F_ASCII
1288	latin1 = F_LATIN1	1468	latin1 = F_LATIN1
1289	utf8 = F_UTF8	1469	utf8 = F_UTF8
1290	indent = F_INDENT	1470	indent = F_INDENT
…		…
1294	pretty = F_PRETTY	1474	pretty = F_PRETTY
1295	allow_nonref = F_ALLOW_NONREF	1475	allow_nonref = F_ALLOW_NONREF
1296	shrink = F_SHRINK	1476	shrink = F_SHRINK
1297	allow_blessed = F_ALLOW_BLESSED	1477	allow_blessed = F_ALLOW_BLESSED
1298	convert_blessed = F_CONV_BLESSED	1478	convert_blessed = F_CONV_BLESSED
		1479	relaxed = F_RELAXED
		1480	PPCODE:
		1481	{
		1482	if (enable)
		1483	self->flags \|= ix;
		1484	else
		1485	self->flags &= ~ix;
		1486
		1487	XPUSHs (ST (0));
		1488	}
		1489
		1490	void get_ascii (JSON *self)
		1491	ALIAS:
		1492	get_ascii = F_ASCII
		1493	get_latin1 = F_LATIN1
		1494	get_utf8 = F_UTF8
		1495	get_indent = F_INDENT
		1496	get_canonical = F_CANONICAL
		1497	get_space_before = F_SPACE_BEFORE
		1498	get_space_after = F_SPACE_AFTER
		1499	get_pretty = F_PRETTY
		1500	get_allow_nonref = F_ALLOW_NONREF
		1501	get_shrink = F_SHRINK
		1502	get_allow_blessed = F_ALLOW_BLESSED
		1503	get_convert_blessed = F_CONV_BLESSED
		1504	get_relaxed = F_RELAXED
		1505	PPCODE:
		1506	XPUSHs (boolSV (self->flags & ix));
		1507
		1508	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
		1509	PPCODE:
		1510	{
		1511	UV log2 = 0;
		1512
		1513	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
		1514
		1515	while ((1UL << log2) < max_depth)
		1516	++log2;
		1517
		1518	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
		1519
		1520	XPUSHs (ST (0));
		1521	}
		1522
		1523	U32 get_max_depth (JSON *self)
1299	CODE:	1524	CODE:
1300	{	1525	RETVAL = DEC_DEPTH (self->flags);
1301	UV *uv = SvJSON (self);
1302	if (enable)
1303	*uv \|= ix;
1304	else
1305	*uv &= ~ix;
1306
1307	RETVAL = newSVsv (self);
1308	}
1309	OUTPUT:	1526	OUTPUT:
1310	RETVAL	1527	RETVAL
1311		1528
1312	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1529	void max_size (JSON *self, UV max_size = 0)
		1530	PPCODE:
		1531	{
		1532	UV log2 = 0;
		1533
		1534	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1535	if (max_size == 1) max_size = 2;
		1536
		1537	while ((1UL << log2) < max_size)
		1538	++log2;
		1539
		1540	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1541
		1542	XPUSHs (ST (0));
		1543	}
		1544
		1545	int get_max_size (JSON *self)
1313	CODE:	1546	CODE:
1314	{	1547	RETVAL = DEC_SIZE (self->flags);
1315	UV *uv = SvJSON (self);
1316	UV log2 = 0;
1317
1318	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319
1320	while ((1UL << log2) < max_depth)
1321	++log2;
1322
1323	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1324
1325	RETVAL = newSVsv (self);
1326	}
1327	OUTPUT:	1548	OUTPUT:
1328	RETVAL	1549	RETVAL
1329		1550
1330	SV max_size (SV self, UV max_size = 0)	1551	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
		1552	PPCODE:
		1553	{
		1554	SvREFCNT_dec (self->cb_object);
		1555	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1556
		1557	XPUSHs (ST (0));
		1558	}
		1559
		1560	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1561	PPCODE:
		1562	{
		1563	if (!self->cb_sk_object)
		1564	self->cb_sk_object = newHV ();
		1565
		1566	if (SvOK (cb))
		1567	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1568	else
		1569	{
		1570	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1571
		1572	if (!HvKEYS (self->cb_sk_object))
		1573	{
		1574	SvREFCNT_dec (self->cb_sk_object);
		1575	self->cb_sk_object = 0;
		1576	}
		1577	}
		1578
		1579	XPUSHs (ST (0));
		1580	}
		1581
		1582	void encode (JSON self, SV scalar)
		1583	PPCODE:
		1584	XPUSHs (encode_json (scalar, self));
		1585
		1586	void decode (JSON self, SV jsonstr)
		1587	PPCODE:
		1588	XPUSHs (decode_json (jsonstr, self, 0));
		1589
		1590	void decode_prefix (JSON self, SV jsonstr)
		1591	PPCODE:
		1592	{
		1593	UV offset;
		1594	EXTEND (SP, 2);
		1595	PUSHs (decode_json (jsonstr, self, &offset));
		1596	PUSHs (sv_2mortal (newSVuv (offset)));
		1597	}
		1598
		1599	void DESTROY (JSON *self)
1331	CODE:	1600	CODE:
1332	{	1601	SvREFCNT_dec (self->cb_sk_object);
1333	UV *uv = SvJSON (self);	1602	SvREFCNT_dec (self->cb_object);
1334	UV log2 = 0;
1335
1336	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1337	if (max_size == 1) max_size = 2;
1338
1339	while ((1UL << log2) < max_size)
1340	++log2;
1341
1342	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1343
1344	RETVAL = newSVsv (self);
1345	}
1346	OUTPUT:
1347	RETVAL
1348
1349	void encode (SV self, SV scalar)
1350	PPCODE:
1351	{
1352	struct json json = { *SvJSON (self) };
1353	XPUSHs (encode_json (scalar, &json));
1354	}
1355
1356	void decode (SV self, SV jsonstr)
1357	PPCODE:
1358	{
1359	struct json json = { *SvJSON (self) };
1360	XPUSHs (decode_json (jsonstr, &json, 0));
1361	}
1362
1363	void decode_prefix (SV self, SV jsonstr)
1364	PPCODE:
1365	{
1366	UV offset;
1367	struct json json = { *SvJSON (self) };
1368	EXTEND (SP, 2);
1369	PUSHs (decode_json (jsonstr, &json, &offset));
1370	PUSHs (sv_2mortal (newSVuv (offset)));
1371	}
1372		1603
1373	PROTOTYPES: ENABLE	1604	PROTOTYPES: ENABLE
1374		1605
1375	void to_json (SV *scalar)	1606	void to_json (SV *scalar)
1376	PPCODE:	1607	PPCODE:
1377	{	1608	{
1378	struct json json = { F_DEFAULT \| F_UTF8 };	1609	JSON json = { F_DEFAULT \| F_UTF8 };
1379	XPUSHs (encode_json (scalar, &json));	1610	XPUSHs (encode_json (scalar, &json));
1380	}	1611	}
1381		1612
1382	void from_json (SV *jsonstr)	1613	void from_json (SV *jsonstr)
1383	PPCODE:	1614	PPCODE:
1384	{	1615	{
1385	struct json json = { F_DEFAULT \| F_UTF8 };	1616	JSON json = { F_DEFAULT \| F_UTF8 };
1386	XPUSHs (decode_json (jsonstr, &json, 0));	1617	XPUSHs (decode_json (jsonstr, &json, 0));
1387	}	1618	}
1388		1619

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs. Revision 1.67 by root, Wed Nov 28 14:01:01 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.67 by root, Wed Nov 28 14:01:01 2007 UTC