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

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

…		…
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
12	#include "ecb.h"	12	#include "ecb.h"
13		13
14	// known tags, rfc7049	14	// compatibility with perl <5.18
		15	#ifndef HvNAMELEN_get
		16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		17	#endif
		18	#ifndef HvNAMELEN
		19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		20	#endif
		21	#ifndef HvNAMEUTF8
		22	# define HvNAMEUTF8(hv) 0
		23	#endif
		24
		25	// known tags
15	enum cbor_tag	26	enum cbor_tag
16	{	27	{
		28	// inofficial extensions (pending iana registration)
		29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
		30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object
		31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing
		32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing
		33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // 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
		36
		37	// rfc7049
17	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
18	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
19	CBOR_TAG_POS_BIGNUM = 2, // byte string	40	CBOR_TAG_POS_BIGNUM = 2, // byte string
20	CBOR_TAG_NEG_BIGNUM = 3, // byte string	41	CBOR_TAG_NEG_BIGNUM = 3, // byte string
21	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
22	CBOR_TAG_BIGFLOAT = 5, // array	43	CBOR_TAG_BIGFLOAT = 5, // array
23		44
24	CBOR_TAG_CONV_B64U = 21, // base64url, any	45	CBOR_TAG_CONV_B64U = 21, // base64url, any
25	CBOR_TAG_CONV_B64 = 22, // base64, any	46	CBOR_TAG_CONV_B64 = 22, // base64, any
26	CBOR_TAG_CONV_HEX = 23, // base16, any	47	CBOR_TAG_CONV_HEX = 23, // base16, any
27	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
28		49
29	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
30	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
31	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
32	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
33	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
34		55
35	CBOR_TAG_MAGIC = 55799	56	CBOR_TAG_MAGIC = 55799 // self-describe cbor
36	};	57	};
37		58
38	#define F_SHRINK 0x00000200UL	59	#define F_SHRINK 0x00000001UL
39	#define F_ALLOW_UNKNOWN 0x00002000UL	60	#define F_ALLOW_UNKNOWN 0x00000002UL
		61	#define F_ALLOW_SHARING 0x00000004UL //TODO
		62	#define F_ALLOW_STRINGREF 0x00000008UL //TODO
40		63
41	#define INIT_SIZE 32 // initial scalar size to be allocated	64	#define INIT_SIZE 32 // initial scalar size to be allocated
42		65
43	#define SB do {	66	#define SB do {
44	#define SE } while (0)	67	#define SE } while (0)
…		…
55	#else	78	#else
56	# define CBOR_SLOW 0	79	# define CBOR_SLOW 0
57	# define CBOR_STASH cbor_stash	80	# define CBOR_STASH cbor_stash
58	#endif	81	#endif
59		82
60	static HV cbor_stash, cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::	83	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
61	static SV cbor_true, cbor_false;	84	static SV types_true, types_false, types_error, sv_cbor;
62		85
63	typedef struct {	86	typedef struct {
64	U32 flags;	87	U32 flags;
65	U32 max_depth;	88	U32 max_depth;
66	STRLEN max_size;	89	STRLEN max_size;
…		…
100	SvPV_renew (sv, SvCUR (sv) + 1);	123	SvPV_renew (sv, SvCUR (sv) + 1);
101	#endif	124	#endif
102	}	125	}
103	}	126	}
104		127
105	/////////////////////////////////////////////////////////////////////////////	128	// minimum length of a string to be registered for stringref
106	// fp hell	129	ecb_inline int
107		130	minimum_string_length (UV idx)
108	//TODO	131	{
		132	return idx > 23
		133	? idx > 0xffU
		134	? idx > 0xffffU
		135	? idx > 0xffffffffU
		136	? 7
		137	: 6
		138	: 5
		139	: 4
		140	: 3;
		141	}
109		142
110	/////////////////////////////////////////////////////////////////////////////	143	/////////////////////////////////////////////////////////////////////////////
111	// encoder	144	// encoder
112		145
113	// structure used for encoding CBOR	146	// structure used for encoding CBOR
…		…
116	char *cur; // SvPVX (sv) + current output position	149	char *cur; // SvPVX (sv) + current output position
117	char *end; // SvEND (sv)	150	char *end; // SvEND (sv)
118	SV *sv; // result scalar	151	SV *sv; // result scalar
119	CBOR cbor;	152	CBOR cbor;
120	U32 depth; // recursion level	153	U32 depth; // recursion level
		154	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		155	UV stringref_idx;
		156	HV *shareable; // ptr => index, or 0
		157	UV shareable_idx;
121	} enc_t;	158	} enc_t;
122		159
123	ecb_inline void	160	ecb_inline void
124	need (enc_t *enc, STRLEN len)	161	need (enc_t *enc, STRLEN len)
125	{	162	{
…		…
177	*enc->cur++ = len >> 8;	214	*enc->cur++ = len >> 8;
178	*enc->cur++ = len;	215	*enc->cur++ = len;
179	}	216	}
180	}	217	}
181		218
		219	ecb_inline void
		220	encode_tag (enc_t *enc, UV tag)
		221	{
		222	encode_uint (enc, 0xc0, tag);
		223	}
		224
182	static void	225	static void
183	encode_str (enc_t enc, int utf8, char str, STRLEN len)	226	encode_str (enc_t enc, int utf8, char str, STRLEN len)
184	{	227	{
		228	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		229	{
		230	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		231
		232	if (SvOK (*svp))
		233	{
		234	// already registered, use stringref
		235	encode_tag (enc, CBOR_TAG_STRINGREF);
		236	encode_uint (enc, 0x00, SvUV (*svp));
		237	return;
		238	}
		239	else if (len >= minimum_string_length (enc->stringref_idx))
		240	{
		241	// register only
		242	sv_setuv (*svp, enc->stringref_idx);
		243	++enc->stringref_idx;
		244	}
		245	}
		246
185	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
186	need (enc, len);	248	need (enc, len);
187	memcpy (enc->cur, str, len);	249	memcpy (enc->cur, str, len);
188	enc->cur += len;	250	enc->cur += len;
189	}	251	}
…		…
247		309
248	// encode objects, arrays and special \0=false and \1=true values.	310	// encode objects, arrays and special \0=false and \1=true values.
249	static void	311	static void
250	encode_rv (enc_t enc, SV sv)	312	encode_rv (enc_t enc, SV sv)
251	{	313	{
252	svtype svt;
253
254	SvGETMAGIC (sv);	314	SvGETMAGIC (sv);
		315
		316	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		317	&& ecb_expect_false (SvREFCNT (sv) > 1))
		318	{
		319	if (!enc->shareable)
		320	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		321
		322	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		323
		324	if (SvOK (*svp))
		325	{
		326	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		327	encode_uint (enc, 0x00, SvUV (*svp));
		328	return;
		329	}
		330	else
		331	{
		332	sv_setuv (*svp, enc->shareable_idx);
		333	++enc->shareable_idx;
		334	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		335	}
		336	}
		337
255	svt = SvTYPE (sv);	338	svtype svt = SvTYPE (sv);
256		339
257	if (ecb_expect_false (SvOBJECT (sv)))	340	if (ecb_expect_false (SvOBJECT (sv)))
258	{	341	{
259	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	342	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
260	? cbor_boolean_stash	343	? types_boolean_stash
261	: gv_stashpv ("CBOR::XS::Boolean", 1);	344	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		345	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		346	? types_error_stash
		347	: gv_stashpv ("Types::Serialiser::Error", 1);
262	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	348	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
263	? cbor_tagged_stash	349	? cbor_tagged_stash
264	: gv_stashpv ("CBOR::XS::Tagged" , 1);	350	: gv_stashpv ("CBOR::XS::Tagged" , 1);
265		351
		352	HV *stash = SvSTASH (sv);
		353	GV *method;
		354
266	if (SvSTASH (sv) == boolean_stash)	355	if (stash == boolean_stash)
267	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	356	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		357	else if (stash == error_stash)
		358	encode_ch (enc, 0xe0 \| 23);
268	else if (SvSTASH (sv) == tagged_stash)	359	else if (stash == tagged_stash)
269	{	360	{
270	if (svt != SVt_PVAV)	361	if (svt != SVt_PVAV)
271	croak ("encountered CBOR::XS::Tagged object that isn't an array");	362	croak ("encountered CBOR::XS::Tagged object that isn't an array");
272		363
273	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	364	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
274	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	365	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
275	}	366	}
		367	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		368	{
		369	dSP;
		370
		371	ENTER; SAVETMPS; PUSHMARK (SP);
		372	// we re-bless the reference to get overload and other niceties right
		373	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		374
		375	PUTBACK;
		376	// G_SCALAR ensures that return value is 1
		377	call_sv ((SV *)GvCV (method), G_SCALAR);
		378	SPAGAIN;
		379
		380	// catch this surprisingly common error
		381	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		382	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		383
		384	encode_sv (enc, POPs);
		385
		386	PUTBACK;
		387
		388	FREETMPS; LEAVE;
		389	}
		390	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		391	{
		392	dSP;
		393
		394	ENTER; SAVETMPS; PUSHMARK (SP);
		395	EXTEND (SP, 2);
		396	// we re-bless the reference to get overload and other niceties right
		397	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		398	PUSHs (sv_cbor);
		399
		400	PUTBACK;
		401	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		402	SPAGAIN;
		403
		404	// catch this surprisingly common error
		405	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		406	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		407
		408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		409	encode_uint (enc, 0x80, count + 1);
		410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		411
		412	while (count)
		413	encode_sv (enc, SP[1 - count--]);
		414
		415	PUTBACK;
		416
		417	FREETMPS; LEAVE;
		418	}
276	else	419	else
277	{
278	// we re-bless the reference to get overload and other niceties right
279	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
280
281	if (to_cbor)
282	{
283	dSP;
284
285	ENTER; SAVETMPS; PUSHMARK (SP);
286	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
287
288	// calling with G_SCALAR ensures that we always get a 1 return value
289	PUTBACK;
290	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
291	SPAGAIN;
292
293	// catch this surprisingly common error
294	if (SvROK (TOPs) && SvRV (TOPs) == sv)
295	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
296
297	sv = POPs;
298	PUTBACK;
299
300	encode_sv (enc, sv);
301
302	FREETMPS; LEAVE;
303	}
304	else
305	croak ("encountered object '%s', but no TO_CBOR method available on it",	420	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
306	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	421	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307	}
308	}	422	}
309	else if (svt == SVt_PVHV)	423	else if (svt == SVt_PVHV)
310	encode_hv (enc, (HV *)sv);	424	encode_hv (enc, (HV *)sv);
311	else if (svt == SVt_PVAV)	425	else if (svt == SVt_PVAV)
312	encode_av (enc, (AV *)sv);	426	encode_av (enc, (AV *)sv);
313	else if (svt < SVt_PVAV)
314	{
315	STRLEN len = 0;
316	char *pv = svt ? SvPV (sv, len) : 0;
317
318	if (len == 1 && *pv == '1')
319	encode_ch (enc, 0xe0 \| 21);
320	else if (len == 1 && *pv == '0')
321	encode_ch (enc, 0xe0 \| 20);
322	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
323	encode_ch (enc, 0xe0 \| 23);
324	else
325	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
326	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
327	}
328	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
329	encode_ch (enc, 0xe0 \| 23);
330	else	427	else
331	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	428	{
332	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	429	encode_tag (enc, CBOR_TAG_INDIRECTION);
		430	encode_sv (enc, sv);
		431	}
333	}	432	}
334		433
335	static void	434	static void
336	encode_nv (enc_t enc, SV sv)	435	encode_nv (enc_t enc, SV sv)
337	{	436	{
…		…
402	}	501	}
403		502
404	static SV *	503	static SV *
405	encode_cbor (SV scalar, CBOR cbor)	504	encode_cbor (SV scalar, CBOR cbor)
406	{	505	{
407	enc_t enc;	506	enc_t enc = { };
408		507
409	enc.cbor = *cbor;	508	enc.cbor = *cbor;
410	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	509	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
411	enc.cur = SvPVX (enc.sv);	510	enc.cur = SvPVX (enc.sv);
412	enc.end = SvEND (enc.sv);	511	enc.end = SvEND (enc.sv);
413	enc.depth = 0;
414		512
415	SvPOK_only (enc.sv);	513	SvPOK_only (enc.sv);
		514
		515	if (cbor->flags & F_ALLOW_STRINGREF)
		516	{
		517	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		518	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		519	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		520	}
		521
416	encode_sv (&enc, scalar);	522	encode_sv (&enc, scalar);
417		523
418	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	524	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
419	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	525	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
420		526
…		…
434	U8 *end; // end of input string	540	U8 *end; // end of input string
435	const char *err; // parse error, if != 0	541	const char *err; // parse error, if != 0
436	CBOR cbor;	542	CBOR cbor;
437	U32 depth; // recursion depth	543	U32 depth; // recursion depth
438	U32 maxdepth; // recursion depth limit	544	U32 maxdepth; // recursion depth limit
		545	AV *shareable;
		546	AV *stringref;
439	} dec_t;	547	} dec_t;
440		548
441	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	549	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
442		550
443	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	551	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
537	SvREFCNT_dec (av);	645	SvREFCNT_dec (av);
538	DEC_DEC_DEPTH;	646	DEC_DEC_DEPTH;
539	return &PL_sv_undef;	647	return &PL_sv_undef;
540	}	648	}
541		649
		650	static void
		651	decode_he (dec_t dec, HV hv)
		652	{
		653	// for speed reasons, we specialcase single-string
		654	// byte or utf-8 strings as keys, but only when !stringref
		655
		656	if (ecb_expect_true (!dec->stringref))
		657	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		658	{
		659	I32 len = decode_uint (dec);
		660	char key = (char )dec->cur;
		661
		662	dec->cur += len;
		663
		664	if (ecb_expect_false (dec->stringref))
		665	av_push (dec->stringref, newSVpvn (key, len));
		666
		667	hv_store (hv, key, len, decode_sv (dec), 0);
		668
		669	return;
		670	}
		671	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		672	{
		673	I32 len = decode_uint (dec);
		674	char key = (char )dec->cur;
		675
		676	dec->cur += len;
		677
		678	if (ecb_expect_false (dec->stringref))
		679	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		680
		681	hv_store (hv, key, -len, decode_sv (dec), 0);
		682
		683	return;
		684	}
		685
		686	SV *k = decode_sv (dec);
		687	SV *v = decode_sv (dec);
		688
		689	hv_store_ent (hv, k, v, 0);
		690	SvREFCNT_dec (k);
		691	}
		692
542	static SV *	693	static SV *
543	decode_hv (dec_t *dec)	694	decode_hv (dec_t *dec)
544	{	695	{
545	HV *hv = newHV ();	696	HV *hv = newHV ();
546		697
…		…
558	{	709	{
559	++dec->cur;	710	++dec->cur;
560	break;	711	break;
561	}	712	}
562		713
563	SV *k = decode_sv (dec);	714	decode_he (dec, hv);
564	SV *v = decode_sv (dec);
565
566	hv_store_ent (hv, k, v, 0);
567	}	715	}
568	}	716	}
569	else	717	else
570	{	718	{
571	int len = decode_uint (dec);	719	int pairs = decode_uint (dec);
572		720
573	while (len--)	721	while (pairs--)
574	{	722	decode_he (dec, hv);
575	SV *k = decode_sv (dec);
576	SV *v = decode_sv (dec);
577
578	hv_store_ent (hv, k, v, 0);
579	}
580	}	723	}
581		724
582	DEC_DEC_DEPTH;	725	DEC_DEC_DEPTH;
583	return newRV_noinc ((SV *)hv);	726	return newRV_noinc ((SV *)hv);
584		727
…		…
618	STRLEN len = decode_uint (dec);	761	STRLEN len = decode_uint (dec);
619		762
620	WANT (len);	763	WANT (len);
621	sv = newSVpvn (dec->cur, len);	764	sv = newSVpvn (dec->cur, len);
622	dec->cur += len;	765	dec->cur += len;
		766
		767	if (ecb_expect_false (dec->stringref)
		768	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		769	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
623	}	770	}
624		771
625	if (utf8)	772	if (utf8)
626	SvUTF8_on (sv);	773	SvUTF8_on (sv);
627		774
…		…
633	}	780	}
634		781
635	static SV *	782	static SV *
636	decode_tagged (dec_t *dec)	783	decode_tagged (dec_t *dec)
637	{	784	{
		785	SV *sv = 0;
638	UV tag = decode_uint (dec);	786	UV tag = decode_uint (dec);
		787
		788	WANT (1);
		789
		790	switch (tag)
		791	{
		792	case CBOR_TAG_MAGIC:
		793	sv = decode_sv (dec);
		794	break;
		795
		796	case CBOR_TAG_INDIRECTION:
		797	sv = newRV_noinc (decode_sv (dec));
		798	break;
		799
		800	case CBOR_TAG_STRINGREF_NAMESPACE:
		801	{
		802	ENTER; SAVETMPS;
		803
		804	SAVESPTR (dec->stringref);
		805	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		806
		807	sv = decode_sv (dec);
		808
		809	FREETMPS; LEAVE;
		810	}
		811	break;
		812
		813	case CBOR_TAG_STRINGREF:
		814	{
		815	if ((*dec->cur >> 5) != 0)
		816	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		817
		818	UV idx = decode_uint (dec);
		819
		820	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		821	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		822
		823	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		824	}
		825	break;
		826
		827	case CBOR_TAG_VALUE_SHAREABLE:
		828	{
		829	if (ecb_expect_false (!dec->shareable))
		830	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		831
		832	sv = newSV (0);
		833	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		834
639	SV *sv = decode_sv (dec);	835	SV *osv = decode_sv (dec);
		836	sv_setsv (sv, osv);
		837	SvREFCNT_dec_NN (osv);
		838	}
		839	break;
640		840
641	if (tag == CBOR_TAG_MAGIC) // 2.4.5 Self-Describe CBOR	841	case CBOR_TAG_VALUE_SHAREDREF:
642	return sv;	842	{
		843	if ((*dec->cur >> 5) != 0)
		844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
643		845
		846	UV idx = decode_uint (dec);
		847
		848	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		849	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		850
		851	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		852	}
		853	break;
		854
		855	case CBOR_TAG_PERL_OBJECT:
		856	{
		857	sv = decode_sv (dec);
		858
		859	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		860	ERR ("corrupted CBOR data (non-array perl object)");
		861
		862	AV av = (AV )SvRV (sv);
		863	int len = av_len (av) + 1;
		864	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		865
		866	if (!stash)
		867	ERR ("cannot decode perl-object (package does not exist)");
		868
		869	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		870
		871	if (!method)
		872	ERR ("cannot decode perl-object (package does not have a THAW method)");
		873
		874	dSP;
		875
		876	ENTER; SAVETMPS; PUSHMARK (SP);
		877	EXTEND (SP, len + 1);
		878	// we re-bless the reference to get overload and other niceties right
		879	PUSHs (*av_fetch (av, 0, 1));
		880	PUSHs (sv_cbor);
		881
		882	int i;
		883
		884	for (i = 1; i < len; ++i)
		885	PUSHs (*av_fetch (av, i, 1));
		886
		887	PUTBACK;
		888	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		889	SPAGAIN;
		890
		891	if (SvTRUE (ERRSV))
		892	{
		893	FREETMPS; LEAVE;
		894	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		895	}
		896
		897	SvREFCNT_dec (sv);
		898	sv = SvREFCNT_inc (POPs);
		899
		900	PUTBACK;
		901
		902	FREETMPS; LEAVE;
		903	}
		904	break;
		905
		906	default:
		907	{
		908	sv = decode_sv (dec);
		909
644	AV *av = newAV ();	910	AV *av = newAV ();
645	av_push (av, newSVuv (tag));	911	av_push (av, newSVuv (tag));
646	av_push (av, sv);	912	av_push (av, sv);
647		913
648	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
649	? cbor_tagged_stash	915	? cbor_tagged_stash
650	: gv_stashpv ("CBOR::XS::Tagged" , 1);	916	: gv_stashpv ("CBOR::XS::Tagged" , 1);
651		917
652	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	918	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		919	}
		920	break;
		921	}
		922
		923	return sv;
		924
		925	fail:
		926	SvREFCNT_dec (sv);
		927	return &PL_sv_undef;
653	}	928	}
654		929
655	static SV *	930	static SV *
656	decode_sv (dec_t *dec)	931	decode_sv (dec_t *dec)
657	{	932	{
…		…
676	case 7: // misc	951	case 7: // misc
677	switch (*dec->cur++ & 31)	952	switch (*dec->cur++ & 31)
678	{	953	{
679	case 20:	954	case 20:
680	#if CBOR_SLOW	955	#if CBOR_SLOW
681	cbor_false = get_bool ("CBOR::XS::false");	956	types_false = get_bool ("Types::Serialiser::false");
682	#endif	957	#endif
683	return newSVsv (cbor_false);	958	return newSVsv (types_false);
684	case 21:	959	case 21:
685	#if CBOR_SLOW	960	#if CBOR_SLOW
686	cbor_true = get_bool ("CBOR::XS::true");	961	types_true = get_bool ("Types::Serialiser::true");
687	#endif	962	#endif
688	return newSVsv (cbor_true);	963	return newSVsv (types_true);
689	case 22:	964	case 22:
690	return newSVsv (&PL_sv_undef);	965	return newSVsv (&PL_sv_undef);
		966	case 23:
		967	#if CBOR_SLOW
		968	types_error = get_bool ("Types::Serialiser::error");
		969	#endif
		970	return newSVsv (types_error);
691		971
692	case 25:	972	case 25:
693	{	973	{
694	WANT (2);	974	WANT (2);
695		975
…		…
739	}	1019	}
740		1020
741	static SV *	1021	static SV *
742	decode_cbor (SV string, CBOR cbor, char **offset_return)	1022	decode_cbor (SV string, CBOR cbor, char **offset_return)
743	{	1023	{
744	dec_t dec;	1024	dec_t dec = { };
745	SV *sv;	1025	SV *sv;
		1026	STRLEN len;
		1027	char *data = SvPVbyte (string, len);
746		1028
747	/* work around bugs in 5.10 where manipulating magic values
748	* makes perl ignore the magic in subsequent accesses.
749	* also make a copy of non-PV values, to get them into a clean
750	* state (SvPV should do that, but it's buggy, see below).
751	*/
752	/SvGETMAGIC (string);/
753	if (SvMAGICAL (string) \|\| !SvPOK (string))
754	string = sv_2mortal (newSVsv (string));
755
756	SvUPGRADE (string, SVt_PV);
757
758	/* work around a bug in perl 5.10, which causes SvCUR to fail an
759	* assertion with -DDEBUGGING, although SvCUR is documented to
760	* return the xpv_cur field which certainly exists after upgrading.
761	* according to nicholas clark, calling SvPOK fixes this.
762	* But it doesn't fix it, so try another workaround, call SvPV_nolen
763	* and hope for the best.
764	* Damnit, SvPV_nolen still trips over yet another assertion. This
765	* assertion business is seriously broken, try yet another workaround
766	* for the broken -DDEBUGGING.
767	*/
768	{
769	#ifdef DEBUGGING
770	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
771	#else
772	STRLEN offset = SvCUR (string);
773	#endif
774
775	if (offset > cbor->max_size && cbor->max_size)	1029	if (len > cbor->max_size && cbor->max_size)
776	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1030	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
777	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1031	(unsigned long)len, (unsigned long)cbor->max_size);
778	}
779
780	sv_utf8_downgrade (string, 0);
781		1032
782	dec.cbor = *cbor;	1033	dec.cbor = *cbor;
783	dec.cur = (U8 *)SvPVX (string);	1034	dec.cur = (U8 *)data;
784	dec.end = (U8 *)SvEND (string);	1035	dec.end = (U8 *)data + len;
785	dec.err = 0;
786	dec.depth = 0;
787		1036
788	sv = decode_sv (&dec);	1037	sv = decode_sv (&dec);
789		1038
790	if (offset_return)	1039	if (offset_return)
791	*offset_return = dec.cur;	1040	*offset_return = dec.cur;
…		…
795	dec.err = "garbage after CBOR object";	1044	dec.err = "garbage after CBOR object";
796		1045
797	if (dec.err)	1046	if (dec.err)
798	{	1047	{
799	SvREFCNT_dec (sv);	1048	SvREFCNT_dec (sv);
800	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1049	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
801	}	1050	}
802		1051
803	sv = sv_2mortal (sv);	1052	sv = sv_2mortal (sv);
804		1053
805	return sv;	1054	return sv;
…		…
811	MODULE = CBOR::XS PACKAGE = CBOR::XS	1060	MODULE = CBOR::XS PACKAGE = CBOR::XS
812		1061
813	BOOT:	1062	BOOT:
814	{	1063	{
815	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1064	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
816	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
817	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	1065	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
818		1066
819	cbor_true = get_bool ("CBOR::XS::true");	1067	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
820	cbor_false = get_bool ("CBOR::XS::false");	1068	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1069
		1070	types_true = get_bool ("Types::Serialiser::true" );
		1071	types_false = get_bool ("Types::Serialiser::false");
		1072	types_error = get_bool ("Types::Serialiser::error");
		1073
		1074	sv_cbor = newSVpv ("CBOR", 0);
		1075	SvREADONLY_on (sv_cbor);
821	}	1076	}
822		1077
823	PROTOTYPES: DISABLE	1078	PROTOTYPES: DISABLE
824		1079
825	void CLONE (...)	1080	void CLONE (...)
826	CODE:	1081	CODE:
827	cbor_stash = 0;	1082	cbor_stash = 0;
828	cbor_boolean_stash = 0;
829	cbor_tagged_stash = 0;	1083	cbor_tagged_stash = 0;
		1084	types_error_stash = 0;
		1085	types_boolean_stash = 0;
830		1086
831	void new (char *klass)	1087	void new (char *klass)
832	PPCODE:	1088	PPCODE:
833	{	1089	{
834	SV *pv = NEWSV (0, sizeof (CBOR));	1090	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
842		1098
843	void shrink (CBOR *self, int enable = 1)	1099	void shrink (CBOR *self, int enable = 1)
844	ALIAS:	1100	ALIAS:
845	shrink = F_SHRINK	1101	shrink = F_SHRINK
846	allow_unknown = F_ALLOW_UNKNOWN	1102	allow_unknown = F_ALLOW_UNKNOWN
		1103	allow_sharing = F_ALLOW_SHARING
		1104	allow_stringref = F_ALLOW_STRINGREF
847	PPCODE:	1105	PPCODE:
848	{	1106	{
849	if (enable)	1107	if (enable)
850	self->flags \|= ix;	1108	self->flags \|= ix;
851	else	1109	else
…		…
856		1114
857	void get_shrink (CBOR *self)	1115	void get_shrink (CBOR *self)
858	ALIAS:	1116	ALIAS:
859	get_shrink = F_SHRINK	1117	get_shrink = F_SHRINK
860	get_allow_unknown = F_ALLOW_UNKNOWN	1118	get_allow_unknown = F_ALLOW_UNKNOWN
		1119	get_allow_sharing = F_ALLOW_SHARING
		1120	get_allow_stringref = F_ALLOW_STRINGREF
861	PPCODE:	1121	PPCODE:
862	XPUSHs (boolSV (self->flags & ix));	1122	XPUSHs (boolSV (self->flags & ix));
863		1123
864	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
865	PPCODE:	1125	PPCODE:
…		…
880	int get_max_size (CBOR *self)	1140	int get_max_size (CBOR *self)
881	CODE:	1141	CODE:
882	RETVAL = self->max_size;	1142	RETVAL = self->max_size;
883	OUTPUT:	1143	OUTPUT:
884	RETVAL	1144	RETVAL
885
886	#if 0 //TODO
887
888	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
889	PPCODE:
890	{
891	SvREFCNT_dec (self->cb_object);
892	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
893
894	XPUSHs (ST (0));
895	}
896
897	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
898	PPCODE:
899	{
900	if (!self->cb_sk_object)
901	self->cb_sk_object = newHV ();
902
903	if (SvOK (cb))
904	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
905	else
906	{
907	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
908
909	if (!HvKEYS (self->cb_sk_object))
910	{
911	SvREFCNT_dec (self->cb_sk_object);
912	self->cb_sk_object = 0;
913	}
914	}
915
916	XPUSHs (ST (0));
917	}
918
919	#endif
920		1145
921	void encode (CBOR self, SV scalar)	1146	void encode (CBOR self, SV scalar)
922	PPCODE:	1147	PPCODE:
923	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1148	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
924	XPUSHs (scalar);	1149	XPUSHs (scalar);
…		…
937	EXTEND (SP, 2);	1162	EXTEND (SP, 2);
938	PUSHs (sv);	1163	PUSHs (sv);
939	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1164	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
940	}	1165	}
941		1166
942	#if 0
943
944	void DESTROY (CBOR *self)
945	CODE:
946	SvREFCNT_dec (self->cb_sk_object);
947	SvREFCNT_dec (self->cb_object);
948
949	#endif
950
951	PROTOTYPES: ENABLE	1167	PROTOTYPES: ENABLE
952		1168
953	void encode_cbor (SV *scalar)	1169	void encode_cbor (SV *scalar)
954	PPCODE:	1170	PPCODE:
955	{	1171	{

Diff Legend

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

Comparing cvsroot/CBOR-XS/XS.xs (file contents): Revision 1.8 by root, Sun Oct 27 10:12:01 2013 UTC vs. Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

Diff Legend

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC