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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.10 by root, Sun Oct 27 20:40:25 2013 UTC vs.
Revision 1.18 by root, Wed Nov 20 01:09:46 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_SHARABLE = 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)
…		…
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, types_boolean_stash, types_error_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 types_true, types_false, *types_error;	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; // string => index, or 0
		141	HV *sharable; // ptr => index, or 0
		142	HV *sharable_idx;
126	} enc_t;	143	} enc_t;
127		144
128	ecb_inline void	145	ecb_inline void
129	need (enc_t *enc, STRLEN len)	146	need (enc_t *enc, STRLEN len)
130	{	147	{
…		…
191	need (enc, len);	208	need (enc, len);
192	memcpy (enc->cur, str, len);	209	memcpy (enc->cur, str, len);
193	enc->cur += len;	210	enc->cur += len;
194	}	211	}
195		212
		213	ecb_inline void
		214	encode_tag (enc_t *enc, UV tag)
		215	{
		216	encode_uint (enc, 0xc0, tag);
		217	}
		218
		219	static int
		220	encode_sharable2 (enc_t enc, SV sv)
		221	{
		222	if (!enc->sharable)
		223	enc->sharable = (HV )sv_2mortal ((SV )newHV ());
		224
		225	SV **svp = hv_fetch (enc->sharable, &sv, sizeof (sv), 1);
		226
		227	if (SvOK (*svp))
		228	{
		229	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		230	encode_uint (enc, 0x00, SvUV (*svp));
		231
		232	return 1;
		233	}
		234	else
		235	{
		236	sv_setuv (*svp, enc->sharable_idx++);
		237	encode_tag (enc, CBOR_TAG_VALUE_SHARABLE);
		238
		239	return 0;
		240	}
		241	}
		242
		243	ecb_inline int
		244	encode_sharable (enc_t enc, SV sv)
		245	{
		246	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		247	&& ecb_expect_false (SvREFCNT (sv) > 1))
		248	return encode_sharable2 (enc, sv);
		249
		250	return 0;
		251	}
		252
196	static void encode_sv (enc_t enc, SV sv);	253	static void encode_sv (enc_t enc, SV sv);
197		254
198	static void	255	static void
199	encode_av (enc_t enc, AV av)	256	encode_av (enc_t enc, AV av)
200	{	257	{
…		…
256	{	313	{
257	svtype svt;	314	svtype svt;
258		315
259	SvGETMAGIC (sv);	316	SvGETMAGIC (sv);
260	svt = SvTYPE (sv);	317	svt = SvTYPE (sv);
		318
		319	if (encode_sharable (enc, sv))
		320	return;
261		321
262	if (ecb_expect_false (SvOBJECT (sv)))	322	if (ecb_expect_false (SvOBJECT (sv)))
263	{	323	{
264	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	324	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? types_boolean_stash	325	? types_boolean_stash
…		…
269	: gv_stashpv ("Types::Serialiser::Error", 1);	329	: gv_stashpv ("Types::Serialiser::Error", 1);
270	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	330	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
271	? cbor_tagged_stash	331	? cbor_tagged_stash
272	: gv_stashpv ("CBOR::XS::Tagged" , 1);	332	: gv_stashpv ("CBOR::XS::Tagged" , 1);
273		333
		334	HV *stash = SvSTASH (sv);
		335	GV *method;
		336
274	if (SvSTASH (sv) == boolean_stash)	337	if (stash == boolean_stash)
275	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	338	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
276	else if (SvSTASH (sv) == error_stash)	339	else if (stash == error_stash)
277	encode_ch (enc, 0xe0 \| 23);	340	encode_ch (enc, 0xe0 \| 23);
278	else if (SvSTASH (sv) == tagged_stash)	341	else if (stash == tagged_stash)
279	{	342	{
280	if (svt != SVt_PVAV)	343	if (svt != SVt_PVAV)
281	croak ("encountered CBOR::XS::Tagged object that isn't an array");	344	croak ("encountered CBOR::XS::Tagged object that isn't an array");
282		345
283	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	346	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
284	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	347	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
285	}	348	}
		349	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		350	{
		351	dSP;
		352
		353	ENTER; SAVETMPS; PUSHMARK (SP);
		354	// we re-bless the reference to get overload and other niceties right
		355	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		356
		357	PUTBACK;
		358	// G_SCALAR ensures that return value is 1
		359	call_sv ((SV *)GvCV (method), G_SCALAR);
		360	SPAGAIN;
		361
		362	// catch this surprisingly common error
		363	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		364	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		365
		366	encode_sv (enc, POPs);
		367
		368	PUTBACK;
		369
		370	FREETMPS; LEAVE;
		371	}
		372	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		373	{
		374	dSP;
		375
		376	ENTER; SAVETMPS; PUSHMARK (SP);
		377	EXTEND (SP, 2);
		378	// we re-bless the reference to get overload and other niceties right
		379	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		380	PUSHs (sv_cbor);
		381
		382	PUTBACK;
		383	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		384	SPAGAIN;
		385
		386	// catch this surprisingly common error
		387	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		388	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		389
		390	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		391	encode_uint (enc, 0x80, count + 1);
		392	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		393
		394	while (count)
		395	encode_sv (enc, SP[1 - count--]);
		396
		397	PUTBACK;
		398
		399	FREETMPS; LEAVE;
		400	}
286	else	401	else
287	{
288	// we re-bless the reference to get overload and other niceties right
289	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
290
291	if (to_cbor)
292	{
293	dSP;
294
295	ENTER; SAVETMPS; PUSHMARK (SP);
296	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
297
298	// calling with G_SCALAR ensures that we always get a 1 return value
299	PUTBACK;
300	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
301	SPAGAIN;
302
303	// catch this surprisingly common error
304	if (SvROK (TOPs) && SvRV (TOPs) == sv)
305	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
306
307	sv = POPs;
308	PUTBACK;
309
310	encode_sv (enc, sv);
311
312	FREETMPS; LEAVE;
313	}
314	else
315	croak ("encountered object '%s', but no TO_CBOR method available on it",	402	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
316	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	403	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
317	}
318	}	404	}
319	else if (svt == SVt_PVHV)	405	else if (svt == SVt_PVHV)
320	encode_hv (enc, (HV *)sv);	406	encode_hv (enc, (HV *)sv);
321	else if (svt == SVt_PVAV)	407	else if (svt == SVt_PVAV)
322	encode_av (enc, (AV *)sv);	408	encode_av (enc, (AV *)sv);
323	else if (svt < SVt_PVAV)
324	{
325	STRLEN len = 0;
326	char *pv = svt ? SvPV (sv, len) : 0;
327
328	if (len == 1 && *pv == '1')
329	encode_ch (enc, 0xe0 \| 21);
330	else if (len == 1 && *pv == '0')
331	encode_ch (enc, 0xe0 \| 20);
332	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
333	encode_ch (enc, 0xe0 \| 23);
334	else
335	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
336	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
337	}
338	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
339	encode_ch (enc, 0xe0 \| 23);
340	else	409	else
341	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	410	{
342	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	411	encode_tag (enc, CBOR_TAG_INDIRECTION);
		412	encode_sv (enc, sv);
		413	}
343	}	414	}
344		415
345	static void	416	static void
346	encode_nv (enc_t enc, SV sv)	417	encode_nv (enc_t enc, SV sv)
347	{	418	{
…		…
380		451
381	static void	452	static void
382	encode_sv (enc_t enc, SV sv)	453	encode_sv (enc_t enc, SV sv)
383	{	454	{
384	SvGETMAGIC (sv);	455	SvGETMAGIC (sv);
		456
		457	if (encode_sharable (enc, sv))
		458	return;
385		459
386	if (SvPOKp (sv))	460	if (SvPOKp (sv))
387	{	461	{
388	STRLEN len;	462	STRLEN len;
389	char *str = SvPV (sv, len);	463	char *str = SvPV (sv, len);
…		…
412	}	486	}
413		487
414	static SV *	488	static SV *
415	encode_cbor (SV scalar, CBOR cbor)	489	encode_cbor (SV scalar, CBOR cbor)
416	{	490	{
417	enc_t enc;	491	enc_t enc = { };
418		492
419	enc.cbor = *cbor;	493	enc.cbor = *cbor;
420	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	494	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
421	enc.cur = SvPVX (enc.sv);	495	enc.cur = SvPVX (enc.sv);
422	enc.end = SvEND (enc.sv);	496	enc.end = SvEND (enc.sv);
423	enc.depth = 0;
424		497
425	SvPOK_only (enc.sv);	498	SvPOK_only (enc.sv);
426	encode_sv (&enc, scalar);	499	encode_sv (&enc, scalar);
427		500
428	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	501	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
444	U8 *end; // end of input string	517	U8 *end; // end of input string
445	const char *err; // parse error, if != 0	518	const char *err; // parse error, if != 0
446	CBOR cbor;	519	CBOR cbor;
447	U32 depth; // recursion depth	520	U32 depth; // recursion depth
448	U32 maxdepth; // recursion depth limit	521	U32 maxdepth; // recursion depth limit
		522	AV *sharable;
449	} dec_t;	523	} dec_t;
450		524
451	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	525	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
452		526
453	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	527	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
547	SvREFCNT_dec (av);	621	SvREFCNT_dec (av);
548	DEC_DEC_DEPTH;	622	DEC_DEC_DEPTH;
549	return &PL_sv_undef;	623	return &PL_sv_undef;
550	}	624	}
551		625
		626	static void
		627	decode_he (dec_t dec, HV hv)
		628	{
		629	// for speed reasons, we specialcase single-string
		630	// byte or utf-8 strings as keys.
		631
		632	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		633	{
		634	I32 len = decode_uint (dec);
		635	char key = (char )dec->cur;
		636
		637	dec->cur += len;
		638
		639	hv_store (hv, key, len, decode_sv (dec), 0);
		640	}
		641	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		642	{
		643	I32 len = decode_uint (dec);
		644	char key = (char )dec->cur;
		645
		646	dec->cur += len;
		647
		648	hv_store (hv, key, -len, decode_sv (dec), 0);
		649	}
		650	else
		651	{
		652	SV *k = decode_sv (dec);
		653	SV *v = decode_sv (dec);
		654
		655	hv_store_ent (hv, k, v, 0);
		656	SvREFCNT_dec (k);
		657	}
		658	}
		659
552	static SV *	660	static SV *
553	decode_hv (dec_t *dec)	661	decode_hv (dec_t *dec)
554	{	662	{
555	HV *hv = newHV ();	663	HV *hv = newHV ();
556		664
…		…
568	{	676	{
569	++dec->cur;	677	++dec->cur;
570	break;	678	break;
571	}	679	}
572		680
573	SV *k = decode_sv (dec);	681	decode_he (dec, hv);
574	SV *v = decode_sv (dec);
575
576	hv_store_ent (hv, k, v, 0);
577	}	682	}
578	}	683	}
579	else	684	else
580	{	685	{
581	int len = decode_uint (dec);	686	int pairs = decode_uint (dec);
582		687
583	while (len--)	688	while (pairs--)
584	{	689	decode_he (dec, hv);
585	SV *k = decode_sv (dec);
586	SV *v = decode_sv (dec);
587
588	hv_store_ent (hv, k, v, 0);
589	}
590	}	690	}
591		691
592	DEC_DEC_DEPTH;	692	DEC_DEC_DEPTH;
593	return newRV_noinc ((SV *)hv);	693	return newRV_noinc ((SV *)hv);
594		694
…		…
646	decode_tagged (dec_t *dec)	746	decode_tagged (dec_t *dec)
647	{	747	{
648	UV tag = decode_uint (dec);	748	UV tag = decode_uint (dec);
649	SV *sv = decode_sv (dec);	749	SV *sv = decode_sv (dec);
650		750
651	if (tag == CBOR_TAG_MAGIC)	751	switch (tag)
		752	{
		753	case CBOR_TAG_MAGIC:
652	return sv;	754	return sv;
653		755
654	if (tag == CBOR_TAG_PERL_OBJECT)	756	case CBOR_TAG_INDIRECTION:
655	{	757	return newRV_noinc (sv);
		758
		759	case CBOR_TAG_VALUE_SHARABLE:
		760	if (ecb_expect_false (!dec->sharable))
		761	dec->sharable = (AV )sv_2mortal ((SV )newAV ());
		762
		763	av_push (dec->sharable, SvREFCNT_inc_NN (sv));
		764
		765	return sv;
		766
		767	case CBOR_TAG_VALUE_SHAREDREF:
		768	{
		769	// TODO: should verify that the sv atcually was a CBOR unsigned integer
		770	UV idx = SvUV (sv);
		771
		772	if (!dec->sharable \|\| idx > AvFILLp (dec->sharable))
		773	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		774
		775	SvREFCNT_dec (sv);
		776
		777	return SvREFCNT_inc_NN (AvARRAY (dec->sharable)[idx]);
		778	}
		779
		780	case CBOR_TAG_PERL_OBJECT:
		781	{
656	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	782	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
657	ERR ("corrupted CBOR data (non-array perl object)");	783	ERR ("corrupted CBOR data (non-array perl object)");
		784
		785	AV av = (AV )SvRV (sv);
		786	int len = av_len (av) + 1;
		787	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		788
		789	if (!stash)
		790	ERR ("cannot decode perl-object (package does not exist)");
		791
		792	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		793
		794	if (!method)
		795	ERR ("cannot decode perl-object (package does not have a THAW method)");
		796
		797	dSP;
		798
		799	ENTER; SAVETMPS; PUSHMARK (SP);
		800	EXTEND (SP, len + 1);
		801	// we re-bless the reference to get overload and other niceties right
		802	PUSHs (*av_fetch (av, 0, 1));
		803	PUSHs (sv_cbor);
		804
		805	int i;
		806
		807	for (i = 1; i < len; ++i)
		808	PUSHs (*av_fetch (av, i, 1));
		809
		810	PUTBACK;
		811	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		812	SPAGAIN;
		813
		814	if (SvTRUE (ERRSV))
		815	{
		816	FREETMPS; LEAVE;
		817	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		818	}
		819
		820	SvREFCNT_dec (sv);
		821	sv = SvREFCNT_inc (POPs);
		822
		823	PUTBACK;
		824
		825	FREETMPS; LEAVE;
		826
		827	return sv;
658		828	}
659	// TODO
660	}
661		829
		830	default:
		831	{
662	AV *av = newAV ();	832	AV *av = newAV ();
663	av_push (av, newSVuv (tag));	833	av_push (av, newSVuv (tag));
664	av_push (av, sv);	834	av_push (av, sv);
665		835
666	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	836	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
667	? cbor_tagged_stash	837	? cbor_tagged_stash
668	: gv_stashpv ("CBOR::XS::Tagged" , 1);	838	: gv_stashpv ("CBOR::XS::Tagged" , 1);
669		839
670	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	840	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		841	}
		842	}
671		843
672	fail:	844	fail:
673	SvREFCNT_dec (sv);	845	SvREFCNT_dec (sv);
674	return &PL_sv_undef;	846	return &PL_sv_undef;
675	}	847	}
…		…
766	}	938	}
767		939
768	static SV *	940	static SV *
769	decode_cbor (SV string, CBOR cbor, char **offset_return)	941	decode_cbor (SV string, CBOR cbor, char **offset_return)
770	{	942	{
771	dec_t dec;	943	dec_t dec = { };
772	SV *sv;	944	SV *sv;
		945	STRLEN len;
		946	char *data = SvPVbyte (string, len);
773		947
774	/* work around bugs in 5.10 where manipulating magic values
775	* makes perl ignore the magic in subsequent accesses.
776	* also make a copy of non-PV values, to get them into a clean
777	* state (SvPV should do that, but it's buggy, see below).
778	*/
779	/SvGETMAGIC (string);/
780	if (SvMAGICAL (string) \|\| !SvPOK (string))
781	string = sv_2mortal (newSVsv (string));
782
783	SvUPGRADE (string, SVt_PV);
784
785	/* work around a bug in perl 5.10, which causes SvCUR to fail an
786	* assertion with -DDEBUGGING, although SvCUR is documented to
787	* return the xpv_cur field which certainly exists after upgrading.
788	* according to nicholas clark, calling SvPOK fixes this.
789	* But it doesn't fix it, so try another workaround, call SvPV_nolen
790	* and hope for the best.
791	* Damnit, SvPV_nolen still trips over yet another assertion. This
792	* assertion business is seriously broken, try yet another workaround
793	* for the broken -DDEBUGGING.
794	*/
795	{
796	#ifdef DEBUGGING
797	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
798	#else
799	STRLEN offset = SvCUR (string);
800	#endif
801
802	if (offset > cbor->max_size && cbor->max_size)	948	if (len > cbor->max_size && cbor->max_size)
803	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	949	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
804	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	950	(unsigned long)len, (unsigned long)cbor->max_size);
805	}
806
807	sv_utf8_downgrade (string, 0);
808		951
809	dec.cbor = *cbor;	952	dec.cbor = *cbor;
810	dec.cur = (U8 *)SvPVX (string);	953	dec.cur = (U8 *)data;
811	dec.end = (U8 *)SvEND (string);	954	dec.end = (U8 *)data + len;
812	dec.err = 0;
813	dec.depth = 0;
814		955
815	sv = decode_sv (&dec);	956	sv = decode_sv (&dec);
816		957
817	if (offset_return)	958	if (offset_return)
818	*offset_return = dec.cur;	959	*offset_return = dec.cur;
…		…
822	dec.err = "garbage after CBOR object";	963	dec.err = "garbage after CBOR object";
823		964
824	if (dec.err)	965	if (dec.err)
825	{	966	{
826	SvREFCNT_dec (sv);	967	SvREFCNT_dec (sv);
827	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	968	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
828	}	969	}
829		970
830	sv = sv_2mortal (sv);	971	sv = sv_2mortal (sv);
831		972
832	return sv;	973	return sv;
…		…
846	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	987	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
847		988
848	types_true = get_bool ("Types::Serialiser::true" );	989	types_true = get_bool ("Types::Serialiser::true" );
849	types_false = get_bool ("Types::Serialiser::false");	990	types_false = get_bool ("Types::Serialiser::false");
850	types_error = get_bool ("Types::Serialiser::error");	991	types_error = get_bool ("Types::Serialiser::error");
		992
		993	sv_cbor = newSVpv ("CBOR", 0);
		994	SvREADONLY_on (sv_cbor);
851	}	995	}
852		996
853	PROTOTYPES: DISABLE	997	PROTOTYPES: DISABLE
854		998
855	void CLONE (...)	999	void CLONE (...)
…		…
873		1017
874	void shrink (CBOR *self, int enable = 1)	1018	void shrink (CBOR *self, int enable = 1)
875	ALIAS:	1019	ALIAS:
876	shrink = F_SHRINK	1020	shrink = F_SHRINK
877	allow_unknown = F_ALLOW_UNKNOWN	1021	allow_unknown = F_ALLOW_UNKNOWN
		1022	allow_sharing = F_ALLOW_SHARING
		1023	dedup_keys = F_DEDUP_KEYS
		1024	dedup_strings = F_DEDUP_STRINGS
878	PPCODE:	1025	PPCODE:
879	{	1026	{
880	if (enable)	1027	if (enable)
881	self->flags \|= ix;	1028	self->flags \|= ix;
882	else	1029	else
…		…
887		1034
888	void get_shrink (CBOR *self)	1035	void get_shrink (CBOR *self)
889	ALIAS:	1036	ALIAS:
890	get_shrink = F_SHRINK	1037	get_shrink = F_SHRINK
891	get_allow_unknown = F_ALLOW_UNKNOWN	1038	get_allow_unknown = F_ALLOW_UNKNOWN
		1039	get_allow_sharing = F_ALLOW_SHARING
		1040	get_dedup_keys = F_DEDUP_KEYS
		1041	get_dedup_strings = F_DEDUP_STRINGS
892	PPCODE:	1042	PPCODE:
893	XPUSHs (boolSV (self->flags & ix));	1043	XPUSHs (boolSV (self->flags & ix));
894		1044
895	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1045	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
896	PPCODE:	1046	PPCODE:
…		…
911	int get_max_size (CBOR *self)	1061	int get_max_size (CBOR *self)
912	CODE:	1062	CODE:
913	RETVAL = self->max_size;	1063	RETVAL = self->max_size;
914	OUTPUT:	1064	OUTPUT:
915	RETVAL	1065	RETVAL
916
917	#if 0 //TODO
918
919	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
920	PPCODE:
921	{
922	SvREFCNT_dec (self->cb_object);
923	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
924
925	XPUSHs (ST (0));
926	}
927
928	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
929	PPCODE:
930	{
931	if (!self->cb_sk_object)
932	self->cb_sk_object = newHV ();
933
934	if (SvOK (cb))
935	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
936	else
937	{
938	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
939
940	if (!HvKEYS (self->cb_sk_object))
941	{
942	SvREFCNT_dec (self->cb_sk_object);
943	self->cb_sk_object = 0;
944	}
945	}
946
947	XPUSHs (ST (0));
948	}
949
950	#endif
951		1066
952	void encode (CBOR self, SV scalar)	1067	void encode (CBOR self, SV scalar)
953	PPCODE:	1068	PPCODE:
954	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1069	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
955	XPUSHs (scalar);	1070	XPUSHs (scalar);
…		…
968	EXTEND (SP, 2);	1083	EXTEND (SP, 2);
969	PUSHs (sv);	1084	PUSHs (sv);
970	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1085	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
971	}	1086	}
972		1087
973	#if 0
974
975	void DESTROY (CBOR *self)
976	CODE:
977	SvREFCNT_dec (self->cb_sk_object);
978	SvREFCNT_dec (self->cb_object);
979
980	#endif
981
982	PROTOTYPES: ENABLE	1088	PROTOTYPES: ENABLE
983		1089
984	void encode_cbor (SV *scalar)	1090	void encode_cbor (SV *scalar)
985	PPCODE:	1091	PPCODE:
986	{	1092	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.10 by root, Sun Oct 27 20:40:25 2013 UTC vs. Revision 1.18 by root, Wed Nov 20 01:09:46 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.10 by root, Sun Oct 27 20:40:25 2013 UTC vs.
Revision 1.18 by root, Wed Nov 20 01:09:46 2013 UTC