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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs.
Revision 1.61 by root, Sun Aug 26 21:56:47 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
31	#define F_MAXDEPTH 0xf8000000UL	32	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	33	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	34	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	35	#define S_MAXSIZE 20
		36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		37
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		40
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
56	#endif	58	#endif
57		59
58	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
59	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
60		62
		63	#ifdef USE_ITHREADS
		64	# define JSON_SLOW 1
		65	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		66	#else
		67	# define JSON_SLOW 0
		68	# define JSON_STASH json_stash
		69	#endif
		70
61	static HV json_stash, json_boolean_stash; // JSON::XS::	71	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	72	static SV json_true, json_false;
63		73
		74	typedef struct {
		75	U32 flags;
		76	SV *cb_object;
		77	HV *cb_sk_object;
		78	} JSON;
		79
64	/////////////////////////////////////////////////////////////////////////////	80	/////////////////////////////////////////////////////////////////////////////
65	// utility functions	81	// utility functions
66		82
67	static UV *	83	inline void
68	SvJSON (SV *sv)
69	{
70	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
71	croak ("object is not of type JSON::XS");
72
73	return &SvUVX (SvRV (sv));
74	}
75
76	static void
77	shrink (SV *sv)	84	shrink (SV *sv)
78	{	85	{
79	sv_utf8_downgrade (sv, 1);	86	sv_utf8_downgrade (sv, 1);
80	if (SvLEN (sv) > SvCUR (sv) + 1)	87	if (SvLEN (sv) > SvCUR (sv) + 1)
81	{	88	{
…		…
116	typedef struct	123	typedef struct
117	{	124	{
118	char *cur; // SvPVX (sv) + current output position	125	char *cur; // SvPVX (sv) + current output position
119	char *end; // SvEND (sv)	126	char *end; // SvEND (sv)
120	SV *sv; // result scalar	127	SV *sv; // result scalar
121	U32 flags; // F_*	128	JSON json;
122	U32 indent; // indentation level	129	U32 indent; // indentation level
123	U32 maxdepth; // max. indentation/recursion level	130	U32 maxdepth; // max. indentation/recursion level
124	} enc_t;	131	} enc_t;
125		132
126	inline void	133	inline void
…		…
200	}	207	}
201		208
202	if (uch > 0x10FFFFUL)	209	if (uch > 0x10FFFFUL)
203	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	210	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
204		211
205	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	212	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
206	{	213	{
207	if (uch > 0xFFFFUL)	214	if (uch > 0xFFFFUL)
208	{	215	{
209	need (enc, len += 11);	216	need (enc, len += 11);
210	sprintf (enc->cur, "\\u%04x\\u%04x",	217	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
224	*enc->cur++ = hexdigit [(uch >> 0) & 15];	231	*enc->cur++ = hexdigit [(uch >> 0) & 15];
225	}	232	}
226		233
227	str += clen;	234	str += clen;
228	}	235	}
229	else if (enc->flags & F_LATIN1)	236	else if (enc->json.flags & F_LATIN1)
230	{	237	{
231	*enc->cur++ = uch;	238	*enc->cur++ = uch;
232	str += clen;	239	str += clen;
233	}	240	}
234	else if (is_utf8)	241	else if (is_utf8)
…		…
255	}	262	}
256		263
257	inline void	264	inline void
258	encode_indent (enc_t *enc)	265	encode_indent (enc_t *enc)
259	{	266	{
260	if (enc->flags & F_INDENT)	267	if (enc->json.flags & F_INDENT)
261	{	268	{
262	int spaces = enc->indent * INDENT_STEP;	269	int spaces = enc->indent * INDENT_STEP;
263		270
264	need (enc, spaces);	271	need (enc, spaces);
265	memset (enc->cur, ' ', spaces);	272	memset (enc->cur, ' ', spaces);
…		…
275	}	282	}
276		283
277	inline void	284	inline void
278	encode_nl (enc_t *enc)	285	encode_nl (enc_t *enc)
279	{	286	{
280	if (enc->flags & F_INDENT)	287	if (enc->json.flags & F_INDENT)
281	{	288	{
282	need (enc, 1);	289	need (enc, 1);
283	encode_ch (enc, '\n');	290	encode_ch (enc, '\n');
284	}	291	}
285	}	292	}
…		…
287	inline void	294	inline void
288	encode_comma (enc_t *enc)	295	encode_comma (enc_t *enc)
289	{	296	{
290	encode_ch (enc, ',');	297	encode_ch (enc, ',');
291		298
292	if (enc->flags & F_INDENT)	299	if (enc->json.flags & F_INDENT)
293	encode_nl (enc);	300	encode_nl (enc);
294	else if (enc->flags & F_SPACE_AFTER)	301	else if (enc->json.flags & F_SPACE_AFTER)
295	encode_space (enc);	302	encode_space (enc);
296	}	303	}
297		304
298	static void encode_sv (enc_t enc, SV sv);	305	static void encode_sv (enc_t enc, SV sv);
299		306
…		…
308	encode_ch (enc, '['); encode_nl (enc);	315	encode_ch (enc, '['); encode_nl (enc);
309	++enc->indent;	316	++enc->indent;
310		317
311	for (i = 0; i <= len; ++i)	318	for (i = 0; i <= len; ++i)
312	{	319	{
		320	SV **svp = av_fetch (av, i, 0);
		321
313	encode_indent (enc);	322	encode_indent (enc);
314	encode_sv (enc, *av_fetch (av, i, 0));	323
		324	if (svp)
		325	encode_sv (enc, *svp);
		326	else
		327	encode_str (enc, "null", 4, 0);
315		328
316	if (i < len)	329	if (i < len)
317	encode_comma (enc);	330	encode_comma (enc);
318	}	331	}
319		332
…		…
322	--enc->indent;	335	--enc->indent;
323	encode_indent (enc); encode_ch (enc, ']');	336	encode_indent (enc); encode_ch (enc, ']');
324	}	337	}
325		338
326	static void	339	static void
327	encode_he (enc_t enc, HE he)	340	encode_hk (enc_t enc, HE he)
328	{	341	{
329	encode_ch (enc, '"');	342	encode_ch (enc, '"');
330		343
331	if (HeKLEN (he) == HEf_SVKEY)	344	if (HeKLEN (he) == HEf_SVKEY)
332	{	345	{
…		…
342	else	355	else
343	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	356	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344		357
345	encode_ch (enc, '"');	358	encode_ch (enc, '"');
346		359
347	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	360	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348	encode_ch (enc, ':');	361	encode_ch (enc, ':');
349	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	362	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350	encode_sv (enc, HeVAL (he));
351	}	363	}
352		364
353	// compare hash entries, used when all keys are bytestrings	365	// compare hash entries, used when all keys are bytestrings
354	static int	366	static int
355	he_cmp_fast (const void a_, const void b_)	367	he_cmp_fast (const void a_, const void b_)
…		…
360	HE b = (HE **)b_;	372	HE b = (HE **)b_;
361		373
362	STRLEN la = HeKLEN (a);	374	STRLEN la = HeKLEN (a);
363	STRLEN lb = HeKLEN (b);	375	STRLEN lb = HeKLEN (b);
364		376
365	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	377	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
366	cmp = la - lb;	378	cmp = lb - la;
367		379
368	return cmp;	380	return cmp;
369	}	381	}
370		382
371	// compare hash entries, used when some keys are sv's or utf-x	383	// compare hash entries, used when some keys are sv's or utf-x
372	static int	384	static int
373	he_cmp_slow (const void a, const void b)	385	he_cmp_slow (const void a, const void b)
374	{	386	{
375	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	387	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
376	}	388	}
377		389
378	static void	390	static void
379	encode_hv (enc_t enc, HV hv)	391	encode_hv (enc_t enc, HV hv)
380	{	392	{
		393	HE *he;
381	int count, i;	394	int count;
382		395
383	if (enc->indent >= enc->maxdepth)	396	if (enc->indent >= enc->maxdepth)
384	croak ("data structure too deep (hit recursion limit)");	397	croak ("data structure too deep (hit recursion limit)");
385		398
386	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	399	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
387		400
388	if ((count = hv_iterinit (hv)))
389	{
390	// for canonical output we have to sort by keys first	401	// for canonical output we have to sort by keys first
391	// actually, this is mostly due to the stupid so-called	402	// actually, this is mostly due to the stupid so-called
392	// security workaround added somewhere in 5.8.x.	403	// security workaround added somewhere in 5.8.x.
393	// that randomises hash orderings	404	// that randomises hash orderings
394	if (enc->flags & F_CANONICAL)	405	if (enc->json.flags & F_CANONICAL)
		406	{
		407	int count = hv_iterinit (hv);
		408
		409	if (SvMAGICAL (hv))
395	{	410	{
		411	// need to count by iterating. could improve by dynamically building the vector below
		412	// but I don't care for the speed of this special case.
		413	// note also that we will run into undefined behaviour when the two iterations
		414	// do not result in the same count, something I might care for in some later release.
		415
		416	count = 0;
		417	while (hv_iternext (hv))
		418	++count;
		419
		420	hv_iterinit (hv);
		421	}
		422
		423	if (count)
		424	{
396	int fast = 1;	425	int i, fast = 1;
397	HE *he;
398	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	426	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
399	HE *hes = _alloca (count sizeof (HE));	427	HE *hes = _alloca (count sizeof (HE));
400	#else	428	#else
401	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	429	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
402	#endif	430	#endif
…		…
429		457
430	FREETMPS;	458	FREETMPS;
431	LEAVE;	459	LEAVE;
432	}	460	}
433		461
434	for (i = 0; i < count; ++i)	462	while (count--)
435	{	463	{
436	encode_indent (enc);	464	encode_indent (enc);
		465	he = hes [count];
437	encode_he (enc, hes [i]);	466	encode_hk (enc, he);
		467	encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
438		468
439	if (i < count - 1)	469	if (count)
440	encode_comma (enc);	470	encode_comma (enc);
441	}	471	}
442
443	encode_nl (enc);
444	}	472	}
		473	}
445	else	474	else
446	{	475	{
		476	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
447	HE *he = hv_iternext (hv);	477	if ((he = hv_iternext (hv)))
448
449	for (;;)	478	for (;;)
450	{	479	{
451	encode_indent (enc);	480	encode_indent (enc);
452	encode_he (enc, he);	481	encode_hk (enc, he);
		482	encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
453		483
454	if (!(he = hv_iternext (hv)))	484	if (!(he = hv_iternext (hv)))
455	break;	485	break;
456		486
457	encode_comma (enc);	487	encode_comma (enc);
458	}	488	}
		489	}
459		490
460	encode_nl (enc);	491	encode_nl (enc);
461	}
462	}
463		492
464	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	493	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
465	}	494	}
466		495
467	// encode objects, arrays and special \0=false and \1=true values.	496	// encode objects, arrays and special \0=false and \1=true values.
…		…
473	SvGETMAGIC (sv);	502	SvGETMAGIC (sv);
474	svt = SvTYPE (sv);	503	svt = SvTYPE (sv);
475		504
476	if (expect_false (SvOBJECT (sv)))	505	if (expect_false (SvOBJECT (sv)))
477	{	506	{
		507	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		508	? json_boolean_stash
		509	: gv_stashpv ("JSON::XS::Boolean", 1);
		510
478	if (SvSTASH (sv) == json_boolean_stash)	511	if (SvSTASH (sv) == stash)
479	{	512	{
480	if (SvIV (sv) == 0)	513	if (SvIV (sv))
		514	encode_str (enc, "true", 4, 0);
		515	else
481	encode_str (enc, "false", 5, 0);	516	encode_str (enc, "false", 5, 0);
482	else
483	encode_str (enc, "true", 4, 0);
484	}	517	}
485	else	518	else
486	{	519	{
487	#if 0	520	#if 0
488	if (0 && sv_derived_from (rv, "JSON::Literal"))	521	if (0 && sv_derived_from (rv, "JSON::Literal"))
489	{	522	{
490	// not yet	523	// not yet
491	}	524	}
492	#endif	525	#endif
493	if (enc->flags & F_CONV_BLESSED)	526	if (enc->json.flags & F_CONV_BLESSED)
494	{	527	{
495	// we re-bless the reference to get overload and other niceties right	528	// we re-bless the reference to get overload and other niceties right
496	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	529	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
497		530
498	if (to_json)	531	if (to_json)
499	{	532	{
500	dSP;	533	dSP;
501	ENTER;	534
502	SAVETMPS;
503	PUSHMARK (SP);	535	ENTER; SAVETMPS; PUSHMARK (SP);
504	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	536	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505		537
506	// calling with G_SCALAR ensures that we always get a 1 reutrn value	538	// calling with G_SCALAR ensures that we always get a 1 return value
507	// check anyways.
508	PUTBACK;	539	PUTBACK;
509	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	540	call_sv ((SV *)GvCV (to_json), G_SCALAR);
510	SPAGAIN;	541	SPAGAIN;
511		542
		543	// catch this surprisingly common error
		544	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		545	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		546
		547	sv = POPs;
		548	PUTBACK;
		549
512	encode_sv (enc, POPs);	550	encode_sv (enc, sv);
513		551
514	FREETMPS;	552	FREETMPS; LEAVE;
515	LEAVE;
516	}	553	}
517	else if (enc->flags & F_ALLOW_BLESSED)	554	else if (enc->json.flags & F_ALLOW_BLESSED)
518	encode_str (enc, "null", 4, 0);	555	encode_str (enc, "null", 4, 0);
519	else	556	else
520	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	557	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	558	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522	}	559	}
523	else if (enc->flags & F_ALLOW_BLESSED)	560	else if (enc->json.flags & F_ALLOW_BLESSED)
524	encode_str (enc, "null", 4, 0);	561	encode_str (enc, "null", 4, 0);
525	else	562	else
526	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	563	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	564	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528	}	565	}
…		…
531	encode_hv (enc, (HV *)sv);	568	encode_hv (enc, (HV *)sv);
532	else if (svt == SVt_PVAV)	569	else if (svt == SVt_PVAV)
533	encode_av (enc, (AV *)sv);	570	encode_av (enc, (AV *)sv);
534	else if (svt < SVt_PVAV)	571	else if (svt < SVt_PVAV)
535	{	572	{
536	if (SvNIOK (sv) && SvIV (sv) == 0)	573	STRLEN len = 0;
		574	char *pv = svt ? SvPV (sv, len) : 0;
		575
		576	if (len == 1 && *pv == '1')
		577	encode_str (enc, "true", 4, 0);
		578	else if (len == 1 && *pv == '0')
537	encode_str (enc, "false", 5, 0);	579	encode_str (enc, "false", 5, 0);
538	else if (SvNIOK (sv) && SvIV (sv) == 1)
539	encode_str (enc, "true", 4, 0);
540	else	580	else
541	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	581	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	582	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543	}	583	}
544	else	584	else
…		…
614	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	654	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615	SvPV_nolen (sv), SvFLAGS (sv));	655	SvPV_nolen (sv), SvFLAGS (sv));
616	}	656	}
617		657
618	static SV *	658	static SV *
619	encode_json (SV *scalar, U32 flags)	659	encode_json (SV scalar, JSON json)
620	{	660	{
621	enc_t enc;	661	enc_t enc;
622		662
623	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	663	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	664	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625		665
626	enc.flags = flags;	666	enc.json = *json;
627	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	667	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628	enc.cur = SvPVX (enc.sv);	668	enc.cur = SvPVX (enc.sv);
629	enc.end = SvEND (enc.sv);	669	enc.end = SvEND (enc.sv);
630	enc.indent = 0;	670	enc.indent = 0;
631	enc.maxdepth = DEC_DEPTH (flags);	671	enc.maxdepth = DEC_DEPTH (enc.json.flags);
632		672
633	SvPOK_only (enc.sv);	673	SvPOK_only (enc.sv);
634	encode_sv (&enc, scalar);	674	encode_sv (&enc, scalar);
635		675
636	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	676	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	677	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638		678
639	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	679	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
640	SvUTF8_on (enc.sv);	680	SvUTF8_on (enc.sv);
641		681
642	if (enc.flags & F_SHRINK)	682	if (enc.json.flags & F_SHRINK)
643	shrink (enc.sv);	683	shrink (enc.sv);
644		684
645	return enc.sv;	685	return enc.sv;
646	}	686	}
647		687
…		…
652	typedef struct	692	typedef struct
653	{	693	{
654	char *cur; // current parser pointer	694	char *cur; // current parser pointer
655	char *end; // end of input string	695	char *end; // end of input string
656	const char *err; // parse error, if != 0	696	const char *err; // parse error, if != 0
657	U32 flags; // F_*	697	JSON json;
658	U32 depth; // recursion depth	698	U32 depth; // recursion depth
659	U32 maxdepth; // recursion depth limit	699	U32 maxdepth; // recursion depth limit
660	} dec_t;	700	} dec_t;
661		701
662	inline void	702	inline void
…		…
925	is_nv = 1;	965	is_nv = 1;
926	}	966	}
927		967
928	if (!is_nv)	968	if (!is_nv)
929	{	969	{
		970	int len = dec->cur - start;
		971
930	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	972	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
931	if (*start == '-')	973	if (*start == '-')
932	switch (dec->cur - start)	974	switch (len)
933	{	975	{
934	case 2: return newSViv (-( start [1] - '0' * 1));	976	case 2: return newSViv (-( start [1] - '0' * 1));
935	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	977	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
936	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	978	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
937	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	979	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
938	}	980	}
939	else	981	else
940	switch (dec->cur - start)	982	switch (len)
941	{	983	{
942	case 1: return newSViv ( start [0] - '0' * 1);	984	case 1: return newSViv ( start [0] - '0' * 1);
943	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	985	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
944	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	986	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
945	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	987	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
946	}	988	}
947		989
948	{	990	{
949	UV uv;	991	UV uv;
950	int numtype = grok_number (start, dec->cur - start, &uv);	992	int numtype = grok_number (start, len, &uv);
951	if (numtype & IS_NUMBER_IN_UV)	993	if (numtype & IS_NUMBER_IN_UV)
952	if (numtype & IS_NUMBER_NEG)	994	if (numtype & IS_NUMBER_NEG)
953	{	995	{
954	if (uv < (UV)IV_MIN)	996	if (uv < (UV)IV_MIN)
955	return newSViv (-(IV)uv);	997	return newSViv (-(IV)uv);
956	}	998	}
957	else	999	else
958	return newSVuv (uv);	1000	return newSVuv (uv);
959
960	// here would likely be the place for bigint support
961	}	1001	}
962	}
963		1002
964	// if we ever support bigint or bigfloat, this is the place for bigfloat	1003	len -= *start == '-' ? 1 : 0;
		1004
		1005	// does not fit into IV or UV, try NV
		1006	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1007	#if defined (LDBL_DIG)
		1008	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1009	#endif
		1010	)
		1011	// fits into NV without loss of precision
		1012	return newSVnv (Atof (start));
		1013
		1014	// everything else fails, convert it to a string
		1015	return newSVpvn (start, dec->cur - start);
		1016	}
		1017
		1018	// loss of precision here
965	return newSVnv (Atof (start));	1019	return newSVnv (Atof (start));
966		1020
967	fail:	1021	fail:
968	return 0;	1022	return 0;
969	}	1023	}
…		…
1013	}	1067	}
1014		1068
1015	static SV *	1069	static SV *
1016	decode_hv (dec_t *dec)	1070	decode_hv (dec_t *dec)
1017	{	1071	{
		1072	SV *sv;
1018	HV *hv = newHV ();	1073	HV *hv = newHV ();
1019		1074
1020	DEC_INC_DEPTH;	1075	DEC_INC_DEPTH;
1021	decode_ws (dec);	1076	decode_ws (dec);
1022		1077
…		…
1026	for (;;)	1081	for (;;)
1027	{	1082	{
1028	decode_ws (dec); EXPECT_CH ('"');	1083	decode_ws (dec); EXPECT_CH ('"');
1029		1084
1030	// heuristic: assume that	1085	// heuristic: assume that
1031	// a) decode_str + hv_store_ent are abysmally slow	1086	// a) decode_str + hv_store_ent are abysmally slow.
1032	// b) most hash keys are short, simple ascii text	1087	// b) most hash keys are short, simple ascii text.
1033	// so try to "fast-match" such strings to avoid	1088	// => try to "fast-match" such strings to avoid
1034	// the overhead of hv_store_ent.	1089	// the overhead of decode_str + hv_store_ent.
1035	{	1090	{
1036	SV *value;	1091	SV *value;
1037	char *p = dec->cur;	1092	char *p = dec->cur;
1038	char *e = p + 24; // only try up to 24 bytes	1093	char *e = p + 24; // only try up to 24 bytes
1039		1094
1040	for (;;)	1095	for (;;)
1041	{	1096	{
		1097	// the >= 0x80 is true on most architectures
1042	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1098	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1043	{	1099	{
1044	// slow path, back up and use decode_str	1100	// slow path, back up and use decode_str
1045	SV *key = decode_str (dec);	1101	SV *key = decode_str (dec);
1046	if (!key)	1102	if (!key)
…		…
1095		1151
1096	++dec->cur;	1152	++dec->cur;
1097	}	1153	}
1098		1154
1099	DEC_DEC_DEPTH;	1155	DEC_DEC_DEPTH;
1100	return newRV_noinc ((SV *)hv);	1156	sv = newRV_noinc ((SV *)hv);
		1157
		1158	// check filter callbacks
		1159	if (dec->json.flags & F_HOOK)
		1160	{
		1161	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1162	{
		1163	HE cb, he;
		1164
		1165	hv_iterinit (hv);
		1166	he = hv_iternext (hv);
		1167	hv_iterinit (hv);
		1168
		1169	// the next line creates a mortal sv each time its called.
		1170	// might want to optimise this for common cases.
		1171	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1172
		1173	if (cb)
		1174	{
		1175	dSP;
		1176	int count;
		1177
		1178	ENTER; SAVETMPS; PUSHMARK (SP);
		1179	XPUSHs (HeVAL (he));
		1180
		1181	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1182
		1183	if (count == 1)
		1184	{
		1185	sv = newSVsv (POPs);
		1186	FREETMPS; LEAVE;
		1187	return sv;
		1188	}
		1189
		1190	FREETMPS; LEAVE;
		1191	}
		1192	}
		1193
		1194	if (dec->json.cb_object)
		1195	{
		1196	dSP;
		1197	int count;
		1198
		1199	ENTER; SAVETMPS; PUSHMARK (SP);
		1200	XPUSHs (sv_2mortal (sv));
		1201
		1202	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1203
		1204	if (count == 1)
		1205	{
		1206	sv = newSVsv (POPs);
		1207	FREETMPS; LEAVE;
		1208	return sv;
		1209	}
		1210
		1211	SvREFCNT_inc (sv);
		1212	FREETMPS; LEAVE;
		1213	}
		1214	}
		1215
		1216	return sv;
1101		1217
1102	fail:	1218	fail:
1103	SvREFCNT_dec (hv);	1219	SvREFCNT_dec (hv);
1104	DEC_DEC_DEPTH;	1220	DEC_DEC_DEPTH;
1105	return 0;	1221	return 0;
…		…
1125		1241
1126	case 't':	1242	case 't':
1127	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1243	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1128	{	1244	{
1129	dec->cur += 4;	1245	dec->cur += 4;
		1246	#if JSON_SLOW
		1247	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1248	#endif
1130	return SvREFCNT_inc (json_true);	1249	return SvREFCNT_inc (json_true);
1131	}	1250	}
1132	else	1251	else
1133	ERR ("'true' expected");	1252	ERR ("'true' expected");
1134		1253
…		…
1136		1255
1137	case 'f':	1256	case 'f':
1138	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1257	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1139	{	1258	{
1140	dec->cur += 5;	1259	dec->cur += 5;
		1260	#if JSON_SLOW
		1261	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1262	#endif
1141	return SvREFCNT_inc (json_false);	1263	return SvREFCNT_inc (json_false);
1142	}	1264	}
1143	else	1265	else
1144	ERR ("'false' expected");	1266	ERR ("'false' expected");
1145		1267
…		…
1164	fail:	1286	fail:
1165	return 0;	1287	return 0;
1166	}	1288	}
1167		1289
1168	static SV *	1290	static SV *
1169	decode_json (SV string, U32 flags, UV offset_return)	1291	decode_json (SV string, JSON json, UV *offset_return)
1170	{	1292	{
1171	dec_t dec;	1293	dec_t dec;
1172	UV offset;	1294	UV offset;
1173	SV *sv;	1295	SV *sv;
1174		1296
1175	SvGETMAGIC (string);	1297	SvGETMAGIC (string);
1176	SvUPGRADE (string, SVt_PV);	1298	SvUPGRADE (string, SVt_PV);
1177		1299
1178	if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))	1300	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1179	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1301	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1180	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));	1302	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1181		1303
1182	if (flags & F_UTF8)	1304	if (json->flags & F_UTF8)
1183	sv_utf8_downgrade (string, 0);	1305	sv_utf8_downgrade (string, 0);
1184	else	1306	else
1185	sv_utf8_upgrade (string);	1307	sv_utf8_upgrade (string);
1186		1308
1187	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1309	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1188		1310
1189	dec.flags = flags;	1311	dec.json = *json;
1190	dec.cur = SvPVX (string);	1312	dec.cur = SvPVX (string);
1191	dec.end = SvEND (string);	1313	dec.end = SvEND (string);
1192	dec.err = 0;	1314	dec.err = 0;
1193	dec.depth = 0;	1315	dec.depth = 0;
1194	dec.maxdepth = DEC_DEPTH (dec.flags);	1316	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1317
		1318	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1319	dec.json.flags \|= F_HOOK;
1195		1320
1196	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1321	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1197	sv = decode_sv (&dec);	1322	sv = decode_sv (&dec);
1198		1323
1199	if (!(offset_return \|\| !sv))	1324	if (!(offset_return \|\| !sv))
…		…
1209	}	1334	}
1210	}	1335	}
1211		1336
1212	if (offset_return \|\| !sv)	1337	if (offset_return \|\| !sv)
1213	{	1338	{
1214	offset = dec.flags & F_UTF8	1339	offset = dec.json.flags & F_UTF8
1215	? dec.cur - SvPVX (string)	1340	? dec.cur - SvPVX (string)
1216	: utf8_distance (dec.cur, SvPVX (string));	1341	: utf8_distance (dec.cur, SvPVX (string));
1217		1342
1218	if (offset_return)	1343	if (offset_return)
1219	*offset_return = offset;	1344	*offset_return = offset;
…		…
1238	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1363	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1239	}	1364	}
1240		1365
1241	sv = sv_2mortal (sv);	1366	sv = sv_2mortal (sv);
1242		1367
1243	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1368	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1244	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1369	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1245		1370
1246	return sv;	1371	return sv;
1247	}	1372	}
1248		1373
…		…
1269	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1394	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1270	}	1395	}
1271		1396
1272	PROTOTYPES: DISABLE	1397	PROTOTYPES: DISABLE
1273		1398
1274	SV new (char dummy)	1399	void CLONE (...)
1275	CODE:	1400	CODE:
1276	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1401	json_stash = 0;
1277	OUTPUT:	1402	json_boolean_stash = 0;
1278	RETVAL
1279		1403
		1404	void new (char *klass)
		1405	PPCODE:
		1406	{
		1407	SV *pv = NEWSV (0, sizeof (JSON));
		1408	SvPOK_only (pv);
		1409	Zero (SvPVX (pv), 1, JSON);
		1410	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1411	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
		1412	}
		1413
1280	SV ascii (SV self, int enable = 1)	1414	void ascii (JSON *self, int enable = 1)
1281	ALIAS:	1415	ALIAS:
1282	ascii = F_ASCII	1416	ascii = F_ASCII
1283	latin1 = F_LATIN1	1417	latin1 = F_LATIN1
1284	utf8 = F_UTF8	1418	utf8 = F_UTF8
1285	indent = F_INDENT	1419	indent = F_INDENT
…		…
1289	pretty = F_PRETTY	1423	pretty = F_PRETTY
1290	allow_nonref = F_ALLOW_NONREF	1424	allow_nonref = F_ALLOW_NONREF
1291	shrink = F_SHRINK	1425	shrink = F_SHRINK
1292	allow_blessed = F_ALLOW_BLESSED	1426	allow_blessed = F_ALLOW_BLESSED
1293	convert_blessed = F_CONV_BLESSED	1427	convert_blessed = F_CONV_BLESSED
1294	CODE:	1428	PPCODE:
1295	{	1429	{
1296	UV *uv = SvJSON (self);
1297	if (enable)	1430	if (enable)
1298	*uv \|= ix;	1431	self->flags \|= ix;
1299	else	1432	else
1300	*uv &= ~ix;	1433	self->flags &= ~ix;
1301		1434
1302	RETVAL = newSVsv (self);	1435	XPUSHs (ST (0));
1303	}	1436	}
1304	OUTPUT:
1305	RETVAL
1306		1437
1307	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1438	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1308	CODE:	1439	PPCODE:
1309	{	1440	{
1310	UV *uv = SvJSON (self);
1311	UV log2 = 0;	1441	UV log2 = 0;
1312		1442
1313	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1443	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1314		1444
1315	while ((1UL << log2) < max_depth)	1445	while ((1UL << log2) < max_depth)
1316	++log2;	1446	++log2;
1317		1447
1318	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1448	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1319		1449
1320	RETVAL = newSVsv (self);	1450	XPUSHs (ST (0));
1321	}	1451	}
1322	OUTPUT:
1323	RETVAL
1324		1452
1325	SV max_size (SV self, UV max_size = 0)	1453	void max_size (JSON *self, UV max_size = 0)
1326	CODE:	1454	PPCODE:
1327	{	1455	{
1328	UV *uv = SvJSON (self);
1329	UV log2 = 0;	1456	UV log2 = 0;
1330		1457
1331	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1458	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332	if (max_size == 1) max_size = 2;	1459	if (max_size == 1) max_size = 2;
1333		1460
1334	while ((1UL << log2) < max_size)	1461	while ((1UL << log2) < max_size)
1335	++log2;	1462	++log2;
1336		1463
1337	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1464	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1338		1465
1339	RETVAL = newSVsv (self);	1466	XPUSHs (ST (0));
1340	}	1467	}
1341	OUTPUT:
1342	RETVAL
1343		1468
1344	void encode (SV self, SV scalar)	1469	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1345	PPCODE:	1470	PPCODE:
1346	XPUSHs (encode_json (scalar, *SvJSON (self)));	1471	{
		1472	SvREFCNT_dec (self->cb_object);
		1473	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1347		1474
1348	void decode (SV self, SV jsonstr)	1475	XPUSHs (ST (0));
		1476	}
		1477
		1478	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1349	PPCODE:	1479	PPCODE:
		1480	{
		1481	if (!self->cb_sk_object)
		1482	self->cb_sk_object = newHV ();
		1483
		1484	if (SvOK (cb))
		1485	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1486	else
		1487	{
		1488	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1489
		1490	if (!HvKEYS (self->cb_sk_object))
		1491	{
		1492	SvREFCNT_dec (self->cb_sk_object);
		1493	self->cb_sk_object = 0;
		1494	}
		1495	}
		1496
		1497	XPUSHs (ST (0));
		1498	}
		1499
		1500	void encode (JSON self, SV scalar)
		1501	PPCODE:
		1502	XPUSHs (encode_json (scalar, self));
		1503
		1504	void decode (JSON self, SV jsonstr)
		1505	PPCODE:
1350	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1506	XPUSHs (decode_json (jsonstr, self, 0));
1351		1507
1352	void decode_prefix (SV self, SV jsonstr)	1508	void decode_prefix (JSON self, SV jsonstr)
1353	PPCODE:	1509	PPCODE:
1354	{	1510	{
1355	UV offset;	1511	UV offset;
1356	EXTEND (SP, 2);	1512	EXTEND (SP, 2);
1357	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1513	PUSHs (decode_json (jsonstr, self, &offset));
1358	PUSHs (sv_2mortal (newSVuv (offset)));	1514	PUSHs (sv_2mortal (newSVuv (offset)));
1359	}	1515	}
1360		1516
		1517	void DESTROY (JSON *self)
		1518	CODE:
		1519	SvREFCNT_dec (self->cb_sk_object);
		1520	SvREFCNT_dec (self->cb_object);
		1521
1361	PROTOTYPES: ENABLE	1522	PROTOTYPES: ENABLE
1362		1523
1363	void to_json (SV *scalar)	1524	void to_json (SV *scalar)
1364	ALIAS:
1365	objToJson = 0
1366	PPCODE:	1525	PPCODE:
		1526	{
		1527	JSON json = { F_DEFAULT \| F_UTF8 };
1367	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1528	XPUSHs (encode_json (scalar, &json));
		1529	}
1368		1530
1369	void from_json (SV *jsonstr)	1531	void from_json (SV *jsonstr)
1370	ALIAS:
1371	jsonToObj = 0
1372	PPCODE:	1532	PPCODE:
		1533	{
		1534	JSON json = { F_DEFAULT \| F_UTF8 };
1373	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1535	XPUSHs (decode_json (jsonstr, &json, 0));
		1536	}
1374		1537

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs. Revision 1.61 by root, Sun Aug 26 21:56:47 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs.
Revision 1.61 by root, Sun Aug 26 21:56:47 2007 UTC