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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.13 by root, Mon Oct 28 22:50:50 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	// 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)
…		…
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	}
…		…
252		309
253	// encode objects, arrays and special \0=false and \1=true values.	310	// encode objects, arrays and special \0=false and \1=true values.
254	static void	311	static void
255	encode_rv (enc_t enc, SV sv)	312	encode_rv (enc_t enc, SV sv)
256	{	313	{
257	svtype svt;
258
259	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
260	svt = SvTYPE (sv);	338	svtype svt = SvTYPE (sv);
261		339
262	if (ecb_expect_false (SvOBJECT (sv)))	340	if (ecb_expect_false (SvOBJECT (sv)))
263	{	341	{
264	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	342	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? types_boolean_stash	343	? types_boolean_stash
…		…
325		403
326	// catch this surprisingly common error	404	// catch this surprisingly common error
327	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	405	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
328	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	406	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
329		407
330	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
331	encode_uint (enc, 0x80, count + 1);	409	encode_uint (enc, 0x80, count + 1);
332	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
333		411
334	while (count)	412	while (count)
335	encode_sv (enc, SP[1 - count--]);	413	encode_sv (enc, SP[1 - count--]);
…		…
344	}	422	}
345	else if (svt == SVt_PVHV)	423	else if (svt == SVt_PVHV)
346	encode_hv (enc, (HV *)sv);	424	encode_hv (enc, (HV *)sv);
347	else if (svt == SVt_PVAV)	425	else if (svt == SVt_PVAV)
348	encode_av (enc, (AV *)sv);	426	encode_av (enc, (AV *)sv);
349	else if (svt < SVt_PVAV)
350	{
351	STRLEN len = 0;
352	char *pv = svt ? SvPV (sv, len) : 0;
353
354	if (len == 1 && *pv == '1')
355	encode_ch (enc, 0xe0 \| 21);
356	else if (len == 1 && *pv == '0')
357	encode_ch (enc, 0xe0 \| 20);
358	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
359	encode_ch (enc, 0xe0 \| 23);
360	else
361	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
362	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
363	}
364	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
365	encode_ch (enc, 0xe0 \| 23);
366	else	427	else
367	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	428	{
368	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	429	encode_tag (enc, CBOR_TAG_INDIRECTION);
		430	encode_sv (enc, sv);
		431	}
369	}	432	}
370		433
371	static void	434	static void
372	encode_nv (enc_t enc, SV sv)	435	encode_nv (enc_t enc, SV sv)
373	{	436	{
…		…
438	}	501	}
439		502
440	static SV *	503	static SV *
441	encode_cbor (SV scalar, CBOR cbor)	504	encode_cbor (SV scalar, CBOR cbor)
442	{	505	{
443	enc_t enc;	506	enc_t enc = { };
444		507
445	enc.cbor = *cbor;	508	enc.cbor = *cbor;
446	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	509	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
447	enc.cur = SvPVX (enc.sv);	510	enc.cur = SvPVX (enc.sv);
448	enc.end = SvEND (enc.sv);	511	enc.end = SvEND (enc.sv);
449	enc.depth = 0;
450		512
451	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
452	encode_sv (&enc, scalar);	522	encode_sv (&enc, scalar);
453		523
454	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	524	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
455	*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
456		526
…		…
470	U8 *end; // end of input string	540	U8 *end; // end of input string
471	const char *err; // parse error, if != 0	541	const char *err; // parse error, if != 0
472	CBOR cbor;	542	CBOR cbor;
473	U32 depth; // recursion depth	543	U32 depth; // recursion depth
474	U32 maxdepth; // recursion depth limit	544	U32 maxdepth; // recursion depth limit
		545	AV *shareable;
		546	AV *stringref;
475	} dec_t;	547	} dec_t;
476		548
477	#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
478		550
479	#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")
…		…
573	SvREFCNT_dec (av);	645	SvREFCNT_dec (av);
574	DEC_DEC_DEPTH;	646	DEC_DEC_DEPTH;
575	return &PL_sv_undef;	647	return &PL_sv_undef;
576	}	648	}
577		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
578	static SV *	693	static SV *
579	decode_hv (dec_t *dec)	694	decode_hv (dec_t *dec)
580	{	695	{
581	HV *hv = newHV ();	696	HV *hv = newHV ();
582		697
…		…
594	{	709	{
595	++dec->cur;	710	++dec->cur;
596	break;	711	break;
597	}	712	}
598		713
599	SV *k = decode_sv (dec);	714	decode_he (dec, hv);
600	SV *v = decode_sv (dec);
601
602	hv_store_ent (hv, k, v, 0);
603	SvREFCNT_dec (k);
604	}	715	}
605	}	716	}
606	else	717	else
607	{	718	{
608	int len = decode_uint (dec);	719	int pairs = decode_uint (dec);
609		720
610	while (len--)	721	while (pairs--)
611	{	722	decode_he (dec, hv);
612	SV *k = decode_sv (dec);
613	SV *v = decode_sv (dec);
614
615	hv_store_ent (hv, k, v, 0);
616	SvREFCNT_dec (k);
617	}
618	}	723	}
619		724
620	DEC_DEC_DEPTH;	725	DEC_DEC_DEPTH;
621	return newRV_noinc ((SV *)hv);	726	return newRV_noinc ((SV *)hv);
622		727
…		…
656	STRLEN len = decode_uint (dec);	761	STRLEN len = decode_uint (dec);
657		762
658	WANT (len);	763	WANT (len);
659	sv = newSVpvn (dec->cur, len);	764	sv = newSVpvn (dec->cur, len);
660	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));
661	}	770	}
662		771
663	if (utf8)	772	if (utf8)
664	SvUTF8_on (sv);	773	SvUTF8_on (sv);
665		774
…		…
671	}	780	}
672		781
673	static SV *	782	static SV *
674	decode_tagged (dec_t *dec)	783	decode_tagged (dec_t *dec)
675	{	784	{
		785	SV *sv = 0;
676	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
677	SV *sv = decode_sv (dec);	835	SV *osv = decode_sv (dec);
		836	sv_setsv (sv, osv);
		837	SvREFCNT_dec_NN (osv);
		838	}
		839	break;
678		840
679	if (tag == CBOR_TAG_MAGIC)	841	case CBOR_TAG_VALUE_SHAREDREF:
680	return sv;	842	{
681	else if (tag == CBOR_TAG_PERL_OBJECT)	843	if ((*dec->cur >> 5) != 0)
682	{	844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		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
683	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	859	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
684	ERR ("corrupted CBOR data (non-array perl object)");	860	ERR ("corrupted CBOR data (non-array perl object)");
685		861
686	AV av = (AV )SvRV (sv);	862	AV av = (AV )SvRV (sv);
687	int len = av_len (av) + 1;	863	int len = av_len (av) + 1;
688	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);	864	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
689		865
690	if (!stash)	866	if (!stash)
691	ERR ("cannot decode perl-object (package does not exist)");	867	ERR ("cannot decode perl-object (package does not exist)");
692		868
693	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);	869	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
694		870
695	if (!method)	871	if (!method)
696	ERR ("cannot decode perl-object (package does not have a THAW method)");	872	ERR ("cannot decode perl-object (package does not have a THAW method)");
697		873
698	dSP;	874	dSP;
699		875
700	ENTER; SAVETMPS; PUSHMARK (SP);	876	ENTER; SAVETMPS; PUSHMARK (SP);
701	EXTEND (SP, len + 1);	877	EXTEND (SP, len + 1);
702	// we re-bless the reference to get overload and other niceties right	878	// we re-bless the reference to get overload and other niceties right
703	PUSHs (*av_fetch (av, 0, 1));	879	PUSHs (*av_fetch (av, 0, 1));
704	PUSHs (sv_cbor);	880	PUSHs (sv_cbor);
705		881
706	int i;	882	int i;
707		883
708	for (i = 1; i < len; ++i)	884	for (i = 1; i < len; ++i)
709	PUSHs (*av_fetch (av, i, 1));	885	PUSHs (*av_fetch (av, i, 1));
710		886
711	PUTBACK;	887	PUTBACK;
712	call_sv ((SV *)GvCV (method), G_SCALAR);	888	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
713	SPAGAIN;	889	SPAGAIN;
714		890
		891	if (SvTRUE (ERRSV))
		892	{
		893	FREETMPS; LEAVE;
		894	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		895	}
		896
715	SvREFCNT_dec (sv);	897	SvREFCNT_dec (sv);
716	sv = SvREFCNT_inc (POPs);	898	sv = SvREFCNT_inc (POPs);
717		899
718	PUTBACK;	900	PUTBACK;
719		901
720	FREETMPS; LEAVE;	902	FREETMPS; LEAVE;
		903	}
		904	break;
721		905
722	return sv;	906	default:
723	}	907	{
724	else	908	sv = decode_sv (dec);
725	{	909
726	AV *av = newAV ();	910	AV *av = newAV ();
727	av_push (av, newSVuv (tag));	911	av_push (av, newSVuv (tag));
728	av_push (av, sv);	912	av_push (av, sv);
729		913
730	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
731	? cbor_tagged_stash	915	? cbor_tagged_stash
732	: gv_stashpv ("CBOR::XS::Tagged" , 1);	916	: gv_stashpv ("CBOR::XS::Tagged" , 1);
733		917
734	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	918	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		919	}
		920	break;
735	}	921	}
		922
		923	return sv;
736		924
737	fail:	925	fail:
738	SvREFCNT_dec (sv);	926	SvREFCNT_dec (sv);
739	return &PL_sv_undef;	927	return &PL_sv_undef;
740	}	928	}
…		…
831	}	1019	}
832		1020
833	static SV *	1021	static SV *
834	decode_cbor (SV string, CBOR cbor, char **offset_return)	1022	decode_cbor (SV string, CBOR cbor, char **offset_return)
835	{	1023	{
836	dec_t dec;	1024	dec_t dec = { };
837	SV *sv;	1025	SV *sv;
		1026	STRLEN len;
		1027	char *data = SvPVbyte (string, len);
838		1028
839	/* work around bugs in 5.10 where manipulating magic values
840	* makes perl ignore the magic in subsequent accesses.
841	* also make a copy of non-PV values, to get them into a clean
842	* state (SvPV should do that, but it's buggy, see below).
843	*/
844	/SvGETMAGIC (string);/
845	if (SvMAGICAL (string) \|\| !SvPOK (string))
846	string = sv_2mortal (newSVsv (string));
847
848	SvUPGRADE (string, SVt_PV);
849
850	/* work around a bug in perl 5.10, which causes SvCUR to fail an
851	* assertion with -DDEBUGGING, although SvCUR is documented to
852	* return the xpv_cur field which certainly exists after upgrading.
853	* according to nicholas clark, calling SvPOK fixes this.
854	* But it doesn't fix it, so try another workaround, call SvPV_nolen
855	* and hope for the best.
856	* Damnit, SvPV_nolen still trips over yet another assertion. This
857	* assertion business is seriously broken, try yet another workaround
858	* for the broken -DDEBUGGING.
859	*/
860	{
861	#ifdef DEBUGGING
862	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
863	#else
864	STRLEN offset = SvCUR (string);
865	#endif
866
867	if (offset > cbor->max_size && cbor->max_size)	1029	if (len > cbor->max_size && cbor->max_size)
868	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",
869	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1031	(unsigned long)len, (unsigned long)cbor->max_size);
870	}
871
872	sv_utf8_downgrade (string, 0);
873		1032
874	dec.cbor = *cbor;	1033	dec.cbor = *cbor;
875	dec.cur = (U8 *)SvPVX (string);	1034	dec.cur = (U8 *)data;
876	dec.end = (U8 *)SvEND (string);	1035	dec.end = (U8 *)data + len;
877	dec.err = 0;
878	dec.depth = 0;
879		1036
880	sv = decode_sv (&dec);	1037	sv = decode_sv (&dec);
881		1038
882	if (offset_return)	1039	if (offset_return)
883	*offset_return = dec.cur;	1040	*offset_return = dec.cur;
…		…
887	dec.err = "garbage after CBOR object";	1044	dec.err = "garbage after CBOR object";
888		1045
889	if (dec.err)	1046	if (dec.err)
890	{	1047	{
891	SvREFCNT_dec (sv);	1048	SvREFCNT_dec (sv);
892	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);
893	}	1050	}
894		1051
895	sv = sv_2mortal (sv);	1052	sv = sv_2mortal (sv);
896		1053
897	return sv;	1054	return sv;
…		…
941		1098
942	void shrink (CBOR *self, int enable = 1)	1099	void shrink (CBOR *self, int enable = 1)
943	ALIAS:	1100	ALIAS:
944	shrink = F_SHRINK	1101	shrink = F_SHRINK
945	allow_unknown = F_ALLOW_UNKNOWN	1102	allow_unknown = F_ALLOW_UNKNOWN
		1103	allow_sharing = F_ALLOW_SHARING
		1104	allow_stringref = F_ALLOW_STRINGREF
946	PPCODE:	1105	PPCODE:
947	{	1106	{
948	if (enable)	1107	if (enable)
949	self->flags \|= ix;	1108	self->flags \|= ix;
950	else	1109	else
…		…
955		1114
956	void get_shrink (CBOR *self)	1115	void get_shrink (CBOR *self)
957	ALIAS:	1116	ALIAS:
958	get_shrink = F_SHRINK	1117	get_shrink = F_SHRINK
959	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
960	PPCODE:	1121	PPCODE:
961	XPUSHs (boolSV (self->flags & ix));	1122	XPUSHs (boolSV (self->flags & ix));
962		1123
963	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
964	PPCODE:	1125	PPCODE:
…		…
979	int get_max_size (CBOR *self)	1140	int get_max_size (CBOR *self)
980	CODE:	1141	CODE:
981	RETVAL = self->max_size;	1142	RETVAL = self->max_size;
982	OUTPUT:	1143	OUTPUT:
983	RETVAL	1144	RETVAL
984
985	#if 0 //TODO
986
987	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
988	PPCODE:
989	{
990	SvREFCNT_dec (self->cb_object);
991	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
992
993	XPUSHs (ST (0));
994	}
995
996	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
997	PPCODE:
998	{
999	if (!self->cb_sk_object)
1000	self->cb_sk_object = newHV ();
1001
1002	if (SvOK (cb))
1003	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1004	else
1005	{
1006	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1007
1008	if (!HvKEYS (self->cb_sk_object))
1009	{
1010	SvREFCNT_dec (self->cb_sk_object);
1011	self->cb_sk_object = 0;
1012	}
1013	}
1014
1015	XPUSHs (ST (0));
1016	}
1017
1018	#endif
1019		1145
1020	void encode (CBOR self, SV scalar)	1146	void encode (CBOR self, SV scalar)
1021	PPCODE:	1147	PPCODE:
1022	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1148	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1023	XPUSHs (scalar);	1149	XPUSHs (scalar);
…		…
1036	EXTEND (SP, 2);	1162	EXTEND (SP, 2);
1037	PUSHs (sv);	1163	PUSHs (sv);
1038	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1164	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1039	}	1165	}
1040		1166
1041	#if 0
1042
1043	void DESTROY (CBOR *self)
1044	CODE:
1045	SvREFCNT_dec (self->cb_sk_object);
1046	SvREFCNT_dec (self->cb_object);
1047
1048	#endif
1049
1050	PROTOTYPES: ENABLE	1167	PROTOTYPES: ENABLE
1051		1168
1052	void encode_cbor (SV *scalar)	1169	void encode_cbor (SV *scalar)
1053	PPCODE:	1170	PPCODE:
1054	{	1171	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.13 by root, Mon Oct 28 22:50:50 2013 UTC vs. Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.13 by root, Mon Oct 28 22:50:50 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC