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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.1 by root, Thu Mar 22 16:40:16 2007 UTC vs.
Revision 1.9 by root, Fri Mar 23 17:40:29 2007 UTC

…		…
11	#define F_INDENT 0x00000004	11	#define F_INDENT 0x00000004
12	#define F_CANONICAL 0x00000008	12	#define F_CANONICAL 0x00000008
13	#define F_SPACE_BEFORE 0x00000010	13	#define F_SPACE_BEFORE 0x00000010
14	#define F_SPACE_AFTER 0x00000020	14	#define F_SPACE_AFTER 0x00000020
15	#define F_JSON_RPC 0x00000040	15	#define F_JSON_RPC 0x00000040
		16	#define F_ALLOW_NONREF 0x00000080
		17	#define F_SHRINK 0x00000100
16		18
		19	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
17	#define F_DEFAULT 0	20	#define F_DEFAULT 0
18		21
19	#define INIT_SIZE 32 // initial scalar size to be allocated	22	#define INIT_SIZE 32 // initial scalar size to be allocated
20		23
21	#define SB do {	24	#define SB do {
…		…
38	// structure used for decoding JSON	41	// structure used for decoding JSON
39	typedef struct	42	typedef struct
40	{	43	{
41	char *cur;	44	char *cur;
42	char *end;	45	char *end;
43	char *err;	46	const char *err;
44	UV flags;	47	UV flags;
45	} dec_t;	48	} dec_t;
46		49
47	static UV *	50	static UV *
48	SvJSON (SV *sv)	51	SvJSON (SV *sv)
49	{	52	{
50	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))	53	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51	croak ("object is not of type JSON::XS");	54	croak ("object is not of type JSON::XS");
52		55
53	return &SvUVX (SvRV (sv));	56	return &SvUVX (SvRV (sv));
		57	}
		58
		59	static void
		60	shrink (SV *sv)
		61	{
		62	sv_utf8_downgrade (sv, 1);
		63	#ifdef SvPV_shrink_to_cur
		64	SvPV_shrink_to_cur (sv);
		65	#endif
54	}	66	}
55		67
56	/////////////////////////////////////////////////////////////////////////////	68	/////////////////////////////////////////////////////////////////////////////
57		69
58	static void	70	static void
…		…
61	if (enc->cur + len >= enc->end)	73	if (enc->cur + len >= enc->end)
62	{	74	{
63	STRLEN cur = enc->cur - SvPVX (enc->sv);	75	STRLEN cur = enc->cur - SvPVX (enc->sv);
64	SvGROW (enc->sv, cur + len + 1);	76	SvGROW (enc->sv, cur + len + 1);
65	enc->cur = SvPVX (enc->sv) + cur;	77	enc->cur = SvPVX (enc->sv) + cur;
66	enc->end = SvEND (enc->sv);	78	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
67	}	79	}
68	}	80	}
69		81
70	static void	82	static void
71	encode_ch (enc_t *enc, char ch)	83	encode_ch (enc_t *enc, char ch)
…		…
77	static void	89	static void
78	encode_str (enc_t enc, char str, STRLEN len, int is_utf8)	90	encode_str (enc_t enc, char str, STRLEN len, int is_utf8)
79	{	91	{
80	char *end = str + len;	92	char *end = str + len;
81		93
		94	need (enc, len);
		95
82	while (str < end)	96	while (str < end)
83	{	97	{
84	unsigned char ch = (unsigned char )str;	98	unsigned char ch = (unsigned char )str;
		99
85	if (ch >= 0x20 && ch < 0x80) // most common case	100	if (ch >= 0x20 && ch < 0x80) // most common case
86	{	101	{
		102	if (ch == '"') // but with slow exceptions
		103	{
		104	need (enc, len += 1);
		105	*enc->cur++ = '\\';
		106	*enc->cur++ = '"';
		107	}
		108	else if (ch == '\\')
		109	{
		110	need (enc, len += 1);
		111	*enc->cur++ = '\\';
		112	*enc->cur++ = '\\';
		113	}
		114	else
87	*enc->cur++ = ch;	115	*enc->cur++ = ch;
		116
88	str++;	117	++str;
89	}	118	}
90	else	119	else
91	{	120	{
92	STRLEN clen;	121	switch (ch)
93	UV uch;
94
95	if (is_utf8)
96	{	122	{
97	uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);	123	case '\010': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;
98	if (clen < 0)	124	case '\011': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;
99	croak ("malformed UTF-8 character in string, cannot convert to JSON");	125	case '\012': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;
100	}	126	case '\014': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;
101	else	127	case '\015': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;
102	{
103	uch = ch;
104	clen = 1;
105	}
106		128
107	need (enc, len += 6);	129	default:
108
109	if (uch < 0xa0 \|\| enc->flags & F_ASCII)
110	{
111	if (uch > 0xFFFFUL)
112	{	130	{
		131	STRLEN clen;
		132	UV uch;
		133
		134	if (is_utf8)
		135	{
		136	uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
		137	if (clen == (STRLEN)-1)
		138	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
		139	}
		140	else
		141	{
		142	uch = ch;
113	len += 6;	143	clen = 1;
		144	}
		145
		146	if (uch > 0x10FFFFUL)
		147	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		148
		149	if (uch < 0x80 \|\| enc->flags & F_ASCII)
		150	{
		151	if (uch > 0xFFFFUL)
		152	{
114	need (enc, len += 6);	153	need (enc, len += 11);
115	sprintf (enc->cur, "\\u%04x\\u%04x",	154	sprintf (enc->cur, "\\u%04x\\u%04x",
116	(uch - 0x10000) / 0x400 + 0xD800,	155	(uch - 0x10000) / 0x400 + 0xD800,
117	(uch - 0x10000) % 0x400 + 0xDC00);	156	(uch - 0x10000) % 0x400 + 0xDC00);
118	enc->cur += 12;	157	enc->cur += 12;
		158	}
		159	else
		160	{
		161	static char hexdigit [16] = "0123456789abcdef";
		162	need (enc, len += 5);
		163	*enc->cur++ = '\\';
		164	*enc->cur++ = 'u';
		165	*enc->cur++ = hexdigit [ uch >> 12 ];
		166	*enc->cur++ = hexdigit [(uch >> 8) & 15];
		167	*enc->cur++ = hexdigit [(uch >> 4) & 15];
		168	*enc->cur++ = hexdigit [(uch >> 0) & 15];
		169	}
		170
		171	str += clen;
119	}	172	}
		173	else if (is_utf8)
		174	{
		175	need (enc, len += clen);
		176	do
		177	{
		178	enc->cur++ = str++;
		179	}
		180	while (--clen);
		181	}
120	else	182	else
121	{	183	{
122	sprintf (enc->cur, "\\u%04x", uch);	184	need (enc, len += 10); // never more than 11 bytes needed
123	enc->cur += 6;	185	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
		186	++str;
		187	}
124	}	188	}
125	}	189	}
126	else if (is_utf8)
127	{
128	memcpy (enc->cur, str, clen);
129	enc->cur += clen;
130	}
131	else
132	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
133
134	str += clen;
135	}	190	}
136		191
137	--len;	192	--len;
138	}	193	}
139	}	194	}
…		…
146	for (i_ = enc->indent * 3; i_--; )\	201	for (i_ = enc->indent * 3; i_--; )\
147	encode_ch (enc, ' '); \	202	encode_ch (enc, ' '); \
148	} \	203	} \
149	SE	204	SE
150		205
151	#define SPACE SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, ' '); } SE	206	#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE
152	#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE	207	#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE
153	#define COMMA SB \	208	#define COMMA SB \
154	encode_ch (enc, ','); \	209	encode_ch (enc, ','); \
155	if (enc->flags & F_INDENT) \	210	if (enc->flags & F_INDENT) \
156	NL; \	211	NL; \
…		…
190		245
191	if (HeKLEN (he) == HEf_SVKEY)	246	if (HeKLEN (he) == HEf_SVKEY)
192	{	247	{
193	SV *sv = HeSVKEY (he);	248	SV *sv = HeSVKEY (he);
194	STRLEN len;	249	STRLEN len;
		250	char *str;
		251
		252	SvGETMAGIC (sv);
195	char *str = SvPV (sv, len);	253	str = SvPV (sv, len);
196		254
197	encode_str (enc, str, len, SvUTF8 (sv));	255	encode_str (enc, str, len, SvUTF8 (sv));
198	}	256	}
199	else	257	else
200	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	258	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
…		…
262		320
263	if (fast)	321	if (fast)
264	qsort (hes, count, sizeof (HE *), he_cmp_fast);	322	qsort (hes, count, sizeof (HE *), he_cmp_fast);
265	else	323	else
266	{	324	{
267	// hack to disable "use bytes"	325	// hack to forcefully disable "use bytes"
268	COP *oldcop = PL_curcop, cop;	326	COP cop = *PL_curcop;
269	cop.op_private = 0;	327	cop.op_private = 0;
		328
		329	ENTER;
		330	SAVETMPS;
		331
		332	SAVEVPTR (PL_curcop);
270	PL_curcop = &cop;	333	PL_curcop = &cop;
271		334
272	SAVETMPS;
273	qsort (hes, count, sizeof (HE *), he_cmp_slow);	335	qsort (hes, count, sizeof (HE *), he_cmp_slow);
		336
274	FREETMPS;	337	FREETMPS;
275		338	LEAVE;
276	PL_curcop = oldcop;
277	}	339	}
278		340
279	for (i = 0; i < count; ++i)	341	for (i = 0; i < count; ++i)
280	{	342	{
281	INDENT;	343	INDENT;
…		…
311	}	373	}
312		374
313	static void	375	static void
314	encode_sv (enc_t enc, SV sv)	376	encode_sv (enc_t enc, SV sv)
315	{	377	{
		378	SvGETMAGIC (sv);
		379
316	if (SvPOKp (sv))	380	if (SvPOKp (sv))
317	{	381	{
318	STRLEN len;	382	STRLEN len;
319	char *str = SvPV (sv, len);	383	char *str = SvPV (sv, len);
320	encode_ch (enc, '"');	384	encode_ch (enc, '"');
…		…
335	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	399	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
336	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	400	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
337	}	401	}
338	else if (SvROK (sv))	402	else if (SvROK (sv))
339	{	403	{
		404	SV *rv = SvRV (sv);
		405
340	if (!--enc->max_recurse)	406	if (!--enc->max_recurse)
341	croak ("data structure too deep (hit recursion limit)");	407	croak ("data structure too deep (hit recursion limit)");
342		408
343	sv = SvRV (sv);
344
345	switch (SvTYPE (sv))	409	switch (SvTYPE (rv))
346	{	410	{
347	case SVt_PVAV: encode_av (enc, (AV *)sv); break;	411	case SVt_PVAV: encode_av (enc, (AV *)rv); break;
348	case SVt_PVHV: encode_hv (enc, (HV *)sv); break;	412	case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
349		413
350	default:	414	default:
351	croak ("JSON can only represent references to arrays or hashes");	415	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
		416	SvPV_nolen (sv));
352	}	417	}
353	}	418	}
354	else if (!SvOK (sv))	419	else if (!SvOK (sv))
355	encode_str (enc, "null", 4, 0);	420	encode_str (enc, "null", 4, 0);
356	else	421	else
357	croak ("encountered perl type that JSON cannot handle");	422	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
		423	SvPV_nolen (sv), SvFLAGS (sv));
358	}	424	}
359		425
360	static SV *	426	static SV *
361	encode_json (SV *scalar, UV flags)	427	encode_json (SV *scalar, UV flags)
362	{	428	{
		429	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
		430	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
		431
363	enc_t enc;	432	enc_t enc;
364	enc.flags = flags;	433	enc.flags = flags;
365	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	434	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
366	enc.cur = SvPVX (enc.sv);	435	enc.cur = SvPVX (enc.sv);
367	enc.end = SvEND (enc.sv);	436	enc.end = SvEND (enc.sv);
…		…
373		442
374	if (!(flags & (F_ASCII \| F_UTF8)))	443	if (!(flags & (F_ASCII \| F_UTF8)))
375	SvUTF8_on (enc.sv);	444	SvUTF8_on (enc.sv);
376		445
377	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	446	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
		447
		448	if (enc.flags & F_SHRINK)
		449	shrink (enc.sv);
		450
378	return enc.sv;	451	return enc.sv;
379	}	452	}
380		453
381	/////////////////////////////////////////////////////////////////////////////	454	/////////////////////////////////////////////////////////////////////////////
382		455
…		…
397	++dec->cur; \	470	++dec->cur; \
398	SE	471	SE
399		472
400	static SV decode_sv (dec_t dec);	473	static SV decode_sv (dec_t dec);
401		474
402	#define APPEND_CH(ch) SB \
403	SvGROW (sv, cur + 1 + 1); \
404	SvPVX (sv)[cur++] = (ch); \
405	SE
406
407	static signed char decode_hexdigit[256];	475	static signed char decode_hexdigit[256];
408		476
409	static UV	477	static UV
410	decode_4hex (dec_t *dec)	478	decode_4hex (dec_t *dec)
411	{	479	{
…		…
429		497
430	fail:	498	fail:
431	return (UV)-1;	499	return (UV)-1;
432	}	500	}
433		501
		502	#define APPEND_GROW(n) SB \
		503	if (cur + (n) >= end) \
		504	{ \
		505	STRLEN ofs = cur - SvPVX (sv); \
		506	SvGROW (sv, ofs + (n) + 1); \
		507	cur = SvPVX (sv) + ofs; \
		508	end = SvEND (sv); \
		509	} \
		510	SE
		511
		512	#define APPEND_CH(ch) SB \
		513	APPEND_GROW (1); \
		514	*cur++ = (ch); \
		515	SE
		516
434	static SV *	517	static SV *
435	decode_str (dec_t *dec)	518	decode_str (dec_t *dec)
436	{	519	{
437	SV *sv = NEWSV (0,2);	520	SV *sv = NEWSV (0,2);
438	STRLEN cur = 0;
439	int utf8 = 0;	521	int utf8 = 0;
		522	char *cur = SvPVX (sv);
		523	char *end = SvEND (sv);
440		524
441	for (;;)	525	for (;;)
442	{	526	{
443	unsigned char ch = (unsigned char )dec->cur;	527	unsigned char ch = (unsigned char )dec->cur;
444		528
…		…
469		553
470	// possibly a surrogate pair	554	// possibly a surrogate pair
471	if (hi >= 0xd800 && hi < 0xdc00)	555	if (hi >= 0xd800 && hi < 0xdc00)
472	{	556	{
473	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')	557	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')
474	ERR ("illegal surrogate character");	558	ERR ("missing low surrogate character in surrogate pair");
475		559
476	dec->cur += 2;	560	dec->cur += 2;
477		561
478	lo = decode_4hex (dec);	562	lo = decode_4hex (dec);
479	if (lo == (UV)-1)	563	if (lo == (UV)-1)
…		…
482	if (lo < 0xdc00 \|\| lo >= 0xe000)	566	if (lo < 0xdc00 \|\| lo >= 0xe000)
483	ERR ("surrogate pair expected");	567	ERR ("surrogate pair expected");
484		568
485	hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;	569	hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
486	}	570	}
487	else if (lo >= 0xdc00 && lo < 0xe000)	571	else if (hi >= 0xdc00 && hi < 0xe000)
488	ERR ("illegal surrogate character");	572	ERR ("missing high surrogate character in surrogate pair");
489		573
490	if (hi >= 0x80)	574	if (hi >= 0x80)
491	{	575	{
492	utf8 = 1;	576	utf8 = 1;
493		577
494	SvGROW (sv, cur + 4 + 1); // at most 4 bytes for 21 bits	578	APPEND_GROW (4); // at most 4 bytes for 21 bits
495	cur = (char *)uvuni_to_utf8_flags (SvPVX (sv) + cur, hi, 0) - SvPVX (sv);	579	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
496	}	580	}
497	else	581	else
498	APPEND_CH (hi);	582	APPEND_CH (hi);
499	}	583	}
500	break;	584	break;
		585
		586	default:
		587	--dec->cur;
		588	ERR ("illegal backslash escape sequence in string");
501	}	589	}
502	}	590	}
503	else if (ch >= 0x20 && ch <= 0x7f)	591	else if (ch >= 0x20 && ch <= 0x7f)
504	APPEND_CH (*dec->cur++);	592	APPEND_CH (*dec->cur++);
505	else if (ch >= 0x80)	593	else if (ch >= 0x80)
506	{	594	{
507	STRLEN clen;	595	STRLEN clen;
508	UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);	596	UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
509	if (clen < 0)	597	if (clen == (STRLEN)-1)
510	ERR ("malformed UTF-8 character in string, cannot convert to JSON");	598	ERR ("malformed UTF-8 character in JSON string");
511		599
512	SvGROW (sv, cur + clen + 1); // at most 4 bytes for 21 bits	600	APPEND_GROW (clen);
513	memcpy (SvPVX (sv) + cur, dec->cur, clen);	601	do
514	dec->cur += clen;	602	{
		603	cur++ = dec->cur++;
		604	}
		605	while (--clen);
		606
		607	utf8 = 1;
515	}	608	}
		609	else if (dec->cur == dec->end)
		610	ERR ("unexpected end of string while parsing json string");
516	else	611	else
517	ERR ("invalid character encountered");	612	ERR ("invalid character encountered");
518	}	613	}
519		614
520	++dec->cur;	615	++dec->cur;
521		616
		617	SvCUR_set (sv, cur - SvPVX (sv));
		618
522	SvPOK_only (sv);	619	SvPOK_only (sv);
523
524	SvCUR_set (sv, cur);
525	*SvEND (sv) = 0;	620	*SvEND (sv) = 0;
526		621
527	if (utf8)	622	if (utf8)
528	SvUTF8_on (sv);	623	SvUTF8_on (sv);
		624
		625	if (dec->flags & F_SHRINK)
		626	shrink (sv);
529		627
530	return sv;	628	return sv;
531		629
532	fail:	630	fail:
533	SvREFCNT_dec (sv);	631	SvREFCNT_dec (sv);
…		…
548	{	646	{
549	++dec->cur;	647	++dec->cur;
550	if (dec->cur >= '0' && dec->cur <= '9')	648	if (dec->cur >= '0' && dec->cur <= '9')
551	ERR ("malformed number (leading zero must not be followed by another digit)");	649	ERR ("malformed number (leading zero must not be followed by another digit)");
552	}	650	}
553		651	else if (dec->cur < '0' \|\| dec->cur > '9')
554	// int	652	ERR ("malformed number (no digits after initial minus)");
		653	else
		654	do
		655	{
		656	++dec->cur;
		657	}
555	while (dec->cur >= '0' && dec->cur <= '9')	658	while (dec->cur >= '0' && dec->cur <= '9');
556	++dec->cur;
557		659
558	// [frac]	660	// [frac]
559	if (*dec->cur == '.')	661	if (*dec->cur == '.')
560	{	662	{
561	is_nv = 1;	663	++dec->cur;
		664
		665	if (dec->cur < '0' \|\| dec->cur > '9')
		666	ERR ("malformed number (no digits after decimal point)");
562		667
563	do	668	do
564	{	669	{
565	++dec->cur;	670	++dec->cur;
566	}	671	}
567	while (dec->cur >= '0' && dec->cur <= '9');	672	while (dec->cur >= '0' && dec->cur <= '9');
		673
		674	is_nv = 1;
568	}	675	}
569		676
570	// [exp]	677	// [exp]
571	if (dec->cur == 'e' \|\| dec->cur == 'E')	678	if (dec->cur == 'e' \|\| dec->cur == 'E')
572	{	679	{
573	is_nv = 1;
574
575	++dec->cur;	680	++dec->cur;
		681
576	if (dec->cur == '-' \|\| dec->cur == '+')	682	if (dec->cur == '-' \|\| dec->cur == '+')
577	++dec->cur;	683	++dec->cur;
578		684
		685	if (dec->cur < '0' \|\| dec->cur > '9')
		686	ERR ("malformed number (no digits after exp sign)");
		687
		688	do
		689	{
		690	++dec->cur;
		691	}
579	while (dec->cur >= '0' && dec->cur <= '9')	692	while (dec->cur >= '0' && dec->cur <= '9');
580	++dec->cur;	693
		694	is_nv = 1;
581	}	695	}
582		696
583	if (!is_nv)	697	if (!is_nv)
584	{	698	{
585	UV uv;	699	UV uv;
…		…
603	static SV *	717	static SV *
604	decode_av (dec_t *dec)	718	decode_av (dec_t *dec)
605	{	719	{
606	AV *av = newAV ();	720	AV *av = newAV ();
607		721
		722	WS;
		723	if (*dec->cur == ']')
		724	++dec->cur;
		725	else
608	for (;;)	726	for (;;)
609	{	727	{
610	SV *value;	728	SV *value;
611		729
612	value = decode_sv (dec);	730	value = decode_sv (dec);
613	if (!value)	731	if (!value)
614	goto fail;	732	goto fail;
615		733
616	av_push (av, value);	734	av_push (av, value);
617		735
618	WS;	736	WS;
619		737
620	if (*dec->cur == ']')	738	if (*dec->cur == ']')
621	{	739	{
622	++dec->cur;	740	++dec->cur;
623	break;	741	break;
		742	}
624	}	743
625
626	if (*dec->cur != ',')	744	if (*dec->cur != ',')
627	ERR (", or ] expected while parsing array");	745	ERR (", or ] expected while parsing array");
628		746
629	++dec->cur;	747	++dec->cur;
630	}	748	}
631		749
632	return newRV_noinc ((SV *)av);	750	return newRV_noinc ((SV *)av);
633		751
634	fail:	752	fail:
635	SvREFCNT_dec (av);	753	SvREFCNT_dec (av);
…		…
639	static SV *	757	static SV *
640	decode_hv (dec_t *dec)	758	decode_hv (dec_t *dec)
641	{	759	{
642	HV *hv = newHV ();	760	HV *hv = newHV ();
643		761
		762	WS;
		763	if (*dec->cur == '}')
		764	++dec->cur;
		765	else
644	for (;;)	766	for (;;)
645	{	767	{
646	SV key, value;	768	SV key, value;
647		769
648	WS; EXPECT_CH ('"');	770	WS; EXPECT_CH ('"');
649		771
650	key = decode_str (dec);	772	key = decode_str (dec);
651	if (!key)	773	if (!key)
652	goto fail;
653
654	WS; EXPECT_CH (':');
655
656	value = decode_sv (dec);
657	if (!value)
658	{
659	SvREFCNT_dec (key);
660	goto fail;	774	goto fail;
		775
		776	WS; EXPECT_CH (':');
		777
		778	value = decode_sv (dec);
		779	if (!value)
		780	{
		781	SvREFCNT_dec (key);
		782	goto fail;
661	}	783	}
662		784
663	//TODO: optimise	785	//TODO: optimise
664	hv_store_ent (hv, key, value, 0);	786	hv_store_ent (hv, key, value, 0);
665		787
666	WS;	788	WS;
667		789
668	if (*dec->cur == '}')	790	if (*dec->cur == '}')
669	{	791	{
670	++dec->cur;	792	++dec->cur;
671	break;	793	break;
672	}	794	}
673		795
674	if (*dec->cur != ',')	796	if (*dec->cur != ',')
675	ERR (", or } expected while parsing object/hash");	797	ERR (", or } expected while parsing object/hash");
676		798
677	++dec->cur;	799	++dec->cur;
678	}	800	}
679		801
680	return newRV_noinc ((SV *)hv);	802	return newRV_noinc ((SV *)hv);
681		803
682	fail:	804	fail:
683	SvREFCNT_dec (hv);	805	SvREFCNT_dec (hv);
…		…
723		845
724	case 'n':	846	case 'n':
725	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))	847	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
726	{	848	{
727	dec->cur += 4;	849	dec->cur += 4;
728	return newSViv (1);	850	return newSVsv (&PL_sv_undef);
729	}	851	}
730	else	852	else
731	ERR ("'null' expected");	853	ERR ("'null' expected");
732		854
733	break;	855	break;
734		856
735	default:	857	default:
736	ERR ("malformed json string");	858	ERR ("malformed json string, neither array, object, number, string or atom");
737	break;	859	break;
738	}	860	}
739		861
740	fail:	862	fail:
741	return 0;	863	return 0;
…		…
744	static SV *	866	static SV *
745	decode_json (SV *string, UV flags)	867	decode_json (SV *string, UV flags)
746	{	868	{
747	SV *sv;	869	SV *sv;
748		870
749	if (!(flags & F_UTF8))	871	if (flags & F_UTF8)
		872	sv_utf8_downgrade (string, 0);
		873	else
750	sv_utf8_upgrade (string);	874	sv_utf8_upgrade (string);
751		875
752	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	876	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
753		877
754	dec_t dec;	878	dec_t dec;
755	dec.flags = flags;	879	dec.flags = flags;
756	dec.cur = SvPVX (string);	880	dec.cur = SvPVX (string);
757	dec.end = SvEND (string);	881	dec.end = SvEND (string);
758	dec.err = 0;	882	dec.err = 0;
759		883
760	*dec.end = 1; // invalid anywhere
761	sv = decode_sv (&dec);	884	sv = decode_sv (&dec);
762	*dec.end = 0;
763		885
764	if (!sv)	886	if (!sv)
765	{	887	{
		888	IV offset = dec.flags & F_UTF8
		889	? dec.cur - SvPVX (string)
766	IV offset = utf8_distance (dec.cur, SvPVX (string));	890	: utf8_distance (dec.cur, SvPVX (string));
767	SV *uni = sv_newmortal ();	891	SV *uni = sv_newmortal ();
768		892
		893	// horrible hack to silence warning inside pv_uni_display
		894	COP cop = *PL_curcop;
		895	cop.cop_warnings = pWARN_NONE;
		896	ENTER;
		897	SAVEVPTR (PL_curcop);
		898	PL_curcop = &cop;
769	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	899	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
		900	LEAVE;
		901
770	croak ("%s, at character %d (%s)",	902	croak ("%s, at character offset %d (%s)",
771	dec.err,	903	dec.err,
772	(int)offset,	904	(int)offset,
773	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	905	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
774	}	906	}
775		907
776	sv_dump (sv);//D
777	return sv_2mortal (sv);	908	sv = sv_2mortal (sv);
		909
		910	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
		911	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
		912
		913	return sv;
778	}	914	}
779		915
780	MODULE = JSON::XS PACKAGE = JSON::XS	916	MODULE = JSON::XS PACKAGE = JSON::XS
781		917
782	BOOT:	918	BOOT:
…		…
785		921
786	memset (decode_hexdigit, 0xff, 256);	922	memset (decode_hexdigit, 0xff, 256);
787	for (i = 10; i--; )	923	for (i = 10; i--; )
788	decode_hexdigit ['0' + i] = i;	924	decode_hexdigit ['0' + i] = i;
789		925
790	for (i = 6; --i; )	926	for (i = 7; i--; )
791	{	927	{
792	decode_hexdigit ['a' + i] = 10 + i;	928	decode_hexdigit ['a' + i] = 10 + i;
793	decode_hexdigit ['A' + i] = 10 + i;	929	decode_hexdigit ['A' + i] = 10 + i;
794	}	930	}
795		931
796	json_stash = gv_stashpv ("JSON::XS", 1);	932	json_stash = gv_stashpv ("JSON::XS", 1);
797	}	933	}
		934
		935	PROTOTYPES: DISABLE
798		936
799	SV new (char dummy)	937	SV new (char dummy)
800	CODE:	938	CODE:
801	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	939	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
802	OUTPUT:	940	OUTPUT:
803	RETVAL	941	RETVAL
804		942
805	SV ascii (SV self, int enable)	943	SV ascii (SV self, int enable = 1)
806	ALIAS:	944	ALIAS:
807	ascii = F_ASCII	945	ascii = F_ASCII
808	utf8 = F_UTF8	946	utf8 = F_UTF8
809	indent = F_INDENT	947	indent = F_INDENT
810	canonical = F_CANONICAL	948	canonical = F_CANONICAL
811	space_before = F_SPACE_BEFORE	949	space_before = F_SPACE_BEFORE
812	space_after = F_SPACE_AFTER	950	space_after = F_SPACE_AFTER
813	json_rpc = F_JSON_RPC	951	json_rpc = F_JSON_RPC
		952	pretty = F_PRETTY
		953	allow_nonref = F_ALLOW_NONREF
		954	shrink = F_SHRINK
814	CODE:	955	CODE:
815	{	956	{
816	UV *uv = SvJSON (self);	957	UV *uv = SvJSON (self);
817	if (enable)	958	if (enable)
818	*uv \|= ix;	959	*uv \|= ix;
…		…
826		967
827	void encode (SV self, SV scalar)	968	void encode (SV self, SV scalar)
828	PPCODE:	969	PPCODE:
829	XPUSHs (encode_json (scalar, *SvJSON (self)));	970	XPUSHs (encode_json (scalar, *SvJSON (self)));
830		971
831	void decode (SV self, SV jsondata)	972	void decode (SV self, SV jsonstr)
832	PPCODE:	973	PPCODE:
833	XPUSHs (decode_json (jsondata, *SvJSON (self)));	974	XPUSHs (decode_json (jsonstr, *SvJSON (self)));
834		975
		976	PROTOTYPES: ENABLE
		977
		978	void to_json (SV *scalar)
		979	PPCODE:
		980	XPUSHs (encode_json (scalar, F_UTF8));
		981
		982	void from_json (SV *jsonstr)
		983	PPCODE:
		984	XPUSHs (decode_json (jsonstr, F_UTF8));
		985

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.1 by root, Thu Mar 22 16:40:16 2007 UTC vs. Revision 1.9 by root, Fri Mar 23 17:40:29 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.1 by root, Thu Mar 22 16:40:16 2007 UTC vs.
Revision 1.9 by root, Fri Mar 23 17:40:29 2007 UTC