[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.20 by root, Wed Nov 20 11:06:42 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_DEDUP_STRINGS 0x00000008UL //TODO
		63	#define F_DEDUP_KEYS 0x00000010UL //TODO
45		64
46	#define INIT_SIZE 32 // initial scalar size to be allocated	65	#define INIT_SIZE 32 // initial scalar size to be allocated
47		66
48	#define SB do {	67	#define SB do {
49	#define SE } while (0)	68	#define SE } while (0)
…		…
60	#else	79	#else
61	# define CBOR_SLOW 0	80	# define CBOR_SLOW 0
62	# define CBOR_STASH cbor_stash	81	# define CBOR_STASH cbor_stash
63	#endif	82	#endif
64		83
65	static HV cbor_stash, cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::	84	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
66	static SV cbor_true, cbor_false;	85	static SV types_true, types_false, types_error, sv_cbor;
67		86
68	typedef struct {	87	typedef struct {
69	U32 flags;	88	U32 flags;
70	U32 max_depth;	89	U32 max_depth;
71	STRLEN max_size;	90	STRLEN max_size;
…		…
106	#endif	125	#endif
107	}	126	}
108	}	127	}
109		128
110	/////////////////////////////////////////////////////////////////////////////	129	/////////////////////////////////////////////////////////////////////////////
111	// fp hell
112
113	//TODO
114
115	/////////////////////////////////////////////////////////////////////////////
116	// encoder	130	// encoder
117		131
118	// structure used for encoding CBOR	132	// structure used for encoding CBOR
119	typedef struct	133	typedef struct
120	{	134	{
121	char *cur; // SvPVX (sv) + current output position	135	char *cur; // SvPVX (sv) + current output position
122	char *end; // SvEND (sv)	136	char *end; // SvEND (sv)
123	SV *sv; // result scalar	137	SV *sv; // result scalar
124	CBOR cbor;	138	CBOR cbor;
125	U32 depth; // recursion level	139	U32 depth; // recursion level
		140	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		141	UV stringref_idx;
		142	HV *shareable; // ptr => index, or 0
		143	UV shareable_idx;
126	} enc_t;	144	} enc_t;
127		145
128	ecb_inline void	146	ecb_inline void
129	need (enc_t *enc, STRLEN len)	147	need (enc_t *enc, STRLEN len)
130	{	148	{
…		…
191	need (enc, len);	209	need (enc, len);
192	memcpy (enc->cur, str, len);	210	memcpy (enc->cur, str, len);
193	enc->cur += len;	211	enc->cur += len;
194	}	212	}
195		213
		214	ecb_inline void
		215	encode_tag (enc_t *enc, UV tag)
		216	{
		217	encode_uint (enc, 0xc0, tag);
		218	}
		219
196	static void encode_sv (enc_t enc, SV sv);	220	static void encode_sv (enc_t enc, SV sv);
197		221
198	static void	222	static void
199	encode_av (enc_t enc, AV av)	223	encode_av (enc_t enc, AV av)
200	{	224	{
…		…
212	SV **svp = av_fetch (av, i, 0);	236	SV **svp = av_fetch (av, i, 0);
213	encode_sv (enc, svp ? *svp : &PL_sv_undef);	237	encode_sv (enc, svp ? *svp : &PL_sv_undef);
214	}	238	}
215		239
216	--enc->depth;	240	--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));
217	}	250	}
218		251
219	static void	252	static void
220	encode_hv (enc_t enc, HV hv)	253	encode_hv (enc_t enc, HV hv)
221	{	254	{
…		…
234	else	267	else
235	encode_uint (enc, 0xa0, pairs);	268	encode_uint (enc, 0xa0, pairs);
236		269
237	while ((he = hv_iternext (hv)))	270	while ((he = hv_iternext (hv)))
238	{	271	{
		272	if (ecb_expect_false (enc->cbor.flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS)))
		273	{
		274	SV **svp;
		275
239	if (HeKLEN (he) == HEf_SVKEY)	276	if (HeKLEN (he) == HEf_SVKEY)
240	encode_sv (enc, HeSVKEY (he));	277	svp = hv_fetch_ent (enc->stringref[!! SvUTF8 (HeSVKEY (he))], HeSVKEY (he) , 1, 0);//TODO return 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	}
241	else	293	else
242	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	294	encode_he (enc, he);
243		295
244	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	296	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
245	}	297	}
246		298
247	if (mg)	299	if (mg)
…		…
252		304
253	// encode objects, arrays and special \0=false and \1=true values.	305	// encode objects, arrays and special \0=false and \1=true values.
254	static void	306	static void
255	encode_rv (enc_t enc, SV sv)	307	encode_rv (enc_t enc, SV sv)
256	{	308	{
257	svtype svt;
258
259	SvGETMAGIC (sv);	309	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
260	svt = SvTYPE (sv);	333	svtype svt = SvTYPE (sv);
261		334
262	if (ecb_expect_false (SvOBJECT (sv)))	335	if (ecb_expect_false (SvOBJECT (sv)))
263	{	336	{
264	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	337	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? cbor_boolean_stash	338	? types_boolean_stash
266	: gv_stashpv ("CBOR::XS::Boolean", 1);	339	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		340	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		341	? types_error_stash
		342	: gv_stashpv ("Types::Serialiser::Error", 1);
267	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	343	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
268	? cbor_tagged_stash	344	? cbor_tagged_stash
269	: gv_stashpv ("CBOR::XS::Tagged" , 1);	345	: gv_stashpv ("CBOR::XS::Tagged" , 1);
270		346
		347	HV *stash = SvSTASH (sv);
		348	GV *method;
		349
271	if (SvSTASH (sv) == boolean_stash)	350	if (stash == boolean_stash)
272	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	351	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		352	else if (stash == error_stash)
		353	encode_ch (enc, 0xe0 \| 23);
273	else if (SvSTASH (sv) == tagged_stash)	354	else if (stash == tagged_stash)
274	{	355	{
275	if (svt != SVt_PVAV)	356	if (svt != SVt_PVAV)
276	croak ("encountered CBOR::XS::Tagged object that isn't an array");	357	croak ("encountered CBOR::XS::Tagged object that isn't an array");
277		358
278	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	359	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
279	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	360	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
280	}	361	}
		362	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		363	{
		364	dSP;
		365
		366	ENTER; SAVETMPS; PUSHMARK (SP);
		367	// we re-bless the reference to get overload and other niceties right
		368	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		369
		370	PUTBACK;
		371	// G_SCALAR ensures that return value is 1
		372	call_sv ((SV *)GvCV (method), G_SCALAR);
		373	SPAGAIN;
		374
		375	// catch this surprisingly common error
		376	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		377	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		378
		379	encode_sv (enc, POPs);
		380
		381	PUTBACK;
		382
		383	FREETMPS; LEAVE;
		384	}
		385	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		386	{
		387	dSP;
		388
		389	ENTER; SAVETMPS; PUSHMARK (SP);
		390	EXTEND (SP, 2);
		391	// we re-bless the reference to get overload and other niceties right
		392	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		393	PUSHs (sv_cbor);
		394
		395	PUTBACK;
		396	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		397	SPAGAIN;
		398
		399	// catch this surprisingly common error
		400	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));
		402
		403	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		404	encode_uint (enc, 0x80, count + 1);
		405	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		406
		407	while (count)
		408	encode_sv (enc, SP[1 - count--]);
		409
		410	PUTBACK;
		411
		412	FREETMPS; LEAVE;
		413	}
281	else	414	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",	415	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	416	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312	}
313	}	417	}
314	else if (svt == SVt_PVHV)	418	else if (svt == SVt_PVHV)
315	encode_hv (enc, (HV *)sv);	419	encode_hv (enc, (HV *)sv);
316	else if (svt == SVt_PVAV)	420	else if (svt == SVt_PVAV)
317	encode_av (enc, (AV *)sv);	421	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	422	else
336	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	423	{
337	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	424	encode_tag (enc, CBOR_TAG_INDIRECTION);
		425	encode_sv (enc, sv);
		426	}
338	}	427	}
339		428
340	static void	429	static void
341	encode_nv (enc_t enc, SV sv)	430	encode_nv (enc_t enc, SV sv)
342	{	431	{
…		…
407	}	496	}
408		497
409	static SV *	498	static SV *
410	encode_cbor (SV scalar, CBOR cbor)	499	encode_cbor (SV scalar, CBOR cbor)
411	{	500	{
412	enc_t enc;	501	enc_t enc = { };
413		502
414	enc.cbor = *cbor;	503	enc.cbor = *cbor;
415	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	504	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
416	enc.cur = SvPVX (enc.sv);	505	enc.cur = SvPVX (enc.sv);
417	enc.end = SvEND (enc.sv);	506	enc.end = SvEND (enc.sv);
418	enc.depth = 0;
419		507
420	SvPOK_only (enc.sv);	508	SvPOK_only (enc.sv);
		509
		510	if (cbor->flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS))
		511	{
		512	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		513	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		514	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		515	}
		516
421	encode_sv (&enc, scalar);	517	encode_sv (&enc, scalar);
422		518
423	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	519	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
424	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	520	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
425		521
…		…
439	U8 *end; // end of input string	535	U8 *end; // end of input string
440	const char *err; // parse error, if != 0	536	const char *err; // parse error, if != 0
441	CBOR cbor;	537	CBOR cbor;
442	U32 depth; // recursion depth	538	U32 depth; // recursion depth
443	U32 maxdepth; // recursion depth limit	539	U32 maxdepth; // recursion depth limit
		540	AV *shareable;
		541	AV *stringref;
444	} dec_t;	542	} dec_t;
445		543
446	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	544	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
447		545
448	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	546	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
542	SvREFCNT_dec (av);	640	SvREFCNT_dec (av);
543	DEC_DEC_DEPTH;	641	DEC_DEC_DEPTH;
544	return &PL_sv_undef;	642	return &PL_sv_undef;
545	}	643	}
546		644
		645	static void
		646	decode_he (dec_t dec, HV hv)
		647	{
		648	// for speed reasons, we specialcase single-string
		649	// byte or utf-8 strings as keys.
		650
		651	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		652	{
		653	I32 len = decode_uint (dec);
		654	char key = (char )dec->cur;
		655
		656	dec->cur += len;
		657
		658	if (ecb_expect_false (dec->stringref))
		659	av_push (dec->stringref, newSVpvn (key, len));
		660
		661	hv_store (hv, key, len, decode_sv (dec), 0);
		662	}
		663	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		664	{
		665	I32 len = decode_uint (dec);
		666	char key = (char )dec->cur;
		667
		668	dec->cur += len;
		669
		670	if (ecb_expect_false (dec->stringref))
		671	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		672
		673	hv_store (hv, key, -len, decode_sv (dec), 0);
		674	}
		675	else
		676	{
		677	SV *k = decode_sv (dec);
		678	SV *v = decode_sv (dec);
		679
		680	hv_store_ent (hv, k, v, 0);
		681	SvREFCNT_dec (k);
		682	}
		683	}
		684
547	static SV *	685	static SV *
548	decode_hv (dec_t *dec)	686	decode_hv (dec_t *dec)
549	{	687	{
550	HV *hv = newHV ();	688	HV *hv = newHV ();
551		689
…		…
563	{	701	{
564	++dec->cur;	702	++dec->cur;
565	break;	703	break;
566	}	704	}
567		705
568	SV *k = decode_sv (dec);	706	decode_he (dec, hv);
569	SV *v = decode_sv (dec);
570
571	hv_store_ent (hv, k, v, 0);
572	}	707	}
573	}	708	}
574	else	709	else
575	{	710	{
576	int len = decode_uint (dec);	711	int pairs = decode_uint (dec);
577		712
578	while (len--)	713	while (pairs--)
579	{	714	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	}	715	}
586		716
587	DEC_DEC_DEPTH;	717	DEC_DEC_DEPTH;
588	return newRV_noinc ((SV *)hv);	718	return newRV_noinc ((SV *)hv);
589		719
…		…
628	}	758	}
629		759
630	if (utf8)	760	if (utf8)
631	SvUTF8_on (sv);	761	SvUTF8_on (sv);
632		762
		763	if (ecb_expect_false (dec->stringref))
		764	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
		765
633	return sv;	766	return sv;
634		767
635	fail:	768	fail:
636	SvREFCNT_dec (sv);	769	SvREFCNT_dec (sv);
637	return &PL_sv_undef;	770	return &PL_sv_undef;
638	}	771	}
639		772
640	static SV *	773	static SV *
641	decode_tagged (dec_t *dec)	774	decode_tagged (dec_t *dec)
642	{	775	{
		776	SV *sv = 0;
643	UV tag = decode_uint (dec);	777	UV tag = decode_uint (dec);
		778
		779	WANT (1);
		780
		781	switch (tag)
		782	{
		783	case CBOR_TAG_MAGIC:
		784	sv = decode_sv (dec);
		785	break;
		786
		787	case CBOR_TAG_INDIRECTION:
		788	sv = newRV_noinc (decode_sv (dec));
		789	break;
		790
		791	case CBOR_TAG_STRINGREF_NAMESPACE:
		792	{
		793	ENTER; SAVETMPS;
		794
		795	SAVESPTR (dec->stringref);
		796	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		797
		798	sv = decode_sv (dec);
		799
		800	FREETMPS; LEAVE;
		801	}
		802	break;
		803
		804	case CBOR_TAG_STRINGREF:
		805	{
		806	if ((*dec->cur >> 5) != 0)
		807	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		808
		809	UV idx = decode_uint (dec);
		810
		811	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		812	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		813
		814	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		815	}
		816	break;
		817
		818	case CBOR_TAG_VALUE_SHAREABLE:
		819	{
		820	if (ecb_expect_false (!dec->shareable))
		821	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		822
		823	sv = newSV (0);
		824	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		825
644	SV *sv = decode_sv (dec);	826	SV *osv = decode_sv (dec);
		827	sv_setsv (sv, osv);
		828	SvREFCNT_dec_NN (osv);
		829	}
		830	break;
645		831
646	if (tag == CBOR_TAG_MAGIC)	832	case CBOR_TAG_VALUE_SHAREDREF:
647	return sv;	833	{
		834	if ((*dec->cur >> 5) != 0)
		835	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
648		836
649	if (tag == CBOR_TAG_PERL_OBJECT)	837	UV idx = decode_uint (dec);
650	{	838
		839	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		840	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		841
		842	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		843	}
		844	break;
		845
		846	case CBOR_TAG_PERL_OBJECT:
		847	{
		848	sv = decode_sv (dec);
		849
651	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	850	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
652	ERR ("corrupted CBOR data (non-array perl object)");	851	ERR ("corrupted CBOR data (non-array perl object)");
		852
		853	AV av = (AV )SvRV (sv);
		854	int len = av_len (av) + 1;
		855	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		856
		857	if (!stash)
		858	ERR ("cannot decode perl-object (package does not exist)");
		859
		860	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		861
		862	if (!method)
		863	ERR ("cannot decode perl-object (package does not have a THAW method)");
		864
		865	dSP;
		866
		867	ENTER; SAVETMPS; PUSHMARK (SP);
		868	EXTEND (SP, len + 1);
		869	// we re-bless the reference to get overload and other niceties right
		870	PUSHs (*av_fetch (av, 0, 1));
		871	PUSHs (sv_cbor);
		872
		873	int i;
		874
		875	for (i = 1; i < len; ++i)
		876	PUSHs (*av_fetch (av, i, 1));
		877
		878	PUTBACK;
		879	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		880	SPAGAIN;
		881
		882	if (SvTRUE (ERRSV))
		883	{
		884	FREETMPS; LEAVE;
		885	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		886	}
		887
		888	SvREFCNT_dec (sv);
		889	sv = SvREFCNT_inc (POPs);
		890
		891	PUTBACK;
		892
		893	FREETMPS; LEAVE;
653		894	}
654	// TODO	895	break;
655	}
656		896
		897	default:
		898	{
		899	sv = decode_sv (dec);
		900
657	AV *av = newAV ();	901	AV *av = newAV ();
658	av_push (av, newSVuv (tag));	902	av_push (av, newSVuv (tag));
659	av_push (av, sv);	903	av_push (av, sv);
660		904
661	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	905	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
662	? cbor_tagged_stash	906	? cbor_tagged_stash
663	: gv_stashpv ("CBOR::XS::Tagged" , 1);	907	: gv_stashpv ("CBOR::XS::Tagged" , 1);
664		908
665	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	909	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		910	}
		911	break;
		912	}
		913
		914	return sv;
666		915
667	fail:	916	fail:
668	SvREFCNT_dec (sv);	917	SvREFCNT_dec (sv);
669	return &PL_sv_undef;	918	return &PL_sv_undef;
670	}	919	}
…		…
693	case 7: // misc	942	case 7: // misc
694	switch (*dec->cur++ & 31)	943	switch (*dec->cur++ & 31)
695	{	944	{
696	case 20:	945	case 20:
697	#if CBOR_SLOW	946	#if CBOR_SLOW
698	cbor_false = get_bool ("CBOR::XS::false");	947	types_false = get_bool ("Types::Serialiser::false");
699	#endif	948	#endif
700	return newSVsv (cbor_false);	949	return newSVsv (types_false);
701	case 21:	950	case 21:
702	#if CBOR_SLOW	951	#if CBOR_SLOW
703	cbor_true = get_bool ("CBOR::XS::true");	952	types_true = get_bool ("Types::Serialiser::true");
704	#endif	953	#endif
705	return newSVsv (cbor_true);	954	return newSVsv (types_true);
706	case 22:	955	case 22:
707	return newSVsv (&PL_sv_undef);	956	return newSVsv (&PL_sv_undef);
		957	case 23:
		958	#if CBOR_SLOW
		959	types_error = get_bool ("Types::Serialiser::error");
		960	#endif
		961	return newSVsv (types_error);
708		962
709	case 25:	963	case 25:
710	{	964	{
711	WANT (2);	965	WANT (2);
712		966
…		…
756	}	1010	}
757		1011
758	static SV *	1012	static SV *
759	decode_cbor (SV string, CBOR cbor, char **offset_return)	1013	decode_cbor (SV string, CBOR cbor, char **offset_return)
760	{	1014	{
761	dec_t dec;	1015	dec_t dec = { };
762	SV *sv;	1016	SV *sv;
		1017	STRLEN len;
		1018	char *data = SvPVbyte (string, len);
763		1019
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)	1020	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",	1021	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);	1022	(unsigned long)len, (unsigned long)cbor->max_size);
795	}
796
797	sv_utf8_downgrade (string, 0);
798		1023
799	dec.cbor = *cbor;	1024	dec.cbor = *cbor;
800	dec.cur = (U8 *)SvPVX (string);	1025	dec.cur = (U8 *)data;
801	dec.end = (U8 *)SvEND (string);	1026	dec.end = (U8 *)data + len;
802	dec.err = 0;
803	dec.depth = 0;
804		1027
805	sv = decode_sv (&dec);	1028	sv = decode_sv (&dec);
806		1029
807	if (offset_return)	1030	if (offset_return)
808	*offset_return = dec.cur;	1031	*offset_return = dec.cur;
…		…
812	dec.err = "garbage after CBOR object";	1035	dec.err = "garbage after CBOR object";
813		1036
814	if (dec.err)	1037	if (dec.err)
815	{	1038	{
816	SvREFCNT_dec (sv);	1039	SvREFCNT_dec (sv);
817	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1040	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
818	}	1041	}
819		1042
820	sv = sv_2mortal (sv);	1043	sv = sv_2mortal (sv);
821		1044
822	return sv;	1045	return sv;
…		…
828	MODULE = CBOR::XS PACKAGE = CBOR::XS	1051	MODULE = CBOR::XS PACKAGE = CBOR::XS
829		1052
830	BOOT:	1053	BOOT:
831	{	1054	{
832	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1055	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);	1056	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835		1057
836	cbor_true = get_bool ("CBOR::XS::true");	1058	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837	cbor_false = get_bool ("CBOR::XS::false");	1059	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1060
		1061	types_true = get_bool ("Types::Serialiser::true" );
		1062	types_false = get_bool ("Types::Serialiser::false");
		1063	types_error = get_bool ("Types::Serialiser::error");
		1064
		1065	sv_cbor = newSVpv ("CBOR", 0);
		1066	SvREADONLY_on (sv_cbor);
838	}	1067	}
839		1068
840	PROTOTYPES: DISABLE	1069	PROTOTYPES: DISABLE
841		1070
842	void CLONE (...)	1071	void CLONE (...)
843	CODE:	1072	CODE:
844	cbor_stash = 0;	1073	cbor_stash = 0;
845	cbor_boolean_stash = 0;
846	cbor_tagged_stash = 0;	1074	cbor_tagged_stash = 0;
		1075	types_error_stash = 0;
		1076	types_boolean_stash = 0;
847		1077
848	void new (char *klass)	1078	void new (char *klass)
849	PPCODE:	1079	PPCODE:
850	{	1080	{
851	SV *pv = NEWSV (0, sizeof (CBOR));	1081	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
859		1089
860	void shrink (CBOR *self, int enable = 1)	1090	void shrink (CBOR *self, int enable = 1)
861	ALIAS:	1091	ALIAS:
862	shrink = F_SHRINK	1092	shrink = F_SHRINK
863	allow_unknown = F_ALLOW_UNKNOWN	1093	allow_unknown = F_ALLOW_UNKNOWN
		1094	allow_sharing = F_ALLOW_SHARING
		1095	dedup_keys = F_DEDUP_KEYS
		1096	dedup_strings = F_DEDUP_STRINGS
864	PPCODE:	1097	PPCODE:
865	{	1098	{
866	if (enable)	1099	if (enable)
867	self->flags \|= ix;	1100	self->flags \|= ix;
868	else	1101	else
…		…
873		1106
874	void get_shrink (CBOR *self)	1107	void get_shrink (CBOR *self)
875	ALIAS:	1108	ALIAS:
876	get_shrink = F_SHRINK	1109	get_shrink = F_SHRINK
877	get_allow_unknown = F_ALLOW_UNKNOWN	1110	get_allow_unknown = F_ALLOW_UNKNOWN
		1111	get_allow_sharing = F_ALLOW_SHARING
		1112	get_dedup_keys = F_DEDUP_KEYS
		1113	get_dedup_strings = F_DEDUP_STRINGS
878	PPCODE:	1114	PPCODE:
879	XPUSHs (boolSV (self->flags & ix));	1115	XPUSHs (boolSV (self->flags & ix));
880		1116
881	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1117	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
882	PPCODE:	1118	PPCODE:
…		…
897	int get_max_size (CBOR *self)	1133	int get_max_size (CBOR *self)
898	CODE:	1134	CODE:
899	RETVAL = self->max_size;	1135	RETVAL = self->max_size;
900	OUTPUT:	1136	OUTPUT:
901	RETVAL	1137	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		1138
938	void encode (CBOR self, SV scalar)	1139	void encode (CBOR self, SV scalar)
939	PPCODE:	1140	PPCODE:
940	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1141	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
941	XPUSHs (scalar);	1142	XPUSHs (scalar);
…		…
954	EXTEND (SP, 2);	1155	EXTEND (SP, 2);
955	PUSHs (sv);	1156	PUSHs (sv);
956	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1157	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
957	}	1158	}
958		1159
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	1160	PROTOTYPES: ENABLE
969		1161
970	void encode_cbor (SV *scalar)	1162	void encode_cbor (SV *scalar)
971	PPCODE:	1163	PPCODE:
972	{	1164	{

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.20 by root, Wed Nov 20 11:06:42 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.20 by root, Wed Nov 20 11:06:42 2013 UTC