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

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.45 by root, Mon Jun 25 06:57:42 2007 UTC vs. Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.45 by root, Mon Jun 25 06:57:42 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC