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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 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
29	CBOR_TAG_PERL_OBJECT = 256,	32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
30	CBOR_TAG_GENERIC_OBJECT = 257,	33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
31		39
32	// rfc7049	40	// rfc7049
33	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35	CBOR_TAG_POS_BIGNUM = 2, // byte string	43	CBOR_TAG_POS_BIGNUM = 2, // byte string
…		…
49	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50		58
51	CBOR_TAG_MAGIC = 55799 // self-describe cbor	59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
52	};	60	};
53		61
54	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
55	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL
		65	#define F_PACK_STRINGS 0x00000008UL
56		66
57	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
58		68
59	#define SB do {	69	#define SB do {
60	#define SE } while (0)	70	#define SE } while (0)
…		…
72	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
73	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
74	#endif	84	#endif
75		85
76	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::
77	static SV types_true, types_false, types_error, sv_cbor;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
78		88
79	typedef struct {	89	typedef struct {
80	U32 flags;	90	U32 flags;
81	U32 max_depth;	91	U32 max_depth;
82	STRLEN max_size;	92	STRLEN max_size;
		93	SV *filter;
83	} CBOR;	94	} CBOR;
84		95
85	ecb_inline void	96	ecb_inline void
86	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
87	{	98	{
88	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
89	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);
90	}	107	}
91		108
92	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
93	// utility functions	110	// utility functions
94		111
…		…
116	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
117	#endif	134	#endif
118	}	135	}
119	}	136	}
120		137
121	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
122	// fp hell	139	ecb_inline int
123		140	minimum_string_length (UV idx)
124	//TODO	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	}
125		152
126	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
127	// encoder	154	// encoder
128		155
129	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
132	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
133	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
134	SV *sv; // result scalar	161	SV *sv; // result scalar
135	CBOR cbor;	162	CBOR cbor;
136	U32 depth; // recursion level	163	U32 depth; // recursion level
		164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
		166	HV *shareable; // ptr => index, or 0
		167	UV shareable_idx;
137	} enc_t;	168	} enc_t;
138		169
139	ecb_inline void	170	ecb_inline void
140	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
141	{	172	{
…		…
158	static void	189	static void
159	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
160	{	191	{
161	need (enc, 9);	192	need (enc, 9);
162		193
163	if (len < 24)	194	if (ecb_expect_true (len < 24))
164	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
165	else if (len <= 0xff)	196	else if (ecb_expect_true (len <= 0xff))
166	{	197	{
167	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
168	*enc->cur++ = len;	199	*enc->cur++ = len;
169	}	200	}
170	else if (len <= 0xffff)	201	else if (len <= 0xffff)
…		…
193	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
194	*enc->cur++ = len;	225	*enc->cur++ = len;
195	}	226	}
196	}	227	}
197		228
198	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
199	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
200	{	237	{
201	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
202	need (enc, len);	239	need (enc, len);
203	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
204	enc->cur += len;	241	enc->cur += len;
205	}	242	}
206		243
		244	static void
		245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		246	{
		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);
		267	}
		268
207	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
208		270
209	static void	271	static void
210	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
211	{	273	{
…		…
248	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
249	{	311	{
250	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
251	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
252	else	314	else
253	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
254		316
255	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));
256	}	318	}
257		319
258	if (mg)	320	if (mg)
…		…
263		325
264	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
265	static void	327	static void
266	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
267	{	329	{
268	svtype svt;
269
270	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
		331
271	svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
272		333
273	if (ecb_expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
274	{	335	{
275	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	336	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
276	? types_boolean_stash	337	? types_boolean_stash
…		…
336		397
337	// catch this surprisingly common error	398	// catch this surprisingly common error
338	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	399	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339	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));
340		401
341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	402	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342	encode_uint (enc, 0x80, count + 1);	403	encode_uint (enc, 0x80, count + 1);
343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	404	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344		405
345	while (count)	406	while (count)
346	encode_sv (enc, SP[1 - count--]);	407	encode_sv (enc, SP[1 - count--]);
347		408
348	PUTBACK;	409	PUTBACK;
…		…
355	}	416	}
356	else if (svt == SVt_PVHV)	417	else if (svt == SVt_PVHV)
357	encode_hv (enc, (HV *)sv);	418	encode_hv (enc, (HV *)sv);
358	else if (svt == SVt_PVAV)	419	else if (svt == SVt_PVAV)
359	encode_av (enc, (AV *)sv);	420	encode_av (enc, (AV *)sv);
360	else if (svt < SVt_PVAV)
361	{
362	STRLEN len = 0;
363	char *pv = svt ? SvPV (sv, len) : 0;
364
365	if (len == 1 && *pv == '1')
366	encode_ch (enc, 0xe0 \| 21);
367	else if (len == 1 && *pv == '0')
368	encode_ch (enc, 0xe0 \| 20);
369	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
370	encode_ch (enc, 0xe0 \| 23);
371	else
372	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
373	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
374	}
375	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
376	encode_ch (enc, 0xe0 \| 23);
377	else	421	else
378	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	422	{
379	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	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
		445	encode_tag (enc, CBOR_TAG_INDIRECTION);
		446	encode_sv (enc, sv);
		447	}
380	}	448	}
381		449
382	static void	450	static void
383	encode_nv (enc_t enc, SV sv)	451	encode_nv (enc_t enc, SV sv)
384	{	452	{
…		…
422		490
423	if (SvPOKp (sv))	491	if (SvPOKp (sv))
424	{	492	{
425	STRLEN len;	493	STRLEN len;
426	char *str = SvPV (sv, len);	494	char *str = SvPV (sv, len);
427	encode_str (enc, SvUTF8 (sv), str, len);	495	encode_strref (enc, SvUTF8 (sv), str, len);
428	}	496	}
429	else if (SvNOKp (sv))	497	else if (SvNOKp (sv))
430	encode_nv (enc, sv);	498	encode_nv (enc, sv);
431	else if (SvIOKp (sv))	499	else if (SvIOKp (sv))
432	{	500	{
…		…
449	}	517	}
450		518
451	static SV *	519	static SV *
452	encode_cbor (SV scalar, CBOR cbor)	520	encode_cbor (SV scalar, CBOR cbor)
453	{	521	{
454	enc_t enc;	522	enc_t enc = { };
455		523
456	enc.cbor = *cbor;	524	enc.cbor = *cbor;
457	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	525	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458	enc.cur = SvPVX (enc.sv);	526	enc.cur = SvPVX (enc.sv);
459	enc.end = SvEND (enc.sv);	527	enc.end = SvEND (enc.sv);
460	enc.depth = 0;
461		528
462	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
463	encode_sv (&enc, scalar);	538	encode_sv (&enc, scalar);
464		539
465	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	540	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466	*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
467		542
…		…
481	U8 *end; // end of input string	556	U8 *end; // end of input string
482	const char *err; // parse error, if != 0	557	const char *err; // parse error, if != 0
483	CBOR cbor;	558	CBOR cbor;
484	U32 depth; // recursion depth	559	U32 depth; // recursion depth
485	U32 maxdepth; // recursion depth limit	560	U32 maxdepth; // recursion depth limit
		561	AV *shareable;
		562	AV *stringref;
		563	SV *decode_tagged;
486	} dec_t;	564	} dec_t;
487		565
488	#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
489		567
490	#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")
…		…
588		666
589	static void	667	static void
590	decode_he (dec_t dec, HV hv)	668	decode_he (dec_t dec, HV hv)
591	{	669	{
592	// for speed reasons, we specialcase single-string	670	// for speed reasons, we specialcase single-string
593	// byte or utf-8 strings as keys.	671	// byte or utf-8 strings as keys, but only when !stringref
594		672
		673	if (ecb_expect_true (!dec->stringref))
595	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	674	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
596	{	675	{
597	I32 len = decode_uint (dec);	676	I32 len = decode_uint (dec);
598	char key = (char )dec->cur;	677	char key = (char )dec->cur;
599		678
600	dec->cur += len;	679	dec->cur += len;
601		680
		681	if (ecb_expect_false (dec->stringref))
		682	av_push (dec->stringref, newSVpvn (key, len));
		683
602	hv_store (hv, key, len, decode_sv (dec), 0);	684	hv_store (hv, key, len, decode_sv (dec), 0);
		685
		686	return;
603	}	687	}
604	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	688	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
605	{	689	{
606	I32 len = decode_uint (dec);	690	I32 len = decode_uint (dec);
607	char key = (char )dec->cur;	691	char key = (char )dec->cur;
608		692
609	dec->cur += len;	693	dec->cur += len;
610		694
		695	if (ecb_expect_false (dec->stringref))
		696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		697
611	hv_store (hv, key, -len, decode_sv (dec), 0);	698	hv_store (hv, key, -len, decode_sv (dec), 0);
		699
		700	return;
612	}	701	}
613	else	702
614	{
615	SV *k = decode_sv (dec);	703	SV *k = decode_sv (dec);
616	SV *v = decode_sv (dec);	704	SV *v = decode_sv (dec);
617		705
618	hv_store_ent (hv, k, v, 0);	706	hv_store_ent (hv, k, v, 0);
619	SvREFCNT_dec (k);	707	SvREFCNT_dec (k);
620	}
621	}	708	}
622		709
623	static SV *	710	static SV *
624	decode_hv (dec_t *dec)	711	decode_hv (dec_t *dec)
625	{	712	{
…		…
666	{	753	{
667	SV *sv = 0;	754	SV *sv = 0;
668		755
669	if ((*dec->cur & 31) == 31)	756	if ((*dec->cur & 31) == 31)
670	{	757	{
		758	// indefinite length strings
671	++dec->cur;	759	++dec->cur;
672		760
		761	unsigned char major = *dec->cur & 0xe0;
		762
673	sv = newSVpvn ("", 0);	763	sv = newSVpvn ("", 0);
674		764
675	// not very fast, and certainly not robust against illegal input
676	for (;;)	765	for (;;)
677	{	766	{
678	WANT (1);	767	WANT (1);
679		768
		769	if ((*dec->cur ^ major) >= 31)
680	if (*dec->cur == (0xe0 \| 31))	770	if (*dec->cur == (0xe0 \| 31))
681	{	771	{
682	++dec->cur;	772	++dec->cur;
683	break;	773	break;
684	}	774	}
		775	else
		776	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
685		777
686	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;
687	}	783	}
688	}	784	}
689	else	785	else
690	{	786	{
691	STRLEN len = decode_uint (dec);	787	STRLEN len = decode_uint (dec);
692		788
693	WANT (len);	789	WANT (len);
694	sv = newSVpvn (dec->cur, len);	790	sv = newSVpvn (dec->cur, len);
695	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));
696	}	796	}
697		797
698	if (utf8)	798	if (utf8)
699	SvUTF8_on (sv);	799	SvUTF8_on (sv);
700		800
…		…
706	}	806	}
707		807
708	static SV *	808	static SV *
709	decode_tagged (dec_t *dec)	809	decode_tagged (dec_t *dec)
710	{	810	{
		811	SV *sv = 0;
711	UV tag = decode_uint (dec);	812	UV tag = decode_uint (dec);
		813
		814	WANT (1);
		815
		816	switch (tag)
		817	{
		818	case CBOR_TAG_MAGIC:
712	SV *sv = decode_sv (dec);	819	sv = decode_sv (dec);
		820	break;
713		821
714	if (tag == CBOR_TAG_MAGIC)	822	case CBOR_TAG_INDIRECTION:
715	return sv;	823	sv = newRV_noinc (decode_sv (dec));
716	else if (tag == CBOR_TAG_PERL_OBJECT)	824	break;
717	{
718	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
719	ERR ("corrupted CBOR data (non-array perl object)");
720		825
721	AV av = (AV )SvRV (sv);	826	case CBOR_TAG_STRINGREF_NAMESPACE:
722	int len = av_len (av) + 1;
723	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
724
725	if (!stash)
726	ERR ("cannot decode perl-object (package does not exist)");
727
728	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
729		827	{
730	if (!method)	828	ENTER; SAVETMPS;
731	ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733	dSP;
734		829
735	ENTER; SAVETMPS; PUSHMARK (SP);	830	SAVESPTR (dec->stringref);
736	EXTEND (SP, len + 1);	831	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
737	// we re-bless the reference to get overload and other niceties right
738	PUSHs (*av_fetch (av, 0, 1));
739	PUSHs (sv_cbor);
740		832
741	int i;	833	sv = decode_sv (dec);
742		834
743	for (i = 1; i < len; ++i)
744	PUSHs (*av_fetch (av, i, 1));
745
746	PUTBACK;
747	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
748	SPAGAIN;
749
750	if (SvTRUE (ERRSV))
751	{
752	FREETMPS; LEAVE;	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;
		852
		853	case CBOR_TAG_VALUE_SHAREABLE:
		854	{
		855	if (ecb_expect_false (!dec->shareable))
		856	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		857
		858	sv = newSV (0);
		859	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		860
		861	SV *osv = decode_sv (dec);
		862	sv_setsv (sv, osv);
		863	SvREFCNT_dec_NN (osv);
		864	}
		865	break;
		866
		867	case CBOR_TAG_VALUE_SHAREDREF:
		868	{
		869	if ((*dec->cur >> 5) != 0)
		870	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		871
		872	UV idx = decode_uint (dec);
		873
		874	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		875	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		876
		877	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		878	}
		879	break;
		880
		881	case CBOR_TAG_PERL_OBJECT:
		882	{
		883	sv = decode_sv (dec);
		884
		885	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		886	ERR ("corrupted CBOR data (non-array perl object)");
		887
		888	AV av = (AV )SvRV (sv);
		889	int len = av_len (av) + 1;
		890	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		891
		892	if (!stash)
		893	ERR ("cannot decode perl-object (package does not exist)");
		894
		895	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		896
		897	if (!method)
		898	ERR ("cannot decode perl-object (package does not have a THAW method)");
		899
		900	dSP;
		901
		902	ENTER; SAVETMPS; PUSHMARK (SP);
		903	EXTEND (SP, len + 1);
		904	// we re-bless the reference to get overload and other niceties right
		905	PUSHs (*av_fetch (av, 0, 1));
		906	PUSHs (sv_cbor);
		907
		908	int i;
		909
		910	for (i = 1; i < len; ++i)
		911	PUSHs (*av_fetch (av, i, 1));
		912
		913	PUTBACK;
		914	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		915	SPAGAIN;
		916
		917	if (SvTRUE (ERRSV))
		918	{
		919	FREETMPS; LEAVE;
753	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	920	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
754	}	921	}
755		922
756	SvREFCNT_dec (sv);	923	SvREFCNT_dec (sv);
757	sv = SvREFCNT_inc (POPs);	924	sv = SvREFCNT_inc (POPs);
758		925
759	PUTBACK;	926	PUTBACK;
760		927
761	FREETMPS; LEAVE;	928	FREETMPS; LEAVE;
		929	}
		930	break;
762		931
763	return sv;	932	default:
764	}	933	{
765	else	934	sv = decode_sv (dec);
766	{	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	{
767	AV *av = newAV ();	959	AV *av = newAV ();
768	av_push (av, newSVuv (tag));	960	av_push (av, newSVuv (tag));
769	av_push (av, sv);	961	av_push (av, sv);
770		962
771	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	963	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
772	? cbor_tagged_stash	964	? cbor_tagged_stash
773	: gv_stashpv ("CBOR::XS::Tagged" , 1);	965	: gv_stashpv ("CBOR::XS::Tagged" , 1);
774
775	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	966	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		967	}
		968
		969	PUTBACK;
		970
		971	FREETMPS; LEAVE;
		972	}
		973	break;
776	}	974	}
		975
		976	return sv;
777		977
778	fail:	978	fail:
779	SvREFCNT_dec (sv);	979	SvREFCNT_dec (sv);
780	return &PL_sv_undef;	980	return &PL_sv_undef;
781	}	981	}
…		…
872	}	1072	}
873		1073
874	static SV *	1074	static SV *
875	decode_cbor (SV string, CBOR cbor, char **offset_return)	1075	decode_cbor (SV string, CBOR cbor, char **offset_return)
876	{	1076	{
877	dec_t dec;	1077	dec_t dec = { };
878	SV *sv;	1078	SV *sv;
879	STRLEN len;	1079	STRLEN len;
880	char *data = SvPVbyte (string, len);	1080	char *data = SvPVbyte (string, len);
881		1081
882	if (len > cbor->max_size && cbor->max_size)	1082	if (len > cbor->max_size && cbor->max_size)
…		…
884	(unsigned long)len, (unsigned long)cbor->max_size);	1084	(unsigned long)len, (unsigned long)cbor->max_size);
885		1085
886	dec.cbor = *cbor;	1086	dec.cbor = *cbor;
887	dec.cur = (U8 *)data;	1087	dec.cur = (U8 *)data;
888	dec.end = (U8 *)data + len;	1088	dec.end = (U8 *)data + len;
889	dec.err = 0;
890	dec.depth = 0;
891		1089
892	sv = decode_sv (&dec);	1090	sv = decode_sv (&dec);
893		1091
894	if (offset_return)	1092	if (offset_return)
895	*offset_return = dec.cur;	1093	*offset_return = dec.cur;
…		…
923	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1121	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
924		1122
925	types_true = get_bool ("Types::Serialiser::true" );	1123	types_true = get_bool ("Types::Serialiser::true" );
926	types_false = get_bool ("Types::Serialiser::false");	1124	types_false = get_bool ("Types::Serialiser::false");
927	types_error = get_bool ("Types::Serialiser::error");	1125	types_error = get_bool ("Types::Serialiser::error");
		1126
		1127	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
928		1128
929	sv_cbor = newSVpv ("CBOR", 0);	1129	sv_cbor = newSVpv ("CBOR", 0);
930	SvREADONLY_on (sv_cbor);	1130	SvREADONLY_on (sv_cbor);
931	}	1131	}
932		1132
…		…
953		1153
954	void shrink (CBOR *self, int enable = 1)	1154	void shrink (CBOR *self, int enable = 1)
955	ALIAS:	1155	ALIAS:
956	shrink = F_SHRINK	1156	shrink = F_SHRINK
957	allow_unknown = F_ALLOW_UNKNOWN	1157	allow_unknown = F_ALLOW_UNKNOWN
		1158	allow_sharing = F_ALLOW_SHARING
		1159	pack_strings = F_PACK_STRINGS
958	PPCODE:	1160	PPCODE:
959	{	1161	{
960	if (enable)	1162	if (enable)
961	self->flags \|= ix;	1163	self->flags \|= ix;
962	else	1164	else
…		…
967		1169
968	void get_shrink (CBOR *self)	1170	void get_shrink (CBOR *self)
969	ALIAS:	1171	ALIAS:
970	get_shrink = F_SHRINK	1172	get_shrink = F_SHRINK
971	get_allow_unknown = F_ALLOW_UNKNOWN	1173	get_allow_unknown = F_ALLOW_UNKNOWN
		1174	get_allow_sharing = F_ALLOW_SHARING
		1175	get_pack_strings = F_PACK_STRINGS
972	PPCODE:	1176	PPCODE:
973	XPUSHs (boolSV (self->flags & ix));	1177	XPUSHs (boolSV (self->flags & ix));
974		1178
975	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1179	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
976	PPCODE:	1180	PPCODE:
…		…
989	XPUSHs (ST (0));	1193	XPUSHs (ST (0));
990		1194
991	int get_max_size (CBOR *self)	1195	int get_max_size (CBOR *self)
992	CODE:	1196	CODE:
993	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);
994	OUTPUT:	1210	OUTPUT:
995	RETVAL	1211	RETVAL
996		1212
997	void encode (CBOR self, SV scalar)	1213	void encode (CBOR self, SV scalar)
998	PPCODE:	1214	PPCODE:
…		…
1013	EXTEND (SP, 2);	1229	EXTEND (SP, 2);
1014	PUSHs (sv);	1230	PUSHs (sv);
1015	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1231	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1016	}	1232	}
1017		1233
		1234	void DESTROY (CBOR *self)
		1235	PPCODE:
		1236	cbor_free (self);
		1237
1018	PROTOTYPES: ENABLE	1238	PROTOTYPES: ENABLE
1019		1239
1020	void encode_cbor (SV *scalar)	1240	void encode_cbor (SV *scalar)
1021	PPCODE:	1241	PPCODE:
1022	{	1242	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.17 by root, Tue Oct 29 22:04:52 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.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC