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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19: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
…		…
122	SvPV_shrink_to_cur (sv);	131	SvPV_shrink_to_cur (sv);
123	#elif defined (SvPV_renew)	132	#elif defined (SvPV_renew)
124	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
125	#endif	134	#endif
126	}	135	}
		136	}
		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;
127	}	151	}
128		152
129	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
130	// encoder	154	// encoder
131		155
…		…
165	static void	189	static void
166	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
167	{	191	{
168	need (enc, 9);	192	need (enc, 9);
169		193
170	if (len < 24)	194	if (ecb_expect_true (len < 24))
171	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
172	else if (len <= 0xff)	196	else if (ecb_expect_true (len <= 0xff))
173	{	197	{
174	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
175	*enc->cur++ = len;	199	*enc->cur++ = len;
176	}	200	}
177	else if (len <= 0xffff)	201	else if (len <= 0xffff)
…		…
200	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
201	*enc->cur++ = len;	225	*enc->cur++ = len;
202	}	226	}
203	}	227	}
204		228
205	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
206	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
207	{	237	{
208	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
209	need (enc, len);	239	need (enc, len);
210	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
211	enc->cur += len;	241	enc->cur += len;
212	}	242	}
213		243
214	ecb_inline void	244	static void
215	encode_tag (enc_t *enc, UV tag)	245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
216	{	246	{
217	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);
218	}	267	}
219		268
220	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
221		270
222	static void	271	static void
…		…
236	SV **svp = av_fetch (av, i, 0);	285	SV **svp = av_fetch (av, i, 0);
237	encode_sv (enc, svp ? *svp : &PL_sv_undef);	286	encode_sv (enc, svp ? *svp : &PL_sv_undef);
238	}	287	}
239		288
240	--enc->depth;	289	--enc->depth;
241	}
242
243	ecb_inline void
244	encode_he (enc_t enc, HE he)
245	{
246	if (HeKLEN (he) == HEf_SVKEY)
247	encode_sv (enc, HeSVKEY (he));
248	else
249	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
250	}	290	}
251		291
252	static void	292	static void
253	encode_hv (enc_t enc, HV hv)	293	encode_hv (enc_t enc, HV hv)
254	{	294	{
…		…
267	else	307	else
268	encode_uint (enc, 0xa0, pairs);	308	encode_uint (enc, 0xa0, pairs);
269		309
270	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
271	{	311	{
272	if (ecb_expect_false (enc->cbor.flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS)))
273	{
274	SV **svp;
275
276	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
277	svp = hv_fetch_ent (enc->stringref[!! SvUTF8 (HeSVKEY (he))], HeSVKEY (he) , 1, 0);//TODO return HE :/	313	encode_sv (enc, HeSVKEY (he));
278	else
279	svp = hv_fetch (enc->stringref[!! HeKUTF8 (he) ], HeKEY (he), HeKLEN (he), 1);
280
281	if (SvOK (*svp))
282	{
283	encode_tag (enc, CBOR_TAG_STRINGREF);
284	encode_uint (enc, 0x00, SvUV (*svp));
285	}
286	else
287	{
288	sv_setuv (*svp, enc->stringref_idx);
289	++enc->stringref_idx;
290	encode_he (enc, he);
291	}
292	}
293	else	314	else
294	encode_he (enc, he);	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
295		316
296	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));
297	}	318	}
298		319
299	if (mg)	320	if (mg)
…		…
305	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
306	static void	327	static void
307	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
308	{	329	{
309	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
310
311	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
312	&& ecb_expect_false (SvREFCNT (sv) > 1))
313	{
314	if (!enc->shareable)
315	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
316
317	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
318
319	if (SvOK (*svp))
320	{
321	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
322	encode_uint (enc, 0x00, SvUV (*svp));
323	return;
324	}
325	else
326	{
327	sv_setuv (*svp, enc->shareable_idx);
328	++enc->shareable_idx;
329	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
330	}
331	}
332		331
333	svtype svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
334		333
335	if (ecb_expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
336	{	335	{
…		…
343	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	342	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
344	? cbor_tagged_stash	343	? cbor_tagged_stash
345	: gv_stashpv ("CBOR::XS::Tagged" , 1);	344	: gv_stashpv ("CBOR::XS::Tagged" , 1);
346		345
347	HV *stash = SvSTASH (sv);	346	HV *stash = SvSTASH (sv);
348	GV *method;
349		347
350	if (stash == boolean_stash)	348	if (stash == boolean_stash)
		349	{
351	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	350	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		351	return;
		352	}
352	else if (stash == error_stash)	353	else if (stash == error_stash)
		354	{
353	encode_ch (enc, 0xe0 \| 23);	355	encode_ch (enc, 0xe0 \| 23);
		356	return;
		357	}
354	else if (stash == tagged_stash)	358	else if (stash == tagged_stash)
355	{	359	{
356	if (svt != SVt_PVAV)	360	if (svt != SVt_PVAV)
357	croak ("encountered CBOR::XS::Tagged object that isn't an array");	361	croak ("encountered CBOR::XS::Tagged object that isn't an array");
358		362
359	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	363	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
360	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	364	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		365
		366	return;
		367	}
		368	}
		369
		370	if (ecb_expect_false (SvREFCNT (sv) > 1)
		371	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		372	{
		373	if (!enc->shareable)
		374	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		375
		376	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		377
		378	if (SvOK (*svp))
361	}	379	{
		380	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		381	encode_uint (enc, 0x00, SvUV (*svp));
		382	return;
		383	}
		384	else
		385	{
		386	sv_setuv (*svp, enc->shareable_idx);
		387	++enc->shareable_idx;
		388	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		389	}
		390	}
		391
		392	if (ecb_expect_false (SvOBJECT (sv)))
		393	{
		394	HV *stash = SvSTASH (sv);
		395	GV *method;
		396
362	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	397	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
363	{	398	{
364	dSP;	399	dSP;
365		400
366	ENTER; SAVETMPS; PUSHMARK (SP);	401	ENTER; SAVETMPS; PUSHMARK (SP);
367	// we re-bless the reference to get overload and other niceties right	402	// we re-bless the reference to get overload and other niceties right
…		…
400	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	435	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
401	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	436	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
402		437
403	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	438	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
404	encode_uint (enc, 0x80, count + 1);	439	encode_uint (enc, 0x80, count + 1);
405	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	440	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
406		441
407	while (count)	442	while (count)
408	encode_sv (enc, SP[1 - count--]);	443	encode_sv (enc, SP[1 - count--]);
409		444
410	PUTBACK;	445	PUTBACK;
…		…
469		504
470	if (SvPOKp (sv))	505	if (SvPOKp (sv))
471	{	506	{
472	STRLEN len;	507	STRLEN len;
473	char *str = SvPV (sv, len);	508	char *str = SvPV (sv, len);
474	encode_str (enc, SvUTF8 (sv), str, len);	509	encode_strref (enc, SvUTF8 (sv), str, len);
475	}	510	}
476	else if (SvNOKp (sv))	511	else if (SvNOKp (sv))
477	encode_nv (enc, sv);	512	encode_nv (enc, sv);
478	else if (SvIOKp (sv))	513	else if (SvIOKp (sv))
479	{	514	{
…		…
505	enc.cur = SvPVX (enc.sv);	540	enc.cur = SvPVX (enc.sv);
506	enc.end = SvEND (enc.sv);	541	enc.end = SvEND (enc.sv);
507		542
508	SvPOK_only (enc.sv);	543	SvPOK_only (enc.sv);
509		544
510	if (cbor->flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS))	545	if (cbor->flags & F_PACK_STRINGS)
511	{	546	{
512	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	547	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
513	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());	548	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
514	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());	549	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
515	}	550	}
…		…
537	CBOR cbor;	572	CBOR cbor;
538	U32 depth; // recursion depth	573	U32 depth; // recursion depth
539	U32 maxdepth; // recursion depth limit	574	U32 maxdepth; // recursion depth limit
540	AV *shareable;	575	AV *shareable;
541	AV *stringref;	576	AV *stringref;
		577	SV *decode_tagged;
542	} dec_t;	578	} dec_t;
543		579
544	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	580	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
545		581
546	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	582	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
578	\| ((UV)dec->cur[-1]);	614	\| ((UV)dec->cur[-1]);
579		615
580	case 27:	616	case 27:
581	WANT (9);	617	WANT (9);
582	dec->cur += 9;	618	dec->cur += 9;
		619
		620	return
		621	#if UVSIZE < 8
		622	0
		623	#else
583	return (((UV)dec->cur[-8]) << 56)	624	(((UV)dec->cur[-8]) << 56)
584	\| (((UV)dec->cur[-7]) << 48)	625	\| (((UV)dec->cur[-7]) << 48)
585	\| (((UV)dec->cur[-6]) << 40)	626	\| (((UV)dec->cur[-6]) << 40)
586	\| (((UV)dec->cur[-5]) << 32)	627	\| (((UV)dec->cur[-5]) << 32)
		628	#endif
587	\| (((UV)dec->cur[-4]) << 24)	629	\| (((UV)dec->cur[-4]) << 24)
588	\| (((UV)dec->cur[-3]) << 16)	630	\| (((UV)dec->cur[-3]) << 16)
589	\| (((UV)dec->cur[-2]) << 8)	631	\| (((UV)dec->cur[-2]) << 8)
590	\| ((UV)dec->cur[-1]);	632	\| ((UV)dec->cur[-1]);
591		633
…		…
644		686
645	static void	687	static void
646	decode_he (dec_t dec, HV hv)	688	decode_he (dec_t dec, HV hv)
647	{	689	{
648	// for speed reasons, we specialcase single-string	690	// for speed reasons, we specialcase single-string
649	// byte or utf-8 strings as keys.	691	// byte or utf-8 strings as keys, but only when !stringref
650		692
		693	if (ecb_expect_true (!dec->stringref))
651	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	694	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
652	{	695	{
653	I32 len = decode_uint (dec);	696	I32 len = decode_uint (dec);
654	char key = (char )dec->cur;	697	char key = (char )dec->cur;
655		698
656	dec->cur += len;	699	dec->cur += len;
657		700
658	if (ecb_expect_false (dec->stringref))	701	if (ecb_expect_false (dec->stringref))
659	av_push (dec->stringref, newSVpvn (key, len));	702	av_push (dec->stringref, newSVpvn (key, len));
660		703
661	hv_store (hv, key, len, decode_sv (dec), 0);	704	hv_store (hv, key, len, decode_sv (dec), 0);
		705
		706	return;
662	}	707	}
663	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	708	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
664	{	709	{
665	I32 len = decode_uint (dec);	710	I32 len = decode_uint (dec);
666	char key = (char )dec->cur;	711	char key = (char )dec->cur;
667		712
668	dec->cur += len;	713	dec->cur += len;
669		714
670	if (ecb_expect_false (dec->stringref))	715	if (ecb_expect_false (dec->stringref))
671	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));	716	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
672		717
673	hv_store (hv, key, -len, decode_sv (dec), 0);	718	hv_store (hv, key, -len, decode_sv (dec), 0);
		719
		720	return;
674	}	721	}
675	else	722
676	{
677	SV *k = decode_sv (dec);	723	SV *k = decode_sv (dec);
678	SV *v = decode_sv (dec);	724	SV *v = decode_sv (dec);
679		725
680	hv_store_ent (hv, k, v, 0);	726	hv_store_ent (hv, k, v, 0);
681	SvREFCNT_dec (k);	727	SvREFCNT_dec (k);
682	}
683	}	728	}
684		729
685	static SV *	730	static SV *
686	decode_hv (dec_t *dec)	731	decode_hv (dec_t *dec)
687	{	732	{
…		…
728	{	773	{
729	SV *sv = 0;	774	SV *sv = 0;
730		775
731	if ((*dec->cur & 31) == 31)	776	if ((*dec->cur & 31) == 31)
732	{	777	{
		778	// indefinite length strings
733	++dec->cur;	779	++dec->cur;
734		780
		781	unsigned char major = *dec->cur & 0xe0;
		782
735	sv = newSVpvn ("", 0);	783	sv = newSVpvn ("", 0);
736		784
737	// not very fast, and certainly not robust against illegal input
738	for (;;)	785	for (;;)
739	{	786	{
740	WANT (1);	787	WANT (1);
741		788
		789	if ((*dec->cur ^ major) >= 31)
742	if (*dec->cur == (0xe0 \| 31))	790	if (*dec->cur == (0xe0 \| 31))
743	{	791	{
744	++dec->cur;	792	++dec->cur;
745	break;	793	break;
746	}	794	}
		795	else
		796	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
747		797
748	sv_catsv (sv, decode_sv (dec));	798	STRLEN len = decode_uint (dec);
		799
		800	WANT (len);
		801	sv_catpvn (sv, dec->cur, len);
		802	dec->cur += len;
749	}	803	}
750	}	804	}
751	else	805	else
752	{	806	{
753	STRLEN len = decode_uint (dec);	807	STRLEN len = decode_uint (dec);
754		808
755	WANT (len);	809	WANT (len);
756	sv = newSVpvn (dec->cur, len);	810	sv = newSVpvn (dec->cur, len);
757	dec->cur += len;	811	dec->cur += len;
		812
		813	if (ecb_expect_false (dec->stringref)
		814	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		815	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
758	}	816	}
759		817
760	if (utf8)	818	if (utf8)
761	SvUTF8_on (sv);	819	SvUTF8_on (sv);
762
763	if (ecb_expect_false (dec->stringref))
764	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
765		820
766	return sv;	821	return sv;
767		822
768	fail:	823	fail:
769	SvREFCNT_dec (sv);	824	SvREFCNT_dec (sv);
…		…
896		951
897	default:	952	default:
898	{	953	{
899	sv = decode_sv (dec);	954	sv = decode_sv (dec);
900		955
		956	dSP;
		957	ENTER; SAVETMPS; PUSHMARK (SP);
		958	EXTEND (SP, 2);
		959	PUSHs (newSVuv (tag));
		960	PUSHs (sv);
		961
		962	PUTBACK;
		963	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		964	SPAGAIN;
		965
		966	if (SvTRUE (ERRSV))
		967	{
		968	FREETMPS; LEAVE;
		969	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		970	}
		971
		972	if (count)
		973	{
		974	SvREFCNT_dec (sv);
		975	sv = SvREFCNT_inc (POPs);
		976	}
		977	else
		978	{
901	AV *av = newAV ();	979	AV *av = newAV ();
902	av_push (av, newSVuv (tag));	980	av_push (av, newSVuv (tag));
903	av_push (av, sv);	981	av_push (av, sv);
904		982
905	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	983	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
906	? cbor_tagged_stash	984	? cbor_tagged_stash
907	: gv_stashpv ("CBOR::XS::Tagged" , 1);	985	: gv_stashpv ("CBOR::XS::Tagged" , 1);
908
909	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);	986	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		987	}
		988
		989	PUTBACK;
		990
		991	FREETMPS; LEAVE;
910	}	992	}
911	break;	993	break;
912	}	994	}
913		995
914	return sv;	996	return sv;
…		…
1060		1142
1061	types_true = get_bool ("Types::Serialiser::true" );	1143	types_true = get_bool ("Types::Serialiser::true" );
1062	types_false = get_bool ("Types::Serialiser::false");	1144	types_false = get_bool ("Types::Serialiser::false");
1063	types_error = get_bool ("Types::Serialiser::error");	1145	types_error = get_bool ("Types::Serialiser::error");
1064		1146
		1147	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1148
1065	sv_cbor = newSVpv ("CBOR", 0);	1149	sv_cbor = newSVpv ("CBOR", 0);
1066	SvREADONLY_on (sv_cbor);	1150	SvREADONLY_on (sv_cbor);
1067	}	1151	}
1068		1152
1069	PROTOTYPES: DISABLE	1153	PROTOTYPES: DISABLE
…		…
1090	void shrink (CBOR *self, int enable = 1)	1174	void shrink (CBOR *self, int enable = 1)
1091	ALIAS:	1175	ALIAS:
1092	shrink = F_SHRINK	1176	shrink = F_SHRINK
1093	allow_unknown = F_ALLOW_UNKNOWN	1177	allow_unknown = F_ALLOW_UNKNOWN
1094	allow_sharing = F_ALLOW_SHARING	1178	allow_sharing = F_ALLOW_SHARING
1095	dedup_keys = F_DEDUP_KEYS
1096	dedup_strings = F_DEDUP_STRINGS	1179	pack_strings = F_PACK_STRINGS
1097	PPCODE:	1180	PPCODE:
1098	{	1181	{
1099	if (enable)	1182	if (enable)
1100	self->flags \|= ix;	1183	self->flags \|= ix;
1101	else	1184	else
…		…
1107	void get_shrink (CBOR *self)	1190	void get_shrink (CBOR *self)
1108	ALIAS:	1191	ALIAS:
1109	get_shrink = F_SHRINK	1192	get_shrink = F_SHRINK
1110	get_allow_unknown = F_ALLOW_UNKNOWN	1193	get_allow_unknown = F_ALLOW_UNKNOWN
1111	get_allow_sharing = F_ALLOW_SHARING	1194	get_allow_sharing = F_ALLOW_SHARING
1112	get_dedup_keys = F_DEDUP_KEYS
1113	get_dedup_strings = F_DEDUP_STRINGS	1195	get_pack_strings = F_PACK_STRINGS
1114	PPCODE:	1196	PPCODE:
1115	XPUSHs (boolSV (self->flags & ix));	1197	XPUSHs (boolSV (self->flags & ix));
1116		1198
1117	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1199	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1118	PPCODE:	1200	PPCODE:
…		…
1131	XPUSHs (ST (0));	1213	XPUSHs (ST (0));
1132		1214
1133	int get_max_size (CBOR *self)	1215	int get_max_size (CBOR *self)
1134	CODE:	1216	CODE:
1135	RETVAL = self->max_size;	1217	RETVAL = self->max_size;
		1218	OUTPUT:
		1219	RETVAL
		1220
		1221	void filter (CBOR self, SV filter = 0)
		1222	PPCODE:
		1223	SvREFCNT_dec (self->filter);
		1224	self->filter = filter ? newSVsv (filter) : filter;
		1225	XPUSHs (ST (0));
		1226
		1227	SV get_filter (CBOR self)
		1228	CODE:
		1229	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1136	OUTPUT:	1230	OUTPUT:
1137	RETVAL	1231	RETVAL
1138		1232
1139	void encode (CBOR self, SV scalar)	1233	void encode (CBOR self, SV scalar)
1140	PPCODE:	1234	PPCODE:
…		…
1155	EXTEND (SP, 2);	1249	EXTEND (SP, 2);
1156	PUSHs (sv);	1250	PUSHs (sv);
1157	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1251	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1158	}	1252	}
1159		1253
		1254	void DESTROY (CBOR *self)
		1255	PPCODE:
		1256	cbor_free (self);
		1257
1160	PROTOTYPES: ENABLE	1258	PROTOTYPES: ENABLE
1161		1259
1162	void encode_cbor (SV *scalar)	1260	void encode_cbor (SV *scalar)
1163	PPCODE:	1261	PPCODE:
1164	{	1262	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs. Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC