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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.17 by root, Sun Mar 25 02:46:41 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

…		…
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		8
9	#define F_ASCII 0x00000001	9	#define F_ASCII 0x00000001UL
10	#define F_UTF8 0x00000002	10	#define F_UTF8 0x00000002UL
11	#define F_INDENT 0x00000004	11	#define F_INDENT 0x00000004UL
12	#define F_CANONICAL 0x00000008	12	#define F_CANONICAL 0x00000008UL
13	#define F_SPACE_BEFORE 0x00000010	13	#define F_SPACE_BEFORE 0x00000010UL
14	#define F_SPACE_AFTER 0x00000020	14	#define F_SPACE_AFTER 0x00000020UL
15	#define F_ALLOW_NONREF 0x00000080	15	#define F_ALLOW_NONREF 0x00000080UL
16	#define F_SHRINK 0x00000100	16	#define F_SHRINK 0x00000100UL
		17	#define F_MAXDEPTH 0xf8000000UL
		18	#define S_MAXDEPTH 27
17		19
18	// F_SKIPINVALID?	20	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
19	// F_EXECCODEREF?	21
20	// F_SELFCONVERT? <=> { &__class__ => }	22	// F_SELFCONVERT? <=> to_json/toJson
		23	// F_BLESSED? <=> { $__class__$ => }
21		24
22	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	25	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
23	#define F_DEFAULT 0	26	#define F_DEFAULT (9UL << S_MAXDEPTH)
24		27
25	#define INIT_SIZE 32 // initial scalar size to be allocated	28	#define INIT_SIZE 32 // initial scalar size to be allocated
26	#define INDENT_STEP 3 // spaces per indentation level	29	#define INDENT_STEP 3 // spaces per indentation level
27		30
28	#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character	31	#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
…		…
73	{	76	{
74	*clen = 2;	77	*clen = 2;
75	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	78	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
76	}	79	}
77	else	80	else
		81	{
		82	*clen = (STRLEN)-1;
78	return (UV)-1;	83	return (UV)-1;
		84	}
79	}	85	}
80		86
81	/////////////////////////////////////////////////////////////////////////////	87	/////////////////////////////////////////////////////////////////////////////
82	// encoder	88	// encoder
83		89
…		…
85	typedef struct	91	typedef struct
86	{	92	{
87	char *cur; // SvPVX (sv) + current output position	93	char *cur; // SvPVX (sv) + current output position
88	char *end; // SvEND (sv)	94	char *end; // SvEND (sv)
89	SV *sv; // result scalar	95	SV *sv; // result scalar
90	UV flags; // F_*	96	U32 flags; // F_*
91	int indent; // indentation level	97	U32 indent; // indentation level
92	int max_depth; // max. recursion level	98	U32 maxdepth; // max. indentation/recursion level
93	} enc_t;	99	} enc_t;
94		100
95	static void	101	static void
96	need (enc_t *enc, STRLEN len)	102	need (enc_t *enc, STRLEN len)
97	{	103	{
…		…
265	static void	271	static void
266	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
267	{	273	{
268	int i, len = av_len (av);	274	int i, len = av_len (av);
269		275
		276	if (enc->indent >= enc->maxdepth)
		277	croak ("data structure too deep (hit recursion limit)");
		278
270	encode_ch (enc, '['); encode_nl (enc);	279	encode_ch (enc, '['); encode_nl (enc);
271	++enc->indent;	280	++enc->indent;
272		281
273	for (i = 0; i <= len; ++i)	282	for (i = 0; i <= len; ++i)
274	{	283	{
…		…
339		348
340	static void	349	static void
341	encode_hv (enc_t enc, HV hv)	350	encode_hv (enc_t enc, HV hv)
342	{	351	{
343	int count, i;	352	int count, i;
		353
		354	if (enc->indent >= enc->maxdepth)
		355	croak ("data structure too deep (hit recursion limit)");
344		356
345	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	357	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
346		358
347	if ((count = hv_iterinit (hv)))	359	if ((count = hv_iterinit (hv)))
348	{	360	{
…		…
396		408
397	encode_nl (enc);	409	encode_nl (enc);
398	}	410	}
399	else	411	else
400	{	412	{
401	SV *sv;
402	HE *he = hv_iternext (hv);	413	HE *he = hv_iternext (hv);
403		414
404	for (;;)	415	for (;;)
405	{	416	{
406	encode_indent (enc);	417	encode_indent (enc);
…		…
415	encode_nl (enc);	426	encode_nl (enc);
416	}	427	}
417	}	428	}
418		429
419	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	430	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
		431	}
		432
		433	// encode objects, arrays and special \0=false and \1=true values.
		434	static void
		435	encode_rv (enc_t enc, SV sv)
		436	{
		437	svtype svt;
		438
		439	SvGETMAGIC (sv);
		440	svt = SvTYPE (sv);
		441
		442	if (svt == SVt_PVHV)
		443	encode_hv (enc, (HV *)sv);
		444	else if (svt == SVt_PVAV)
		445	encode_av (enc, (AV *)sv);
		446	else if (svt < SVt_PVAV)
		447	{
		448	if (SvNIOK (sv) && SvIV (sv) == 0)
		449	encode_str (enc, "false", 5, 0);
		450	else if (SvNIOK (sv) && SvIV (sv) == 1)
		451	encode_str (enc, "true", 4, 0);
		452	else
		453	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
		454	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		455	}
		456	else
		457	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
		458	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
420	}	459	}
421		460
422	static void	461	static void
423	encode_sv (enc_t enc, SV sv)	462	encode_sv (enc_t enc, SV sv)
424	{	463	{
…		…
445	SvIsUV(sv)	484	SvIsUV(sv)
446	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	485	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
447	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	486	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
448	}	487	}
449	else if (SvROK (sv))	488	else if (SvROK (sv))
450	{	489	encode_rv (enc, SvRV (sv));
451	SV *rv = SvRV (sv);
452
453	if (enc->indent >= enc->max_depth)
454	croak ("data structure too deep (hit recursion limit)");
455
456	switch (SvTYPE (rv))
457	{
458	case SVt_PVAV: encode_av (enc, (AV *)rv); break;
459	case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
460
461	default:
462	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
463	SvPV_nolen (sv));
464	}
465	}
466	else if (!SvOK (sv))	490	else if (!SvOK (sv))
467	encode_str (enc, "null", 4, 0);	491	encode_str (enc, "null", 4, 0);
468	else	492	else
469	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	493	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
470	SvPV_nolen (sv), SvFLAGS (sv));	494	SvPV_nolen (sv), SvFLAGS (sv));
471	}	495	}
472		496
473	static SV *	497	static SV *
474	encode_json (SV *scalar, UV flags)	498	encode_json (SV *scalar, U32 flags)
475	{	499	{
		500	enc_t enc;
		501
476	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	502	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
477	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	503	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
478		504
479	enc_t enc;
480	enc.flags = flags;	505	enc.flags = flags;
481	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	506	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
482	enc.cur = SvPVX (enc.sv);	507	enc.cur = SvPVX (enc.sv);
483	enc.end = SvEND (enc.sv);	508	enc.end = SvEND (enc.sv);
484	enc.indent = 0;	509	enc.indent = 0;
485	enc.max_depth = 0x7fffffffUL;	510	enc.maxdepth = DEC_DEPTH (flags);
486		511
487	SvPOK_only (enc.sv);	512	SvPOK_only (enc.sv);
488	encode_sv (&enc, scalar);	513	encode_sv (&enc, scalar);
489		514
490	if (!(flags & (F_ASCII \| F_UTF8)))	515	if (!(flags & (F_ASCII \| F_UTF8)))
…		…
505	typedef struct	530	typedef struct
506	{	531	{
507	char *cur; // current parser pointer	532	char *cur; // current parser pointer
508	char *end; // end of input string	533	char *end; // end of input string
509	const char *err; // parse error, if != 0	534	const char *err; // parse error, if != 0
510	UV flags; // F_*	535	U32 flags; // F_*
		536	U32 depth; // recursion depth
		537	U32 maxdepth; // recursion depth limit
511	} dec_t;	538	} dec_t;
512		539
513	static void	540	static void
514	decode_ws (dec_t *dec)	541	decode_ws (dec_t *dec)
515	{	542	{
…		…
524	++dec->cur;	551	++dec->cur;
525	}	552	}
526	}	553	}
527		554
528	#define ERR(reason) SB dec->err = reason; goto fail; SE	555	#define ERR(reason) SB dec->err = reason; goto fail; SE
		556
529	#define EXPECT_CH(ch) SB \	557	#define EXPECT_CH(ch) SB \
530	if (*dec->cur != ch) \	558	if (*dec->cur != ch) \
531	ERR (# ch " expected"); \	559	ERR (# ch " expected"); \
532	++dec->cur; \	560	++dec->cur; \
533	SE	561	SE
		562
		563	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
		564	#define DEC_DEC_DEPTH --dec->depth
534		565
535	static SV decode_sv (dec_t dec);	566	static SV decode_sv (dec_t dec);
536		567
537	static signed char decode_hexdigit[256];	568	static signed char decode_hexdigit[256];
538		569
…		…
640	}	671	}
641	else if (ch >= 0x20 && ch <= 0x7f)	672	else if (ch >= 0x20 && ch <= 0x7f)
642	*cur++ = ch;	673	*cur++ = ch;
643	else if (ch >= 0x80)	674	else if (ch >= 0x80)
644	{	675	{
		676	STRLEN clen;
		677	UV uch;
		678
645	--dec->cur;	679	--dec->cur;
646		680
647	STRLEN clen;
648	UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);	681	uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
649	if (clen == (STRLEN)-1)	682	if (clen == (STRLEN)-1)
650	ERR ("malformed UTF-8 character in JSON string");	683	ERR ("malformed UTF-8 character in JSON string");
651		684
652	do	685	do
653	{
654	cur++ = dec->cur++;	686	cur++ = dec->cur++;
655	}
656	while (--clen);	687	while (--clen);
657		688
658	utf8 = 1;	689	utf8 = 1;
659	}	690	}
660	else if (!ch)
661	ERR ("unexpected end of string while parsing json string");
662	else	691	else
		692	{
		693	--dec->cur;
		694
		695	if (!ch)
		696	ERR ("unexpected end of string while parsing JSON string");
		697	else
663	ERR ("invalid character encountered");	698	ERR ("invalid character encountered while parsing JSON string");
664		699	}
665	}	700	}
666	while (cur < buf + SHORT_STRING_LEN);	701	while (cur < buf + SHORT_STRING_LEN);
667		702
		703	{
668	STRLEN len = cur - buf;	704	STRLEN len = cur - buf;
669		705
670	if (sv)	706	if (sv)
671	{	707	{
672	SvGROW (sv, SvCUR (sv) + len + 1);	708	SvGROW (sv, SvCUR (sv) + len + 1);
673	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	709	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
674	SvCUR_set (sv, SvCUR (sv) + len);	710	SvCUR_set (sv, SvCUR (sv) + len);
675	}	711	}
676	else	712	else
677	sv = newSVpvn (buf, len);	713	sv = newSVpvn (buf, len);
		714	}
678	}	715	}
679	while (*dec->cur != '"');	716	while (*dec->cur != '"');
680		717
681	++dec->cur;	718	++dec->cur;
682		719
…		…
782	static SV *	819	static SV *
783	decode_av (dec_t *dec)	820	decode_av (dec_t *dec)
784	{	821	{
785	AV *av = newAV ();	822	AV *av = newAV ();
786		823
		824	DEC_INC_DEPTH;
787	decode_ws (dec);	825	decode_ws (dec);
		826
788	if (*dec->cur == ']')	827	if (*dec->cur == ']')
789	++dec->cur;	828	++dec->cur;
790	else	829	else
791	for (;;)	830	for (;;)
792	{	831	{
…		…
810	ERR (", or ] expected while parsing array");	849	ERR (", or ] expected while parsing array");
811		850
812	++dec->cur;	851	++dec->cur;
813	}	852	}
814		853
		854	DEC_DEC_DEPTH;
815	return newRV_noinc ((SV *)av);	855	return newRV_noinc ((SV *)av);
816		856
817	fail:	857	fail:
818	SvREFCNT_dec (av);	858	SvREFCNT_dec (av);
		859	DEC_DEC_DEPTH;
819	return 0;	860	return 0;
820	}	861	}
821		862
822	static SV *	863	static SV *
823	decode_hv (dec_t *dec)	864	decode_hv (dec_t *dec)
824	{	865	{
825	HV *hv = newHV ();	866	HV *hv = newHV ();
826		867
		868	DEC_INC_DEPTH;
827	decode_ws (dec);	869	decode_ws (dec);
		870
828	if (*dec->cur == '}')	871	if (*dec->cur == '}')
829	++dec->cur;	872	++dec->cur;
830	else	873	else
831	for (;;)	874	for (;;)
832	{	875	{
…		…
845	{	888	{
846	SvREFCNT_dec (key);	889	SvREFCNT_dec (key);
847	goto fail;	890	goto fail;
848	}	891	}
849		892
850	//TODO: optimise
851	hv_store_ent (hv, key, value, 0);	893	hv_store_ent (hv, key, value, 0);
		894	SvREFCNT_dec (key);
852		895
853	decode_ws (dec);	896	decode_ws (dec);
854		897
855	if (*dec->cur == '}')	898	if (*dec->cur == '}')
856	{	899	{
…		…
862	ERR (", or } expected while parsing object/hash");	905	ERR (", or } expected while parsing object/hash");
863		906
864	++dec->cur;	907	++dec->cur;
865	}	908	}
866		909
		910	DEC_DEC_DEPTH;
867	return newRV_noinc ((SV *)hv);	911	return newRV_noinc ((SV *)hv);
868		912
869	fail:	913	fail:
870	SvREFCNT_dec (hv);	914	SvREFCNT_dec (hv);
		915	DEC_DEC_DEPTH;
871	return 0;	916	return 0;
872	}	917	}
873		918
874	static SV *	919	static SV *
875	decode_sv (dec_t *dec)	920	decode_sv (dec_t *dec)
…		…
918	ERR ("'null' expected");	963	ERR ("'null' expected");
919		964
920	break;	965	break;
921		966
922	default:	967	default:
923	ERR ("malformed json string, neither array, object, number, string or atom");	968	ERR ("malformed JSON string, neither array, object, number, string or atom");
924	break;	969	break;
925	}	970	}
926		971
927	fail:	972	fail:
928	return 0;	973	return 0;
929	}	974	}
930		975
931	static SV *	976	static SV *
932	decode_json (SV *string, UV flags)	977	decode_json (SV *string, U32 flags)
933	{	978	{
		979	dec_t dec;
934	SV *sv;	980	SV *sv;
		981
		982	SvUPGRADE (string, SVt_PV);
935		983
936	if (flags & F_UTF8)	984	if (flags & F_UTF8)
937	sv_utf8_downgrade (string, 0);	985	sv_utf8_downgrade (string, 0);
938	else	986	else
939	sv_utf8_upgrade (string);	987	sv_utf8_upgrade (string);
940		988
941	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	989	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
942		990
943	dec_t dec;
944	dec.flags = flags;	991	dec.flags = flags;
945	dec.cur = SvPVX (string);	992	dec.cur = SvPVX (string);
946	dec.end = SvEND (string);	993	dec.end = SvEND (string);
947	dec.err = 0;	994	dec.err = 0;
		995	dec.depth = 0;
		996	dec.maxdepth = DEC_DEPTH (dec.flags);
948		997
		998	*dec.end = 0; // this should basically be a nop, too, but make sure its there
949	sv = decode_sv (&dec);	999	sv = decode_sv (&dec);
950		1000
951	if (!sv)	1001	if (!sv)
952	{	1002	{
953	IV offset = dec.flags & F_UTF8	1003	IV offset = dec.flags & F_UTF8
…		…
962	SAVEVPTR (PL_curcop);	1012	SAVEVPTR (PL_curcop);
963	PL_curcop = &cop;	1013	PL_curcop = &cop;
964	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1014	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
965	LEAVE;	1015	LEAVE;
966		1016
967	croak ("%s, at character offset %d (%s)",	1017	croak ("%s, at character offset %d [\"%s\"]",
968	dec.err,	1018	dec.err,
969	(int)offset,	1019	(int)offset,
970	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1020	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
971	}	1021	}
972		1022
…		…
986	BOOT:	1036	BOOT:
987	{	1037	{
988	int i;	1038	int i;
989		1039
990	memset (decode_hexdigit, 0xff, 256);	1040	memset (decode_hexdigit, 0xff, 256);
		1041
991	for (i = 10; i--; )	1042	for (i = 0; i < 256; ++i)
992	decode_hexdigit ['0' + i] = i;	1043	decode_hexdigit [i] =
993		1044	i >= '0' && i <= '9' ? i - '0'
994	for (i = 7; i--; )	1045	: i >= 'a' && i <= 'f' ? i - 'a' + 10
995	{	1046	: i >= 'A' && i <= 'F' ? i - 'A' + 10
996	decode_hexdigit ['a' + i] = 10 + i;	1047	: -1;
997	decode_hexdigit ['A' + i] = 10 + i;
998	}
999		1048
1000	json_stash = gv_stashpv ("JSON::XS", 1);	1049	json_stash = gv_stashpv ("JSON::XS", 1);
1001	}	1050	}
1002		1051
1003	PROTOTYPES: DISABLE	1052	PROTOTYPES: DISABLE
…		…
1030	RETVAL = newSVsv (self);	1079	RETVAL = newSVsv (self);
1031	}	1080	}
1032	OUTPUT:	1081	OUTPUT:
1033	RETVAL	1082	RETVAL
1034		1083
		1084	SV max_depth (SV self, UV max_depth = 0x80000000UL)
		1085	CODE:
		1086	{
		1087	UV *uv = SvJSON (self);
		1088	UV log2 = 0;
		1089
		1090	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
		1091
		1092	while ((1UL << log2) < max_depth)
		1093	++log2;
		1094
		1095	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
		1096
		1097	RETVAL = newSVsv (self);
		1098	}
		1099	OUTPUT:
		1100	RETVAL
		1101
1035	void encode (SV self, SV scalar)	1102	void encode (SV self, SV scalar)
1036	PPCODE:	1103	PPCODE:
1037	XPUSHs (encode_json (scalar, *SvJSON (self)));	1104	XPUSHs (encode_json (scalar, *SvJSON (self)));
1038		1105
1039	void decode (SV self, SV jsonstr)	1106	void decode (SV self, SV jsonstr)
…		…
1044		1111
1045	void to_json (SV *scalar)	1112	void to_json (SV *scalar)
1046	ALIAS:	1113	ALIAS:
1047	objToJson = 0	1114	objToJson = 0
1048	PPCODE:	1115	PPCODE:
1049	XPUSHs (encode_json (scalar, F_UTF8));	1116	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));
1050		1117
1051	void from_json (SV *jsonstr)	1118	void from_json (SV *jsonstr)
1052	ALIAS:	1119	ALIAS:
1053	jsonToObj = 0	1120	jsonToObj = 0
1054	PPCODE:	1121	PPCODE:
1055	XPUSHs (decode_json (jsonstr, F_UTF8));	1122	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8));
1056		1123

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.17 by root, Sun Mar 25 02:46:41 2007 UTC vs. Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.17 by root, Sun Mar 25 02:46:41 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC