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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.24 by root, Wed Nov 20 16:29:02 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	// 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
14	// known tags	25	// known tags
15	enum cbor_tag	26	enum cbor_tag
16	{	27	{
17	// inofficial extensions (pending iana registration)	28	// inofficial extensions (pending iana registration)
18	CBOR_TAG_PERL_OBJECT = 256,	29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
19	CBOR_TAG_GENERIC_OBJECT = 257,	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
20		36
21	// rfc7049	37	// rfc7049
22	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
23	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
24	CBOR_TAG_POS_BIGNUM = 2, // byte string	40	CBOR_TAG_POS_BIGNUM = 2, // byte string
…		…
38	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
39		55
40	CBOR_TAG_MAGIC = 55799 // self-describe cbor	56	CBOR_TAG_MAGIC = 55799 // self-describe cbor
41	};	57	};
42		58
43	#define F_SHRINK 0x00000200UL	59	#define F_SHRINK 0x00000001UL
44	#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
45		63
46	#define INIT_SIZE 32 // initial scalar size to be allocated	64	#define INIT_SIZE 32 // initial scalar size to be allocated
47		65
48	#define SB do {	66	#define SB do {
49	#define SE } while (0)	67	#define SE } while (0)
…		…
60	#else	78	#else
61	# define CBOR_SLOW 0	79	# define CBOR_SLOW 0
62	# define CBOR_STASH cbor_stash	80	# define CBOR_STASH cbor_stash
63	#endif	81	#endif
64		82
65	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::
66	static SV cbor_true, cbor_false;	84	static SV types_true, types_false, types_error, sv_cbor;
67		85
68	typedef struct {	86	typedef struct {
69	U32 flags;	87	U32 flags;
70	U32 max_depth;	88	U32 max_depth;
71	STRLEN max_size;	89	STRLEN max_size;
…		…
105	SvPV_renew (sv, SvCUR (sv) + 1);	123	SvPV_renew (sv, SvCUR (sv) + 1);
106	#endif	124	#endif
107	}	125	}
108	}	126	}
109		127
110	/////////////////////////////////////////////////////////////////////////////	128	// minimum length of a string to be registered for stringref
111	// fp hell	129	ecb_inline int
112		130	minimum_string_length (UV idx)
113	//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	}
114		142
115	/////////////////////////////////////////////////////////////////////////////	143	/////////////////////////////////////////////////////////////////////////////
116	// encoder	144	// encoder
117		145
118	// structure used for encoding CBOR	146	// structure used for encoding CBOR
…		…
121	char *cur; // SvPVX (sv) + current output position	149	char *cur; // SvPVX (sv) + current output position
122	char *end; // SvEND (sv)	150	char *end; // SvEND (sv)
123	SV *sv; // result scalar	151	SV *sv; // result scalar
124	CBOR cbor;	152	CBOR cbor;
125	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;
126	} enc_t;	158	} enc_t;
127		159
128	ecb_inline void	160	ecb_inline void
129	need (enc_t *enc, STRLEN len)	161	need (enc_t *enc, STRLEN len)
130	{	162	{
…		…
182	*enc->cur++ = len >> 8;	214	*enc->cur++ = len >> 8;
183	*enc->cur++ = len;	215	*enc->cur++ = len;
184	}	216	}
185	}	217	}
186		218
		219	ecb_inline void
		220	encode_tag (enc_t *enc, UV tag)
		221	{
		222	encode_uint (enc, 0xc0, tag);
		223	}
		224
187	static void	225	static void
188	encode_str (enc_t enc, int utf8, char str, STRLEN len)	226	encode_str (enc_t enc, int utf8, char str, STRLEN len)
189	{	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
190	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
191	need (enc, len);	248	need (enc, len);
192	memcpy (enc->cur, str, len);	249	memcpy (enc->cur, str, len);
193	enc->cur += len;	250	enc->cur += len;
194	}	251	}
…		…
214	}	271	}
215		272
216	--enc->depth;	273	--enc->depth;
217	}	274	}
218		275
		276	ecb_inline void
		277	encode_he (enc_t enc, HE he)
		278	{
		279	}
		280
219	static void	281	static void
220	encode_hv (enc_t enc, HV hv)	282	encode_hv (enc_t enc, HV hv)
221	{	283	{
222	HE *he;	284	HE *he;
223		285
…		…
252		314
253	// encode objects, arrays and special \0=false and \1=true values.	315	// encode objects, arrays and special \0=false and \1=true values.
254	static void	316	static void
255	encode_rv (enc_t enc, SV sv)	317	encode_rv (enc_t enc, SV sv)
256	{	318	{
257	svtype svt;
258
259	SvGETMAGIC (sv);	319	SvGETMAGIC (sv);
		320
		321	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		322	&& ecb_expect_false (SvREFCNT (sv) > 1))
		323	{
		324	if (!enc->shareable)
		325	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		326
		327	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		328
		329	if (SvOK (*svp))
		330	{
		331	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		332	encode_uint (enc, 0x00, SvUV (*svp));
		333	return;
		334	}
		335	else
		336	{
		337	sv_setuv (*svp, enc->shareable_idx);
		338	++enc->shareable_idx;
		339	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		340	}
		341	}
		342
260	svt = SvTYPE (sv);	343	svtype svt = SvTYPE (sv);
261		344
262	if (ecb_expect_false (SvOBJECT (sv)))	345	if (ecb_expect_false (SvOBJECT (sv)))
263	{	346	{
264	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	347	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? cbor_boolean_stash	348	? types_boolean_stash
266	: gv_stashpv ("CBOR::XS::Boolean", 1);	349	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		350	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		351	? types_error_stash
		352	: gv_stashpv ("Types::Serialiser::Error", 1);
267	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	353	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
268	? cbor_tagged_stash	354	? cbor_tagged_stash
269	: gv_stashpv ("CBOR::XS::Tagged" , 1);	355	: gv_stashpv ("CBOR::XS::Tagged" , 1);
270		356
		357	HV *stash = SvSTASH (sv);
		358	GV *method;
		359
271	if (SvSTASH (sv) == boolean_stash)	360	if (stash == boolean_stash)
272	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	361	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		362	else if (stash == error_stash)
		363	encode_ch (enc, 0xe0 \| 23);
273	else if (SvSTASH (sv) == tagged_stash)	364	else if (stash == tagged_stash)
274	{	365	{
275	if (svt != SVt_PVAV)	366	if (svt != SVt_PVAV)
276	croak ("encountered CBOR::XS::Tagged object that isn't an array");	367	croak ("encountered CBOR::XS::Tagged object that isn't an array");
277		368
278	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	369	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
279	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	370	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
280	}	371	}
		372	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		373	{
		374	dSP;
		375
		376	ENTER; SAVETMPS; PUSHMARK (SP);
		377	// we re-bless the reference to get overload and other niceties right
		378	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		379
		380	PUTBACK;
		381	// G_SCALAR ensures that return value is 1
		382	call_sv ((SV *)GvCV (method), G_SCALAR);
		383	SPAGAIN;
		384
		385	// catch this surprisingly common error
		386	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		387	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		388
		389	encode_sv (enc, POPs);
		390
		391	PUTBACK;
		392
		393	FREETMPS; LEAVE;
		394	}
		395	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		396	{
		397	dSP;
		398
		399	ENTER; SAVETMPS; PUSHMARK (SP);
		400	EXTEND (SP, 2);
		401	// we re-bless the reference to get overload and other niceties right
		402	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		403	PUSHs (sv_cbor);
		404
		405	PUTBACK;
		406	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		407	SPAGAIN;
		408
		409	// catch this surprisingly common error
		410	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		411	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		412
		413	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		414	encode_uint (enc, 0x80, count + 1);
		415	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		416
		417	while (count)
		418	encode_sv (enc, SP[1 - count--]);
		419
		420	PUTBACK;
		421
		422	FREETMPS; LEAVE;
		423	}
281	else	424	else
282	{
283	// we re-bless the reference to get overload and other niceties right
284	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
285
286	if (to_cbor)
287	{
288	dSP;
289
290	ENTER; SAVETMPS; PUSHMARK (SP);
291	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
292
293	// calling with G_SCALAR ensures that we always get a 1 return value
294	PUTBACK;
295	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
296	SPAGAIN;
297
298	// catch this surprisingly common error
299	if (SvROK (TOPs) && SvRV (TOPs) == sv)
300	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
301
302	sv = POPs;
303	PUTBACK;
304
305	encode_sv (enc, sv);
306
307	FREETMPS; LEAVE;
308	}
309	else
310	croak ("encountered object '%s', but no TO_CBOR method available on it",	425	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	426	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312	}
313	}	427	}
314	else if (svt == SVt_PVHV)	428	else if (svt == SVt_PVHV)
315	encode_hv (enc, (HV *)sv);	429	encode_hv (enc, (HV *)sv);
316	else if (svt == SVt_PVAV)	430	else if (svt == SVt_PVAV)
317	encode_av (enc, (AV *)sv);	431	encode_av (enc, (AV *)sv);
318	else if (svt < SVt_PVAV)
319	{
320	STRLEN len = 0;
321	char *pv = svt ? SvPV (sv, len) : 0;
322
323	if (len == 1 && *pv == '1')
324	encode_ch (enc, 0xe0 \| 21);
325	else if (len == 1 && *pv == '0')
326	encode_ch (enc, 0xe0 \| 20);
327	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
328	encode_ch (enc, 0xe0 \| 23);
329	else
330	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
331	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
332	}
333	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
334	encode_ch (enc, 0xe0 \| 23);
335	else	432	else
336	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	433	{
337	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	434	encode_tag (enc, CBOR_TAG_INDIRECTION);
		435	encode_sv (enc, sv);
		436	}
338	}	437	}
339		438
340	static void	439	static void
341	encode_nv (enc_t enc, SV sv)	440	encode_nv (enc_t enc, SV sv)
342	{	441	{
…		…
407	}	506	}
408		507
409	static SV *	508	static SV *
410	encode_cbor (SV scalar, CBOR cbor)	509	encode_cbor (SV scalar, CBOR cbor)
411	{	510	{
412	enc_t enc;	511	enc_t enc = { };
413		512
414	enc.cbor = *cbor;	513	enc.cbor = *cbor;
415	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	514	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
416	enc.cur = SvPVX (enc.sv);	515	enc.cur = SvPVX (enc.sv);
417	enc.end = SvEND (enc.sv);	516	enc.end = SvEND (enc.sv);
418	enc.depth = 0;
419		517
420	SvPOK_only (enc.sv);	518	SvPOK_only (enc.sv);
		519
		520	if (cbor->flags & F_ALLOW_STRINGREF)
		521	{
		522	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		523	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		524	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		525	}
		526
421	encode_sv (&enc, scalar);	527	encode_sv (&enc, scalar);
422		528
423	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	529	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
424	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	530	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
425		531
…		…
439	U8 *end; // end of input string	545	U8 *end; // end of input string
440	const char *err; // parse error, if != 0	546	const char *err; // parse error, if != 0
441	CBOR cbor;	547	CBOR cbor;
442	U32 depth; // recursion depth	548	U32 depth; // recursion depth
443	U32 maxdepth; // recursion depth limit	549	U32 maxdepth; // recursion depth limit
		550	AV *shareable;
		551	AV *stringref;
444	} dec_t;	552	} dec_t;
445		553
446	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	554	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
447		555
448	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	556	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
542	SvREFCNT_dec (av);	650	SvREFCNT_dec (av);
543	DEC_DEC_DEPTH;	651	DEC_DEC_DEPTH;
544	return &PL_sv_undef;	652	return &PL_sv_undef;
545	}	653	}
546		654
		655	static void
		656	decode_he (dec_t dec, HV hv)
		657	{
		658	// for speed reasons, we specialcase single-string
		659	// byte or utf-8 strings as keys, but only when !stringref
		660
		661	if (ecb_expect_true (!dec->stringref))
		662	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		663	{
		664	I32 len = decode_uint (dec);
		665	char key = (char )dec->cur;
		666
		667	dec->cur += len;
		668
		669	if (ecb_expect_false (dec->stringref))
		670	av_push (dec->stringref, newSVpvn (key, len));
		671
		672	hv_store (hv, key, len, decode_sv (dec), 0);
		673
		674	return;
		675	}
		676	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		677	{
		678	I32 len = decode_uint (dec);
		679	char key = (char )dec->cur;
		680
		681	dec->cur += len;
		682
		683	if (ecb_expect_false (dec->stringref))
		684	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		685
		686	hv_store (hv, key, -len, decode_sv (dec), 0);
		687
		688	return;
		689	}
		690
		691	SV *k = decode_sv (dec);
		692	SV *v = decode_sv (dec);
		693
		694	hv_store_ent (hv, k, v, 0);
		695	SvREFCNT_dec (k);
		696	}
		697
547	static SV *	698	static SV *
548	decode_hv (dec_t *dec)	699	decode_hv (dec_t *dec)
549	{	700	{
550	HV *hv = newHV ();	701	HV *hv = newHV ();
551		702
…		…
563	{	714	{
564	++dec->cur;	715	++dec->cur;
565	break;	716	break;
566	}	717	}
567		718
568	SV *k = decode_sv (dec);	719	decode_he (dec, hv);
569	SV *v = decode_sv (dec);
570
571	hv_store_ent (hv, k, v, 0);
572	}	720	}
573	}	721	}
574	else	722	else
575	{	723	{
576	int len = decode_uint (dec);	724	int pairs = decode_uint (dec);
577		725
578	while (len--)	726	while (pairs--)
579	{	727	decode_he (dec, hv);
580	SV *k = decode_sv (dec);
581	SV *v = decode_sv (dec);
582
583	hv_store_ent (hv, k, v, 0);
584	}
585	}	728	}
586		729
587	DEC_DEC_DEPTH;	730	DEC_DEC_DEPTH;
588	return newRV_noinc ((SV *)hv);	731	return newRV_noinc ((SV *)hv);
589		732
…		…
628	}	771	}
629		772
630	if (utf8)	773	if (utf8)
631	SvUTF8_on (sv);	774	SvUTF8_on (sv);
632		775
		776	if (ecb_expect_false (dec->stringref)
		777	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		778	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
		779
633	return sv;	780	return sv;
634		781
635	fail:	782	fail:
636	SvREFCNT_dec (sv);	783	SvREFCNT_dec (sv);
637	return &PL_sv_undef;	784	return &PL_sv_undef;
638	}	785	}
639		786
640	static SV *	787	static SV *
641	decode_tagged (dec_t *dec)	788	decode_tagged (dec_t *dec)
642	{	789	{
		790	SV *sv = 0;
643	UV tag = decode_uint (dec);	791	UV tag = decode_uint (dec);
		792
		793	WANT (1);
		794
		795	switch (tag)
		796	{
		797	case CBOR_TAG_MAGIC:
		798	sv = decode_sv (dec);
		799	break;
		800
		801	case CBOR_TAG_INDIRECTION:
		802	sv = newRV_noinc (decode_sv (dec));
		803	break;
		804
		805	case CBOR_TAG_STRINGREF_NAMESPACE:
		806	{
		807	ENTER; SAVETMPS;
		808
		809	SAVESPTR (dec->stringref);
		810	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		811
		812	sv = decode_sv (dec);
		813
		814	FREETMPS; LEAVE;
		815	}
		816	break;
		817
		818	case CBOR_TAG_STRINGREF:
		819	{
		820	if ((*dec->cur >> 5) != 0)
		821	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		822
		823	UV idx = decode_uint (dec);
		824
		825	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		826	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		827
		828	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		829	}
		830	break;
		831
		832	case CBOR_TAG_VALUE_SHAREABLE:
		833	{
		834	if (ecb_expect_false (!dec->shareable))
		835	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		836
		837	sv = newSV (0);
		838	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		839
644	SV *sv = decode_sv (dec);	840	SV *osv = decode_sv (dec);
		841	sv_setsv (sv, osv);
		842	SvREFCNT_dec_NN (osv);
		843	}
		844	break;
645		845
646	if (tag == CBOR_TAG_MAGIC)	846	case CBOR_TAG_VALUE_SHAREDREF:
647	return sv;	847	{
		848	if ((*dec->cur >> 5) != 0)
		849	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
648		850
649	if (tag == CBOR_TAG_PERL_OBJECT)	851	UV idx = decode_uint (dec);
650	{	852
		853	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		854	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		855
		856	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		857	}
		858	break;
		859
		860	case CBOR_TAG_PERL_OBJECT:
		861	{
		862	sv = decode_sv (dec);
		863
651	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	864	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
652	ERR ("corrupted CBOR data (non-array perl object)");	865	ERR ("corrupted CBOR data (non-array perl object)");
		866
		867	AV av = (AV )SvRV (sv);
		868	int len = av_len (av) + 1;
		869	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		870
		871	if (!stash)
		872	ERR ("cannot decode perl-object (package does not exist)");
		873
		874	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		875
		876	if (!method)
		877	ERR ("cannot decode perl-object (package does not have a THAW method)");
		878
		879	dSP;
		880
		881	ENTER; SAVETMPS; PUSHMARK (SP);
		882	EXTEND (SP, len + 1);
		883	// we re-bless the reference to get overload and other niceties right
		884	PUSHs (*av_fetch (av, 0, 1));
		885	PUSHs (sv_cbor);
		886
		887	int i;
		888
		889	for (i = 1; i < len; ++i)
		890	PUSHs (*av_fetch (av, i, 1));
		891
		892	PUTBACK;
		893	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		894	SPAGAIN;
		895
		896	if (SvTRUE (ERRSV))
		897	{
		898	FREETMPS; LEAVE;
		899	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		900	}
		901
		902	SvREFCNT_dec (sv);
		903	sv = SvREFCNT_inc (POPs);
		904
		905	PUTBACK;
		906
		907	FREETMPS; LEAVE;
653		908	}
654	// TODO	909	break;
655	}
656		910
		911	default:
		912	{
		913	sv = decode_sv (dec);
		914
657	AV *av = newAV ();	915	AV *av = newAV ();
658	av_push (av, newSVuv (tag));	916	av_push (av, newSVuv (tag));
659	av_push (av, sv);	917	av_push (av, sv);
660		918
661	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	919	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
662	? cbor_tagged_stash	920	? cbor_tagged_stash
663	: gv_stashpv ("CBOR::XS::Tagged" , 1);	921	: gv_stashpv ("CBOR::XS::Tagged" , 1);
664		922
665	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	923	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		924	}
		925	break;
		926	}
		927
		928	return sv;
666		929
667	fail:	930	fail:
668	SvREFCNT_dec (sv);	931	SvREFCNT_dec (sv);
669	return &PL_sv_undef;	932	return &PL_sv_undef;
670	}	933	}
…		…
693	case 7: // misc	956	case 7: // misc
694	switch (*dec->cur++ & 31)	957	switch (*dec->cur++ & 31)
695	{	958	{
696	case 20:	959	case 20:
697	#if CBOR_SLOW	960	#if CBOR_SLOW
698	cbor_false = get_bool ("CBOR::XS::false");	961	types_false = get_bool ("Types::Serialiser::false");
699	#endif	962	#endif
700	return newSVsv (cbor_false);	963	return newSVsv (types_false);
701	case 21:	964	case 21:
702	#if CBOR_SLOW	965	#if CBOR_SLOW
703	cbor_true = get_bool ("CBOR::XS::true");	966	types_true = get_bool ("Types::Serialiser::true");
704	#endif	967	#endif
705	return newSVsv (cbor_true);	968	return newSVsv (types_true);
706	case 22:	969	case 22:
707	return newSVsv (&PL_sv_undef);	970	return newSVsv (&PL_sv_undef);
		971	case 23:
		972	#if CBOR_SLOW
		973	types_error = get_bool ("Types::Serialiser::error");
		974	#endif
		975	return newSVsv (types_error);
708		976
709	case 25:	977	case 25:
710	{	978	{
711	WANT (2);	979	WANT (2);
712		980
…		…
756	}	1024	}
757		1025
758	static SV *	1026	static SV *
759	decode_cbor (SV string, CBOR cbor, char **offset_return)	1027	decode_cbor (SV string, CBOR cbor, char **offset_return)
760	{	1028	{
761	dec_t dec;	1029	dec_t dec = { };
762	SV *sv;	1030	SV *sv;
		1031	STRLEN len;
		1032	char *data = SvPVbyte (string, len);
763		1033
764	/* work around bugs in 5.10 where manipulating magic values
765	* makes perl ignore the magic in subsequent accesses.
766	* also make a copy of non-PV values, to get them into a clean
767	* state (SvPV should do that, but it's buggy, see below).
768	*/
769	/SvGETMAGIC (string);/
770	if (SvMAGICAL (string) \|\| !SvPOK (string))
771	string = sv_2mortal (newSVsv (string));
772
773	SvUPGRADE (string, SVt_PV);
774
775	/* work around a bug in perl 5.10, which causes SvCUR to fail an
776	* assertion with -DDEBUGGING, although SvCUR is documented to
777	* return the xpv_cur field which certainly exists after upgrading.
778	* according to nicholas clark, calling SvPOK fixes this.
779	* But it doesn't fix it, so try another workaround, call SvPV_nolen
780	* and hope for the best.
781	* Damnit, SvPV_nolen still trips over yet another assertion. This
782	* assertion business is seriously broken, try yet another workaround
783	* for the broken -DDEBUGGING.
784	*/
785	{
786	#ifdef DEBUGGING
787	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
788	#else
789	STRLEN offset = SvCUR (string);
790	#endif
791
792	if (offset > cbor->max_size && cbor->max_size)	1034	if (len > cbor->max_size && cbor->max_size)
793	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1035	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
794	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1036	(unsigned long)len, (unsigned long)cbor->max_size);
795	}
796
797	sv_utf8_downgrade (string, 0);
798		1037
799	dec.cbor = *cbor;	1038	dec.cbor = *cbor;
800	dec.cur = (U8 *)SvPVX (string);	1039	dec.cur = (U8 *)data;
801	dec.end = (U8 *)SvEND (string);	1040	dec.end = (U8 *)data + len;
802	dec.err = 0;
803	dec.depth = 0;
804		1041
805	sv = decode_sv (&dec);	1042	sv = decode_sv (&dec);
806		1043
807	if (offset_return)	1044	if (offset_return)
808	*offset_return = dec.cur;	1045	*offset_return = dec.cur;
…		…
812	dec.err = "garbage after CBOR object";	1049	dec.err = "garbage after CBOR object";
813		1050
814	if (dec.err)	1051	if (dec.err)
815	{	1052	{
816	SvREFCNT_dec (sv);	1053	SvREFCNT_dec (sv);
817	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1054	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
818	}	1055	}
819		1056
820	sv = sv_2mortal (sv);	1057	sv = sv_2mortal (sv);
821		1058
822	return sv;	1059	return sv;
…		…
828	MODULE = CBOR::XS PACKAGE = CBOR::XS	1065	MODULE = CBOR::XS PACKAGE = CBOR::XS
829		1066
830	BOOT:	1067	BOOT:
831	{	1068	{
832	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1069	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
833	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
834	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	1070	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835		1071
836	cbor_true = get_bool ("CBOR::XS::true");	1072	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837	cbor_false = get_bool ("CBOR::XS::false");	1073	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1074
		1075	types_true = get_bool ("Types::Serialiser::true" );
		1076	types_false = get_bool ("Types::Serialiser::false");
		1077	types_error = get_bool ("Types::Serialiser::error");
		1078
		1079	sv_cbor = newSVpv ("CBOR", 0);
		1080	SvREADONLY_on (sv_cbor);
838	}	1081	}
839		1082
840	PROTOTYPES: DISABLE	1083	PROTOTYPES: DISABLE
841		1084
842	void CLONE (...)	1085	void CLONE (...)
843	CODE:	1086	CODE:
844	cbor_stash = 0;	1087	cbor_stash = 0;
845	cbor_boolean_stash = 0;
846	cbor_tagged_stash = 0;	1088	cbor_tagged_stash = 0;
		1089	types_error_stash = 0;
		1090	types_boolean_stash = 0;
847		1091
848	void new (char *klass)	1092	void new (char *klass)
849	PPCODE:	1093	PPCODE:
850	{	1094	{
851	SV *pv = NEWSV (0, sizeof (CBOR));	1095	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
859		1103
860	void shrink (CBOR *self, int enable = 1)	1104	void shrink (CBOR *self, int enable = 1)
861	ALIAS:	1105	ALIAS:
862	shrink = F_SHRINK	1106	shrink = F_SHRINK
863	allow_unknown = F_ALLOW_UNKNOWN	1107	allow_unknown = F_ALLOW_UNKNOWN
		1108	allow_sharing = F_ALLOW_SHARING
		1109	allow_stringref = F_ALLOW_STRINGREF
864	PPCODE:	1110	PPCODE:
865	{	1111	{
866	if (enable)	1112	if (enable)
867	self->flags \|= ix;	1113	self->flags \|= ix;
868	else	1114	else
…		…
873		1119
874	void get_shrink (CBOR *self)	1120	void get_shrink (CBOR *self)
875	ALIAS:	1121	ALIAS:
876	get_shrink = F_SHRINK	1122	get_shrink = F_SHRINK
877	get_allow_unknown = F_ALLOW_UNKNOWN	1123	get_allow_unknown = F_ALLOW_UNKNOWN
		1124	get_allow_sharing = F_ALLOW_SHARING
		1125	get_allow_stringref = F_ALLOW_STRINGREF
878	PPCODE:	1126	PPCODE:
879	XPUSHs (boolSV (self->flags & ix));	1127	XPUSHs (boolSV (self->flags & ix));
880		1128
881	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1129	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
882	PPCODE:	1130	PPCODE:
…		…
897	int get_max_size (CBOR *self)	1145	int get_max_size (CBOR *self)
898	CODE:	1146	CODE:
899	RETVAL = self->max_size;	1147	RETVAL = self->max_size;
900	OUTPUT:	1148	OUTPUT:
901	RETVAL	1149	RETVAL
902
903	#if 0 //TODO
904
905	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
906	PPCODE:
907	{
908	SvREFCNT_dec (self->cb_object);
909	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
910
911	XPUSHs (ST (0));
912	}
913
914	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
915	PPCODE:
916	{
917	if (!self->cb_sk_object)
918	self->cb_sk_object = newHV ();
919
920	if (SvOK (cb))
921	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
922	else
923	{
924	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
925
926	if (!HvKEYS (self->cb_sk_object))
927	{
928	SvREFCNT_dec (self->cb_sk_object);
929	self->cb_sk_object = 0;
930	}
931	}
932
933	XPUSHs (ST (0));
934	}
935
936	#endif
937		1150
938	void encode (CBOR self, SV scalar)	1151	void encode (CBOR self, SV scalar)
939	PPCODE:	1152	PPCODE:
940	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1153	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
941	XPUSHs (scalar);	1154	XPUSHs (scalar);
…		…
954	EXTEND (SP, 2);	1167	EXTEND (SP, 2);
955	PUSHs (sv);	1168	PUSHs (sv);
956	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1169	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
957	}	1170	}
958		1171
959	#if 0
960
961	void DESTROY (CBOR *self)
962	CODE:
963	SvREFCNT_dec (self->cb_sk_object);
964	SvREFCNT_dec (self->cb_object);
965
966	#endif
967
968	PROTOTYPES: ENABLE	1172	PROTOTYPES: ENABLE
969		1173
970	void encode_cbor (SV *scalar)	1174	void encode_cbor (SV *scalar)
971	PPCODE:	1175	PPCODE:
972	{	1176	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs. Revision 1.24 by root, Wed Nov 20 16:29:02 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.24 by root, Wed Nov 20 16:29:02 2013 UTC