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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC

…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	20	#endif
21	#ifndef HvNAMEUTF8	21	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	22	# define HvNAMEUTF8(hv) 0
23	#endif	23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
24		27
25	// known tags	28	// known tags
26	enum cbor_tag	29	enum cbor_tag
27	{	30	{
28	// inofficial extensions (pending iana registration)	31	// extensions
		32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object	33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object	34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing	35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing	36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref	37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
34	CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection	38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36		39
37	// rfc7049	40	// rfc7049
38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
…		…
54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55		58
56	CBOR_TAG_MAGIC = 55799 // self-describe cbor	59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
57	};	60	};
58		61
59	#define F_SHRINK 0x00000001UL	62	#define F_SHRINK 0x00000001UL
60	#define F_ALLOW_UNKNOWN 0x00000002UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
61	#define F_ALLOW_SHARING 0x00000004UL //TODO	64	#define F_ALLOW_SHARING 0x00000004UL
62	#define F_DEDUP_STRINGS 0x00000008UL //TODO	65	#define F_PACK_STRINGS 0x00000008UL
63	#define F_DEDUP_KEYS 0x00000010UL //TODO
64		66
65	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
66		68
67	#define SB do {	69	#define SB do {
68	#define SE } while (0)	70	#define SE } while (0)
…		…
80	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
81	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
82	#endif	84	#endif
83		85
84	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
85	static SV types_true, types_false, types_error, sv_cbor;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
86		88
87	typedef struct {	89	typedef struct {
88	U32 flags;	90	U32 flags;
89	U32 max_depth;	91	U32 max_depth;
90	STRLEN max_size;	92	STRLEN max_size;
		93	SV *filter;
91	} CBOR;	94	} CBOR;
92		95
93	ecb_inline void	96	ecb_inline void
94	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
95	{	98	{
96	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
97	cbor->max_depth = 512;	100	cbor->max_depth = 512;
		101	}
		102
		103	ecb_inline void
		104	cbor_free (CBOR *cbor)
		105	{
		106	SvREFCNT_dec (cbor->filter);
98	}	107	}
99		108
100	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
101	// utility functions	110	// utility functions
102		111
…		…
124	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
125	#endif	134	#endif
126	}	135	}
127	}	136	}
128		137
		138	// minimum length of a string to be registered for stringref
		139	ecb_inline int
		140	minimum_string_length (UV idx)
		141	{
		142	return idx > 23
		143	? idx > 0xffU
		144	? idx > 0xffffU
		145	? idx > 0xffffffffU
		146	? 11
		147	: 7
		148	: 5
		149	: 4
		150	: 3;
		151	}
		152
129	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
130	// encoder	154	// encoder
131		155
132	// structure used for encoding CBOR	156	// structure used for encoding CBOR
133	typedef struct	157	typedef struct
…		…
135	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
136	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
137	SV *sv; // result scalar	161	SV *sv; // result scalar
138	CBOR cbor;	162	CBOR cbor;
139	U32 depth; // recursion level	163	U32 depth; // recursion level
140	HV *stringref; // string => index, or 0	164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
141	HV *shareable; // ptr => index, or 0	166	HV *shareable; // ptr => index, or 0
142	UV shareable_idx;	167	UV shareable_idx;
143	} enc_t;	168	} enc_t;
144		169
145	ecb_inline void	170	ecb_inline void
…		…
164	static void	189	static void
165	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
166	{	191	{
167	need (enc, 9);	192	need (enc, 9);
168		193
169	if (len < 24)	194	if (ecb_expect_true (len < 24))
170	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
171	else if (len <= 0xff)	196	else if (ecb_expect_true (len <= 0xff))
172	{	197	{
173	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
174	*enc->cur++ = len;	199	*enc->cur++ = len;
175	}	200	}
176	else if (len <= 0xffff)	201	else if (len <= 0xffff)
…		…
199	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
200	*enc->cur++ = len;	225	*enc->cur++ = len;
201	}	226	}
202	}	227	}
203		228
204	static void	229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
		235	ecb_inline void
205	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
206	{	237	{
207	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
208	need (enc, len);	239	need (enc, len);
209	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
210	enc->cur += len;	241	enc->cur += len;
211	}	242	}
212		243
213	ecb_inline void	244	static void
214	encode_tag (enc_t *enc, UV tag)	245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
215	{	246	{
216	encode_uint (enc, 0xc0, tag);	247	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		248	{
		249	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		250
		251	if (SvOK (*svp))
		252	{
		253	// already registered, use stringref
		254	encode_tag (enc, CBOR_TAG_STRINGREF);
		255	encode_uint (enc, 0x00, SvUV (*svp));
		256	return;
		257	}
		258	else if (len >= minimum_string_length (enc->stringref_idx))
		259	{
		260	// register only
		261	sv_setuv (*svp, enc->stringref_idx);
		262	++enc->stringref_idx;
		263	}
		264	}
		265
		266	encode_str (enc, utf8, str, len);
217	}	267	}
218		268
219	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
220		270
221	static void	271	static void
…		…
260	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
261	{	311	{
262	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
263	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
264	else	314	else
265	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
266		316
267	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
268	}	318	}
269		319
270	if (mg)	320	if (mg)
…		…
276	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
277	static void	327	static void
278	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
279	{	329	{
280	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
281
282	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
283	&& ecb_expect_false (SvREFCNT (sv) > 1))
284	{
285	if (!enc->shareable)
286	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
287
288	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
289
290	if (SvOK (*svp))
291	{
292	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
293	encode_uint (enc, 0x00, SvUV (*svp));
294	return;
295	}
296	else
297	{
298	sv_setuv (*svp, enc->shareable_idx);
299	++enc->shareable_idx;
300	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
301	}
302	}
303		331
304	svtype svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
305		333
306	if (ecb_expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
307	{	335	{
…		…
371	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	399	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
372	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	400	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
373		401
374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	402	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
375	encode_uint (enc, 0x80, count + 1);	403	encode_uint (enc, 0x80, count + 1);
376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	404	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
377		405
378	while (count)	406	while (count)
379	encode_sv (enc, SP[1 - count--]);	407	encode_sv (enc, SP[1 - count--]);
380		408
381	PUTBACK;	409	PUTBACK;
…		…
390	encode_hv (enc, (HV *)sv);	418	encode_hv (enc, (HV *)sv);
391	else if (svt == SVt_PVAV)	419	else if (svt == SVt_PVAV)
392	encode_av (enc, (AV *)sv);	420	encode_av (enc, (AV *)sv);
393	else	421	else
394	{	422	{
		423	if (ecb_expect_false (SvREFCNT (sv) > 1)
		424	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		425	{
		426	if (!enc->shareable)
		427	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		428
		429	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		430
		431	if (SvOK (*svp))
		432	{
		433	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		434	encode_uint (enc, 0x00, SvUV (*svp));
		435	return;
		436	}
		437	else
		438	{
		439	sv_setuv (*svp, enc->shareable_idx);
		440	++enc->shareable_idx;
		441	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		442	}
		443	}
		444
395	encode_tag (enc, CBOR_TAG_INDIRECTION);	445	encode_tag (enc, CBOR_TAG_INDIRECTION);
396	encode_sv (enc, sv);	446	encode_sv (enc, sv);
397	}	447	}
398	}	448	}
399		449
…		…
440		490
441	if (SvPOKp (sv))	491	if (SvPOKp (sv))
442	{	492	{
443	STRLEN len;	493	STRLEN len;
444	char *str = SvPV (sv, len);	494	char *str = SvPV (sv, len);
445	encode_str (enc, SvUTF8 (sv), str, len);	495	encode_strref (enc, SvUTF8 (sv), str, len);
446	}	496	}
447	else if (SvNOKp (sv))	497	else if (SvNOKp (sv))
448	encode_nv (enc, sv);	498	encode_nv (enc, sv);
449	else if (SvIOKp (sv))	499	else if (SvIOKp (sv))
450	{	500	{
…		…
475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	525	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
476	enc.cur = SvPVX (enc.sv);	526	enc.cur = SvPVX (enc.sv);
477	enc.end = SvEND (enc.sv);	527	enc.end = SvEND (enc.sv);
478		528
479	SvPOK_only (enc.sv);	529	SvPOK_only (enc.sv);
		530
		531	if (cbor->flags & F_PACK_STRINGS)
		532	{
		533	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		534	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		535	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		536	}
		537
480	encode_sv (&enc, scalar);	538	encode_sv (&enc, scalar);
481		539
482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	540	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
483	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	541	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
484		542
…		…
499	const char *err; // parse error, if != 0	557	const char *err; // parse error, if != 0
500	CBOR cbor;	558	CBOR cbor;
501	U32 depth; // recursion depth	559	U32 depth; // recursion depth
502	U32 maxdepth; // recursion depth limit	560	U32 maxdepth; // recursion depth limit
503	AV *shareable;	561	AV *shareable;
		562	AV *stringref;
		563	SV *decode_tagged;
504	} dec_t;	564	} dec_t;
505		565
506	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	566	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
507		567
508	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	568	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
606		666
607	static void	667	static void
608	decode_he (dec_t dec, HV hv)	668	decode_he (dec_t dec, HV hv)
609	{	669	{
610	// for speed reasons, we specialcase single-string	670	// for speed reasons, we specialcase single-string
611	// byte or utf-8 strings as keys.	671	// byte or utf-8 strings as keys, but only when !stringref
612		672
		673	if (ecb_expect_true (!dec->stringref))
613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	674	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
614	{	675	{
615	I32 len = decode_uint (dec);	676	I32 len = decode_uint (dec);
616	char key = (char )dec->cur;	677	char key = (char )dec->cur;
617		678
618	dec->cur += len;	679	dec->cur += len;
619		680
		681	if (ecb_expect_false (dec->stringref))
		682	av_push (dec->stringref, newSVpvn (key, len));
		683
620	hv_store (hv, key, len, decode_sv (dec), 0);	684	hv_store (hv, key, len, decode_sv (dec), 0);
		685
		686	return;
621	}	687	}
622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	688	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
623	{	689	{
624	I32 len = decode_uint (dec);	690	I32 len = decode_uint (dec);
625	char key = (char )dec->cur;	691	char key = (char )dec->cur;
626		692
627	dec->cur += len;	693	dec->cur += len;
628		694
		695	if (ecb_expect_false (dec->stringref))
		696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		697
629	hv_store (hv, key, -len, decode_sv (dec), 0);	698	hv_store (hv, key, -len, decode_sv (dec), 0);
		699
		700	return;
630	}	701	}
631	else	702
632	{
633	SV *k = decode_sv (dec);	703	SV *k = decode_sv (dec);
634	SV *v = decode_sv (dec);	704	SV *v = decode_sv (dec);
635		705
636	hv_store_ent (hv, k, v, 0);	706	hv_store_ent (hv, k, v, 0);
637	SvREFCNT_dec (k);	707	SvREFCNT_dec (k);
638	}
639	}	708	}
640		709
641	static SV *	710	static SV *
642	decode_hv (dec_t *dec)	711	decode_hv (dec_t *dec)
643	{	712	{
…		…
684	{	753	{
685	SV *sv = 0;	754	SV *sv = 0;
686		755
687	if ((*dec->cur & 31) == 31)	756	if ((*dec->cur & 31) == 31)
688	{	757	{
		758	// indefinite length strings
689	++dec->cur;	759	++dec->cur;
690		760
		761	unsigned char major = *dec->cur & 0xe0;
		762
691	sv = newSVpvn ("", 0);	763	sv = newSVpvn ("", 0);
692		764
693	// not very fast, and certainly not robust against illegal input
694	for (;;)	765	for (;;)
695	{	766	{
696	WANT (1);	767	WANT (1);
697		768
		769	if ((*dec->cur ^ major) >= 31)
698	if (*dec->cur == (0xe0 \| 31))	770	if (*dec->cur == (0xe0 \| 31))
699	{	771	{
700	++dec->cur;	772	++dec->cur;
701	break;	773	break;
702	}	774	}
		775	else
		776	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
703		777
704	sv_catsv (sv, decode_sv (dec));	778	STRLEN len = decode_uint (dec);
		779
		780	WANT (len);
		781	sv_catpvn (sv, dec->cur, len);
		782	dec->cur += len;
705	}	783	}
706	}	784	}
707	else	785	else
708	{	786	{
709	STRLEN len = decode_uint (dec);	787	STRLEN len = decode_uint (dec);
710		788
711	WANT (len);	789	WANT (len);
712	sv = newSVpvn (dec->cur, len);	790	sv = newSVpvn (dec->cur, len);
713	dec->cur += len;	791	dec->cur += len;
		792
		793	if (ecb_expect_false (dec->stringref)
		794	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		795	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
714	}	796	}
715		797
716	if (utf8)	798	if (utf8)
717	SvUTF8_on (sv);	799	SvUTF8_on (sv);
718		800
…		…
732	WANT (1);	814	WANT (1);
733		815
734	switch (tag)	816	switch (tag)
735	{	817	{
736	case CBOR_TAG_MAGIC:	818	case CBOR_TAG_MAGIC:
737	return decode_sv (dec);	819	sv = decode_sv (dec);
		820	break;
738		821
739	case CBOR_TAG_INDIRECTION:	822	case CBOR_TAG_INDIRECTION:
740	return newRV_noinc (decode_sv (dec));	823	sv = newRV_noinc (decode_sv (dec));
		824	break;
		825
		826	case CBOR_TAG_STRINGREF_NAMESPACE:
		827	{
		828	ENTER; SAVETMPS;
		829
		830	SAVESPTR (dec->stringref);
		831	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		832
		833	sv = decode_sv (dec);
		834
		835	FREETMPS; LEAVE;
		836	}
		837	break;
		838
		839	case CBOR_TAG_STRINGREF:
		840	{
		841	if ((*dec->cur >> 5) != 0)
		842	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		843
		844	UV idx = decode_uint (dec);
		845
		846	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		847	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		848
		849	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		850	}
		851	break;
741		852
742	case CBOR_TAG_VALUE_SHAREABLE:	853	case CBOR_TAG_VALUE_SHAREABLE:
743	{	854	{
744	if (ecb_expect_false (!dec->shareable))	855	if (ecb_expect_false (!dec->shareable))
745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	856	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
…		…
749		860
750	SV *osv = decode_sv (dec);	861	SV *osv = decode_sv (dec);
751	sv_setsv (sv, osv);	862	sv_setsv (sv, osv);
752	SvREFCNT_dec_NN (osv);	863	SvREFCNT_dec_NN (osv);
753	}	864	}
754		865	break;
755	return sv;
756		866
757	case CBOR_TAG_VALUE_SHAREDREF:	867	case CBOR_TAG_VALUE_SHAREDREF:
758	{	868	{
759	if ((*dec->cur >> 5) != 0)	869	if ((*dec->cur >> 5) != 0)
760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	870	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
761		871
762	UV idx = decode_uint (dec);	872	UV idx = decode_uint (dec);
763		873
764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))	874	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
765	ERR ("corrupted CBOR data (sharedref index out of bounds)");	875	ERR ("corrupted CBOR data (sharedref index out of bounds)");
766		876
767	return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	877	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
768	}	878	}
		879	break;
769		880
770	case CBOR_TAG_PERL_OBJECT:	881	case CBOR_TAG_PERL_OBJECT:
771	{	882	{
772	sv = decode_sv (dec);	883	sv = decode_sv (dec);
773		884
…		…
813	sv = SvREFCNT_inc (POPs);	924	sv = SvREFCNT_inc (POPs);
814		925
815	PUTBACK;	926	PUTBACK;
816		927
817	FREETMPS; LEAVE;	928	FREETMPS; LEAVE;
818
819	return sv;
820	}	929	}
		930	break;
821		931
822	default:	932	default:
823	{	933	{
824	sv = decode_sv (dec);	934	sv = decode_sv (dec);
825		935
		936	dSP;
		937	ENTER; SAVETMPS; PUSHMARK (SP);
		938	EXTEND (SP, 2);
		939	PUSHs (newSVuv (tag));
		940	PUSHs (sv);
		941
		942	PUTBACK;
		943	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		944	SPAGAIN;
		945
		946	if (SvTRUE (ERRSV))
		947	{
		948	FREETMPS; LEAVE;
		949	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		950	}
		951
		952	if (count)
		953	{
		954	SvREFCNT_dec (sv);
		955	sv = SvREFCNT_inc (POPs);
		956	}
		957	else
		958	{
826	AV *av = newAV ();	959	AV *av = newAV ();
827	av_push (av, newSVuv (tag));	960	av_push (av, newSVuv (tag));
828	av_push (av, sv);	961	av_push (av, sv);
829		962
830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	963	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
831	? cbor_tagged_stash	964	? cbor_tagged_stash
832	: gv_stashpv ("CBOR::XS::Tagged" , 1);	965	: gv_stashpv ("CBOR::XS::Tagged" , 1);
833
834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	966	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
835	}	967	}
		968
		969	PUTBACK;
		970
		971	FREETMPS; LEAVE;
		972	}
		973	break;
836	}	974	}
		975
		976	return sv;
837		977
838	fail:	978	fail:
839	SvREFCNT_dec (sv);	979	SvREFCNT_dec (sv);
840	return &PL_sv_undef;	980	return &PL_sv_undef;
841	}	981	}
…		…
982		1122
983	types_true = get_bool ("Types::Serialiser::true" );	1123	types_true = get_bool ("Types::Serialiser::true" );
984	types_false = get_bool ("Types::Serialiser::false");	1124	types_false = get_bool ("Types::Serialiser::false");
985	types_error = get_bool ("Types::Serialiser::error");	1125	types_error = get_bool ("Types::Serialiser::error");
986		1126
		1127	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1128
987	sv_cbor = newSVpv ("CBOR", 0);	1129	sv_cbor = newSVpv ("CBOR", 0);
988	SvREADONLY_on (sv_cbor);	1130	SvREADONLY_on (sv_cbor);
989	}	1131	}
990		1132
991	PROTOTYPES: DISABLE	1133	PROTOTYPES: DISABLE
…		…
1012	void shrink (CBOR *self, int enable = 1)	1154	void shrink (CBOR *self, int enable = 1)
1013	ALIAS:	1155	ALIAS:
1014	shrink = F_SHRINK	1156	shrink = F_SHRINK
1015	allow_unknown = F_ALLOW_UNKNOWN	1157	allow_unknown = F_ALLOW_UNKNOWN
1016	allow_sharing = F_ALLOW_SHARING	1158	allow_sharing = F_ALLOW_SHARING
1017	dedup_keys = F_DEDUP_KEYS
1018	dedup_strings = F_DEDUP_STRINGS	1159	pack_strings = F_PACK_STRINGS
1019	PPCODE:	1160	PPCODE:
1020	{	1161	{
1021	if (enable)	1162	if (enable)
1022	self->flags \|= ix;	1163	self->flags \|= ix;
1023	else	1164	else
…		…
1029	void get_shrink (CBOR *self)	1170	void get_shrink (CBOR *self)
1030	ALIAS:	1171	ALIAS:
1031	get_shrink = F_SHRINK	1172	get_shrink = F_SHRINK
1032	get_allow_unknown = F_ALLOW_UNKNOWN	1173	get_allow_unknown = F_ALLOW_UNKNOWN
1033	get_allow_sharing = F_ALLOW_SHARING	1174	get_allow_sharing = F_ALLOW_SHARING
1034	get_dedup_keys = F_DEDUP_KEYS
1035	get_dedup_strings = F_DEDUP_STRINGS	1175	get_pack_strings = F_PACK_STRINGS
1036	PPCODE:	1176	PPCODE:
1037	XPUSHs (boolSV (self->flags & ix));	1177	XPUSHs (boolSV (self->flags & ix));
1038		1178
1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1179	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1040	PPCODE:	1180	PPCODE:
…		…
1053	XPUSHs (ST (0));	1193	XPUSHs (ST (0));
1054		1194
1055	int get_max_size (CBOR *self)	1195	int get_max_size (CBOR *self)
1056	CODE:	1196	CODE:
1057	RETVAL = self->max_size;	1197	RETVAL = self->max_size;
		1198	OUTPUT:
		1199	RETVAL
		1200
		1201	void filter (CBOR self, SV filter = 0)
		1202	PPCODE:
		1203	SvREFCNT_dec (self->filter);
		1204	self->filter = filter ? newSVsv (filter) : filter;
		1205	XPUSHs (ST (0));
		1206
		1207	SV get_filter (CBOR self)
		1208	CODE:
		1209	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1058	OUTPUT:	1210	OUTPUT:
1059	RETVAL	1211	RETVAL
1060		1212
1061	void encode (CBOR self, SV scalar)	1213	void encode (CBOR self, SV scalar)
1062	PPCODE:	1214	PPCODE:
…		…
1077	EXTEND (SP, 2);	1229	EXTEND (SP, 2);
1078	PUSHs (sv);	1230	PUSHs (sv);
1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1231	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1080	}	1232	}
1081		1233
		1234	void DESTROY (CBOR *self)
		1235	PPCODE:
		1236	cbor_free (self);
		1237
1082	PROTOTYPES: ENABLE	1238	PROTOTYPES: ENABLE
1083		1239
1084	void encode_cbor (SV *scalar)	1240	void encode_cbor (SV *scalar)
1085	PPCODE:	1241	PPCODE:
1086	{	1242	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs. Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC