[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.29 by root, Thu Nov 28 09:13:12 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	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
		27
14	// known tags	28	// known tags
15	enum cbor_tag	29	enum cbor_tag
16	{	30	{
17	// inofficial extensions (pending iana registration)	31	// extensions
18	CBOR_TAG_PERL_OBJECT = 256,	32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
19	CBOR_TAG_GENERIC_OBJECT = 257,	33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
20		39
21	// rfc7049	40	// rfc7049
22	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
23	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
24	CBOR_TAG_POS_BIGNUM = 2, // byte string	43	CBOR_TAG_POS_BIGNUM = 2, // byte string
…		…
38	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
39		58
40	CBOR_TAG_MAGIC = 55799 // self-describe cbor	59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
41	};	60	};
42		61
43	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
44	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL //TODO
		65	#define F_ALLOW_STRINGREF 0x00000008UL //TODO
45		66
46	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
47		68
48	#define SB do {	69	#define SB do {
49	#define SE } while (0)	70	#define SE } while (0)
…		…
61	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
62	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
63	#endif	84	#endif
64		85
65	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
66	static SV types_true, types_false, types_error, sv_cbor;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
67		88
68	typedef struct {	89	typedef struct {
69	U32 flags;	90	U32 flags;
70	U32 max_depth;	91	U32 max_depth;
71	STRLEN max_size;	92	STRLEN max_size;
		93	SV *filter;
72	} CBOR;	94	} CBOR;
73		95
74	ecb_inline void	96	ecb_inline void
75	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
76	{	98	{
77	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
78	cbor->max_depth = 512;	100	cbor->max_depth = 512;
		101	}
		102
		103	ecb_inline void
		104	cbor_free (CBOR *cbor)
		105	{
		106	SvREFCNT_dec (cbor->filter);
79	}	107	}
80		108
81	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
82	// utility functions	110	// utility functions
83		111
…		…
105	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
106	#endif	134	#endif
107	}	135	}
108	}	136	}
109		137
110	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
111	// fp hell	139	ecb_inline int
112		140	minimum_string_length (UV idx)
113	//TODO	141	{
		142	return idx > 23
		143	? idx > 0xffU
		144	? idx > 0xffffU
		145	? idx > 0xffffffffU
		146	? 11
		147	: 7
		148	: 5
		149	: 4
		150	: 3;
		151	}
114		152
115	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
116	// encoder	154	// encoder
117		155
118	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
121	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
122	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
123	SV *sv; // result scalar	161	SV *sv; // result scalar
124	CBOR cbor;	162	CBOR cbor;
125	U32 depth; // recursion level	163	U32 depth; // recursion level
		164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
		166	HV *shareable; // ptr => index, or 0
		167	UV shareable_idx;
126	} enc_t;	168	} enc_t;
127		169
128	ecb_inline void	170	ecb_inline void
129	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
130	{	172	{
…		…
182	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
183	*enc->cur++ = len;	225	*enc->cur++ = len;
184	}	226	}
185	}	227	}
186		228
		229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
187	static void	235	static void
188	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
189	{	237	{
		238	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		239	{
		240	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		241
		242	if (SvOK (*svp))
		243	{
		244	// already registered, use stringref
		245	encode_tag (enc, CBOR_TAG_STRINGREF);
		246	encode_uint (enc, 0x00, SvUV (*svp));
		247	return;
		248	}
		249	else if (len >= minimum_string_length (enc->stringref_idx))
		250	{
		251	// register only
		252	sv_setuv (*svp, enc->stringref_idx);
		253	++enc->stringref_idx;
		254	}
		255	}
		256
190	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	257	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
191	need (enc, len);	258	need (enc, len);
192	memcpy (enc->cur, str, len);	259	memcpy (enc->cur, str, len);
193	enc->cur += len;	260	enc->cur += len;
194	}	261	}
…		…
252		319
253	// encode objects, arrays and special \0=false and \1=true values.	320	// encode objects, arrays and special \0=false and \1=true values.
254	static void	321	static void
255	encode_rv (enc_t enc, SV sv)	322	encode_rv (enc_t enc, SV sv)
256	{	323	{
257	svtype svt;
258
259	SvGETMAGIC (sv);	324	SvGETMAGIC (sv);
		325
		326	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		327	&& ecb_expect_false (SvREFCNT (sv) > 1))
		328	{
		329	if (!enc->shareable)
		330	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		331
		332	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		333
		334	if (SvOK (*svp))
		335	{
		336	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		337	encode_uint (enc, 0x00, SvUV (*svp));
		338	return;
		339	}
		340	else
		341	{
		342	sv_setuv (*svp, enc->shareable_idx);
		343	++enc->shareable_idx;
		344	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		345	}
		346	}
		347
260	svt = SvTYPE (sv);	348	svtype svt = SvTYPE (sv);
261		349
262	if (ecb_expect_false (SvOBJECT (sv)))	350	if (ecb_expect_false (SvOBJECT (sv)))
263	{	351	{
264	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	352	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? types_boolean_stash	353	? types_boolean_stash
…		…
325		413
326	// catch this surprisingly common error	414	// catch this surprisingly common error
327	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	415	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));	416	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
329		417
330	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	418	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
331	encode_uint (enc, 0x80, count + 1);	419	encode_uint (enc, 0x80, count + 1);
332	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	420	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
333		421
334	while (count)	422	while (count)
335	encode_sv (enc, SP[1 - count--]);	423	encode_sv (enc, SP[1 - count--]);
…		…
344	}	432	}
345	else if (svt == SVt_PVHV)	433	else if (svt == SVt_PVHV)
346	encode_hv (enc, (HV *)sv);	434	encode_hv (enc, (HV *)sv);
347	else if (svt == SVt_PVAV)	435	else if (svt == SVt_PVAV)
348	encode_av (enc, (AV *)sv);	436	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	437	else
367	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	438	{
368	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	439	encode_tag (enc, CBOR_TAG_INDIRECTION);
		440	encode_sv (enc, sv);
		441	}
369	}	442	}
370		443
371	static void	444	static void
372	encode_nv (enc_t enc, SV sv)	445	encode_nv (enc_t enc, SV sv)
373	{	446	{
…		…
438	}	511	}
439		512
440	static SV *	513	static SV *
441	encode_cbor (SV scalar, CBOR cbor)	514	encode_cbor (SV scalar, CBOR cbor)
442	{	515	{
443	enc_t enc;	516	enc_t enc = { };
444		517
445	enc.cbor = *cbor;	518	enc.cbor = *cbor;
446	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	519	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
447	enc.cur = SvPVX (enc.sv);	520	enc.cur = SvPVX (enc.sv);
448	enc.end = SvEND (enc.sv);	521	enc.end = SvEND (enc.sv);
449	enc.depth = 0;
450		522
451	SvPOK_only (enc.sv);	523	SvPOK_only (enc.sv);
		524
		525	if (cbor->flags & F_ALLOW_STRINGREF)
		526	{
		527	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		528	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		529	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		530	}
		531
452	encode_sv (&enc, scalar);	532	encode_sv (&enc, scalar);
453		533
454	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	534	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
455	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	535	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
456		536
…		…
470	U8 *end; // end of input string	550	U8 *end; // end of input string
471	const char *err; // parse error, if != 0	551	const char *err; // parse error, if != 0
472	CBOR cbor;	552	CBOR cbor;
473	U32 depth; // recursion depth	553	U32 depth; // recursion depth
474	U32 maxdepth; // recursion depth limit	554	U32 maxdepth; // recursion depth limit
		555	AV *shareable;
		556	AV *stringref;
		557	SV *decode_tagged;
475	} dec_t;	558	} dec_t;
476		559
477	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	560	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
478		561
479	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	562	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
573	SvREFCNT_dec (av);	656	SvREFCNT_dec (av);
574	DEC_DEC_DEPTH;	657	DEC_DEC_DEPTH;
575	return &PL_sv_undef;	658	return &PL_sv_undef;
576	}	659	}
577		660
		661	static void
		662	decode_he (dec_t dec, HV hv)
		663	{
		664	// for speed reasons, we specialcase single-string
		665	// byte or utf-8 strings as keys, but only when !stringref
		666
		667	if (ecb_expect_true (!dec->stringref))
		668	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		669	{
		670	I32 len = decode_uint (dec);
		671	char key = (char )dec->cur;
		672
		673	dec->cur += len;
		674
		675	if (ecb_expect_false (dec->stringref))
		676	av_push (dec->stringref, newSVpvn (key, len));
		677
		678	hv_store (hv, key, len, decode_sv (dec), 0);
		679
		680	return;
		681	}
		682	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		683	{
		684	I32 len = decode_uint (dec);
		685	char key = (char )dec->cur;
		686
		687	dec->cur += len;
		688
		689	if (ecb_expect_false (dec->stringref))
		690	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		691
		692	hv_store (hv, key, -len, decode_sv (dec), 0);
		693
		694	return;
		695	}
		696
		697	SV *k = decode_sv (dec);
		698	SV *v = decode_sv (dec);
		699
		700	hv_store_ent (hv, k, v, 0);
		701	SvREFCNT_dec (k);
		702	}
		703
578	static SV *	704	static SV *
579	decode_hv (dec_t *dec)	705	decode_hv (dec_t *dec)
580	{	706	{
581	HV *hv = newHV ();	707	HV *hv = newHV ();
582		708
…		…
594	{	720	{
595	++dec->cur;	721	++dec->cur;
596	break;	722	break;
597	}	723	}
598		724
599	SV *k = decode_sv (dec);	725	decode_he (dec, hv);
600	SV *v = decode_sv (dec);
601
602	hv_store_ent (hv, k, v, 0);
603	SvREFCNT_dec (k);
604	}	726	}
605	}	727	}
606	else	728	else
607	{	729	{
608	int len = decode_uint (dec);	730	int pairs = decode_uint (dec);
609		731
610	while (len--)	732	while (pairs--)
611	{	733	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	}	734	}
619		735
620	DEC_DEC_DEPTH;	736	DEC_DEC_DEPTH;
621	return newRV_noinc ((SV *)hv);	737	return newRV_noinc ((SV *)hv);
622		738
…		…
656	STRLEN len = decode_uint (dec);	772	STRLEN len = decode_uint (dec);
657		773
658	WANT (len);	774	WANT (len);
659	sv = newSVpvn (dec->cur, len);	775	sv = newSVpvn (dec->cur, len);
660	dec->cur += len;	776	dec->cur += len;
		777
		778	if (ecb_expect_false (dec->stringref)
		779	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		780	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
661	}	781	}
662		782
663	if (utf8)	783	if (utf8)
664	SvUTF8_on (sv);	784	SvUTF8_on (sv);
665		785
…		…
671	}	791	}
672		792
673	static SV *	793	static SV *
674	decode_tagged (dec_t *dec)	794	decode_tagged (dec_t *dec)
675	{	795	{
		796	SV *sv = 0;
676	UV tag = decode_uint (dec);	797	UV tag = decode_uint (dec);
		798
		799	WANT (1);
		800
		801	switch (tag)
		802	{
		803	case CBOR_TAG_MAGIC:
		804	sv = decode_sv (dec);
		805	break;
		806
		807	case CBOR_TAG_INDIRECTION:
		808	sv = newRV_noinc (decode_sv (dec));
		809	break;
		810
		811	case CBOR_TAG_STRINGREF_NAMESPACE:
		812	{
		813	ENTER; SAVETMPS;
		814
		815	SAVESPTR (dec->stringref);
		816	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		817
		818	sv = decode_sv (dec);
		819
		820	FREETMPS; LEAVE;
		821	}
		822	break;
		823
		824	case CBOR_TAG_STRINGREF:
		825	{
		826	if ((*dec->cur >> 5) != 0)
		827	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		828
		829	UV idx = decode_uint (dec);
		830
		831	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		832	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		833
		834	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		835	}
		836	break;
		837
		838	case CBOR_TAG_VALUE_SHAREABLE:
		839	{
		840	if (ecb_expect_false (!dec->shareable))
		841	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		842
		843	sv = newSV (0);
		844	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		845
677	SV *sv = decode_sv (dec);	846	SV *osv = decode_sv (dec);
		847	sv_setsv (sv, osv);
		848	SvREFCNT_dec_NN (osv);
		849	}
		850	break;
678		851
679	if (tag == CBOR_TAG_MAGIC)	852	case CBOR_TAG_VALUE_SHAREDREF:
680	return sv;	853	{
681	else if (tag == CBOR_TAG_PERL_OBJECT)	854	if ((*dec->cur >> 5) != 0)
682	{	855	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		856
		857	UV idx = decode_uint (dec);
		858
		859	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		860	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		861
		862	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		863	}
		864	break;
		865
		866	case CBOR_TAG_PERL_OBJECT:
		867	{
		868	sv = decode_sv (dec);
		869
683	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	870	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
684	ERR ("corrupted CBOR data (non-array perl object)");	871	ERR ("corrupted CBOR data (non-array perl object)");
685		872
686	AV av = (AV )SvRV (sv);	873	AV av = (AV )SvRV (sv);
687	int len = av_len (av) + 1;	874	int len = av_len (av) + 1;
688	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);	875	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
689		876
690	if (!stash)	877	if (!stash)
691	ERR ("cannot decode perl-object (package does not exist)");	878	ERR ("cannot decode perl-object (package does not exist)");
692		879
693	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);	880	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
694		881
695	if (!method)	882	if (!method)
696	ERR ("cannot decode perl-object (package does not have a THAW method)");	883	ERR ("cannot decode perl-object (package does not have a THAW method)");
697		884
698	dSP;	885	dSP;
699		886
700	ENTER; SAVETMPS; PUSHMARK (SP);	887	ENTER; SAVETMPS; PUSHMARK (SP);
701	EXTEND (SP, len + 1);	888	EXTEND (SP, len + 1);
702	// we re-bless the reference to get overload and other niceties right	889	// we re-bless the reference to get overload and other niceties right
703	PUSHs (*av_fetch (av, 0, 1));	890	PUSHs (*av_fetch (av, 0, 1));
704	PUSHs (sv_cbor);	891	PUSHs (sv_cbor);
705		892
706	int i;	893	int i;
707		894
708	for (i = 1; i < len; ++i)	895	for (i = 1; i < len; ++i)
709	PUSHs (*av_fetch (av, i, 1));	896	PUSHs (*av_fetch (av, i, 1));
710		897
711	PUTBACK;	898	PUTBACK;
712	call_sv ((SV *)GvCV (method), G_SCALAR);	899	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
713	SPAGAIN;	900	SPAGAIN;
714		901
		902	if (SvTRUE (ERRSV))
		903	{
		904	FREETMPS; LEAVE;
		905	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		906	}
		907
715	SvREFCNT_dec (sv);	908	SvREFCNT_dec (sv);
716	sv = SvREFCNT_inc (POPs);	909	sv = SvREFCNT_inc (POPs);
717		910
718	PUTBACK;	911	PUTBACK;
719		912
720	FREETMPS; LEAVE;	913	FREETMPS; LEAVE;
		914	}
		915	break;
721		916
722	return sv;	917	default:
723	}	918	{
724	else	919	sv = decode_sv (dec);
725	{	920
		921	dSP;
		922	ENTER; SAVETMPS; PUSHMARK (SP);
		923	EXTEND (SP, 2);
		924	PUSHs (newSVuv (tag));
		925	PUSHs (sv);
		926
		927	PUTBACK;
		928	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		929	SPAGAIN;
		930
		931	if (SvTRUE (ERRSV))
		932	{
		933	FREETMPS; LEAVE;
		934	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		935	}
		936
		937	if (count)
		938	{
		939	SvREFCNT_dec (sv);
		940	sv = SvREFCNT_inc (POPs);
		941	}
		942	else
		943	{
726	AV *av = newAV ();	944	AV *av = newAV ();
727	av_push (av, newSVuv (tag));	945	av_push (av, newSVuv (tag));
728	av_push (av, sv);	946	av_push (av, sv);
729		947
730	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	948	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
731	? cbor_tagged_stash	949	? cbor_tagged_stash
732	: gv_stashpv ("CBOR::XS::Tagged" , 1);	950	: gv_stashpv ("CBOR::XS::Tagged" , 1);
733
734	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	951	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		952	}
		953
		954	PUTBACK;
		955
		956	FREETMPS; LEAVE;
		957	}
		958	break;
735	}	959	}
		960
		961	return sv;
736		962
737	fail:	963	fail:
738	SvREFCNT_dec (sv);	964	SvREFCNT_dec (sv);
739	return &PL_sv_undef;	965	return &PL_sv_undef;
740	}	966	}
…		…
831	}	1057	}
832		1058
833	static SV *	1059	static SV *
834	decode_cbor (SV string, CBOR cbor, char **offset_return)	1060	decode_cbor (SV string, CBOR cbor, char **offset_return)
835	{	1061	{
836	dec_t dec;	1062	dec_t dec = { };
837	SV *sv;	1063	SV *sv;
		1064	STRLEN len;
		1065	char *data = SvPVbyte (string, len);
838		1066
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)	1067	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",	1068	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);	1069	(unsigned long)len, (unsigned long)cbor->max_size);
870	}
871
872	sv_utf8_downgrade (string, 0);
873		1070
874	dec.cbor = *cbor;	1071	dec.cbor = *cbor;
875	dec.cur = (U8 *)SvPVX (string);	1072	dec.cur = (U8 *)data;
876	dec.end = (U8 *)SvEND (string);	1073	dec.end = (U8 *)data + len;
877	dec.err = 0;
878	dec.depth = 0;
879		1074
880	sv = decode_sv (&dec);	1075	sv = decode_sv (&dec);
881		1076
882	if (offset_return)	1077	if (offset_return)
883	*offset_return = dec.cur;	1078	*offset_return = dec.cur;
…		…
887	dec.err = "garbage after CBOR object";	1082	dec.err = "garbage after CBOR object";
888		1083
889	if (dec.err)	1084	if (dec.err)
890	{	1085	{
891	SvREFCNT_dec (sv);	1086	SvREFCNT_dec (sv);
892	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1087	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
893	}	1088	}
894		1089
895	sv = sv_2mortal (sv);	1090	sv = sv_2mortal (sv);
896		1091
897	return sv;	1092	return sv;
…		…
911	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1106	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
912		1107
913	types_true = get_bool ("Types::Serialiser::true" );	1108	types_true = get_bool ("Types::Serialiser::true" );
914	types_false = get_bool ("Types::Serialiser::false");	1109	types_false = get_bool ("Types::Serialiser::false");
915	types_error = get_bool ("Types::Serialiser::error");	1110	types_error = get_bool ("Types::Serialiser::error");
		1111
		1112	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
916		1113
917	sv_cbor = newSVpv ("CBOR", 0);	1114	sv_cbor = newSVpv ("CBOR", 0);
918	SvREADONLY_on (sv_cbor);	1115	SvREADONLY_on (sv_cbor);
919	}	1116	}
920		1117
…		…
941		1138
942	void shrink (CBOR *self, int enable = 1)	1139	void shrink (CBOR *self, int enable = 1)
943	ALIAS:	1140	ALIAS:
944	shrink = F_SHRINK	1141	shrink = F_SHRINK
945	allow_unknown = F_ALLOW_UNKNOWN	1142	allow_unknown = F_ALLOW_UNKNOWN
		1143	allow_sharing = F_ALLOW_SHARING
		1144	allow_stringref = F_ALLOW_STRINGREF
946	PPCODE:	1145	PPCODE:
947	{	1146	{
948	if (enable)	1147	if (enable)
949	self->flags \|= ix;	1148	self->flags \|= ix;
950	else	1149	else
…		…
955		1154
956	void get_shrink (CBOR *self)	1155	void get_shrink (CBOR *self)
957	ALIAS:	1156	ALIAS:
958	get_shrink = F_SHRINK	1157	get_shrink = F_SHRINK
959	get_allow_unknown = F_ALLOW_UNKNOWN	1158	get_allow_unknown = F_ALLOW_UNKNOWN
		1159	get_allow_sharing = F_ALLOW_SHARING
		1160	get_allow_stringref = F_ALLOW_STRINGREF
960	PPCODE:	1161	PPCODE:
961	XPUSHs (boolSV (self->flags & ix));	1162	XPUSHs (boolSV (self->flags & ix));
962		1163
963	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1164	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
964	PPCODE:	1165	PPCODE:
…		…
980	CODE:	1181	CODE:
981	RETVAL = self->max_size;	1182	RETVAL = self->max_size;
982	OUTPUT:	1183	OUTPUT:
983	RETVAL	1184	RETVAL
984		1185
985	#if 0 //TODO	1186	void filter (CBOR self, SV filter = 0)
986
987	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
988	PPCODE:	1187	PPCODE:
989	{
990	SvREFCNT_dec (self->cb_object);	1188	SvREFCNT_dec (self->filter);
991	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1189	self->filter = filter ? newSVsv (filter) : filter;
992
993	XPUSHs (ST (0));	1190	XPUSHs (ST (0));
994	}
995		1191
996	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1192	SV get_filter (CBOR self)
997	PPCODE:	1193	CODE:
998	{	1194	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
999	if (!self->cb_sk_object)	1195	OUTPUT:
1000	self->cb_sk_object = newHV ();	1196	RETVAL
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		1197
1020	void encode (CBOR self, SV scalar)	1198	void encode (CBOR self, SV scalar)
1021	PPCODE:	1199	PPCODE:
1022	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1200	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1023	XPUSHs (scalar);	1201	XPUSHs (scalar);
…		…
1036	EXTEND (SP, 2);	1214	EXTEND (SP, 2);
1037	PUSHs (sv);	1215	PUSHs (sv);
1038	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1216	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1039	}	1217	}
1040		1218
1041	#if 0
1042
1043	void DESTROY (CBOR *self)	1219	void DESTROY (CBOR *self)
1044	CODE:	1220	PPCODE:
1045	SvREFCNT_dec (self->cb_sk_object);	1221	cbor_free (self);
1046	SvREFCNT_dec (self->cb_object);
1047
1048	#endif
1049		1222
1050	PROTOTYPES: ENABLE	1223	PROTOTYPES: ENABLE
1051		1224
1052	void encode_cbor (SV *scalar)	1225	void encode_cbor (SV *scalar)
1053	PPCODE:	1226	PPCODE:

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.29 by root, Thu Nov 28 09:13:12 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.29 by root, Thu Nov 28 09:13:12 2013 UTC