[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.19 by root, Wed Nov 20 02:03:09 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; // string => index, or 0
		141	HV *shareable; // ptr => index, or 0
		142	UV shareable_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
196	static void encode_sv (enc_t enc, SV sv);	219	static void encode_sv (enc_t enc, SV sv);
197		220
198	static void	221	static void
199	encode_av (enc_t enc, AV av)	222	encode_av (enc_t enc, AV av)
200	{	223	{
…		…
252		275
253	// encode objects, arrays and special \0=false and \1=true values.	276	// encode objects, arrays and special \0=false and \1=true values.
254	static void	277	static void
255	encode_rv (enc_t enc, SV sv)	278	encode_rv (enc_t enc, SV sv)
256	{	279	{
257	svtype svt;
258
259	SvGETMAGIC (sv);	280	SvGETMAGIC (sv);
		281
		282	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		283	&& ecb_expect_false (SvREFCNT (sv) > 1))
		284	{
		285	if (!enc->shareable)
		286	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		287
		288	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		289
		290	if (SvOK (*svp))
		291	{
		292	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		293	encode_uint (enc, 0x00, SvUV (*svp));
		294	return;
		295	}
		296	else
		297	{
		298	sv_setuv (*svp, enc->shareable_idx);
		299	++enc->shareable_idx;
		300	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		301	}
		302	}
		303
260	svt = SvTYPE (sv);	304	svtype svt = SvTYPE (sv);
261		305
262	if (ecb_expect_false (SvOBJECT (sv)))	306	if (ecb_expect_false (SvOBJECT (sv)))
263	{	307	{
264	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	308	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
265	? cbor_boolean_stash	309	? types_boolean_stash
266	: gv_stashpv ("CBOR::XS::Boolean", 1);	310	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		311	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		312	? types_error_stash
		313	: gv_stashpv ("Types::Serialiser::Error", 1);
267	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
268	? cbor_tagged_stash	315	? cbor_tagged_stash
269	: gv_stashpv ("CBOR::XS::Tagged" , 1);	316	: gv_stashpv ("CBOR::XS::Tagged" , 1);
270		317
		318	HV *stash = SvSTASH (sv);
		319	GV *method;
		320
271	if (SvSTASH (sv) == boolean_stash)	321	if (stash == boolean_stash)
272	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	322	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		323	else if (stash == error_stash)
		324	encode_ch (enc, 0xe0 \| 23);
273	else if (SvSTASH (sv) == tagged_stash)	325	else if (stash == tagged_stash)
274	{	326	{
275	if (svt != SVt_PVAV)	327	if (svt != SVt_PVAV)
276	croak ("encountered CBOR::XS::Tagged object that isn't an array");	328	croak ("encountered CBOR::XS::Tagged object that isn't an array");
277		329
278	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
279	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	331	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
280	}	332	}
		333	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		334	{
		335	dSP;
		336
		337	ENTER; SAVETMPS; PUSHMARK (SP);
		338	// we re-bless the reference to get overload and other niceties right
		339	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		340
		341	PUTBACK;
		342	// G_SCALAR ensures that return value is 1
		343	call_sv ((SV *)GvCV (method), G_SCALAR);
		344	SPAGAIN;
		345
		346	// catch this surprisingly common error
		347	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		348	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		349
		350	encode_sv (enc, POPs);
		351
		352	PUTBACK;
		353
		354	FREETMPS; LEAVE;
		355	}
		356	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		357	{
		358	dSP;
		359
		360	ENTER; SAVETMPS; PUSHMARK (SP);
		361	EXTEND (SP, 2);
		362	// we re-bless the reference to get overload and other niceties right
		363	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		364	PUSHs (sv_cbor);
		365
		366	PUTBACK;
		367	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		368	SPAGAIN;
		369
		370	// catch this surprisingly common error
		371	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		372	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		373
		374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		375	encode_uint (enc, 0x80, count + 1);
		376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		377
		378	while (count)
		379	encode_sv (enc, SP[1 - count--]);
		380
		381	PUTBACK;
		382
		383	FREETMPS; LEAVE;
		384	}
281	else	385	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",	386	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
311	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	387	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312	}
313	}	388	}
314	else if (svt == SVt_PVHV)	389	else if (svt == SVt_PVHV)
315	encode_hv (enc, (HV *)sv);	390	encode_hv (enc, (HV *)sv);
316	else if (svt == SVt_PVAV)	391	else if (svt == SVt_PVAV)
317	encode_av (enc, (AV *)sv);	392	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	393	else
336	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	394	{
337	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	395	encode_tag (enc, CBOR_TAG_INDIRECTION);
		396	encode_sv (enc, sv);
		397	}
338	}	398	}
339		399
340	static void	400	static void
341	encode_nv (enc_t enc, SV sv)	401	encode_nv (enc_t enc, SV sv)
342	{	402	{
…		…
407	}	467	}
408		468
409	static SV *	469	static SV *
410	encode_cbor (SV scalar, CBOR cbor)	470	encode_cbor (SV scalar, CBOR cbor)
411	{	471	{
412	enc_t enc;	472	enc_t enc = { };
413		473
414	enc.cbor = *cbor;	474	enc.cbor = *cbor;
415	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
416	enc.cur = SvPVX (enc.sv);	476	enc.cur = SvPVX (enc.sv);
417	enc.end = SvEND (enc.sv);	477	enc.end = SvEND (enc.sv);
418	enc.depth = 0;
419		478
420	SvPOK_only (enc.sv);	479	SvPOK_only (enc.sv);
421	encode_sv (&enc, scalar);	480	encode_sv (&enc, scalar);
422		481
423	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
439	U8 *end; // end of input string	498	U8 *end; // end of input string
440	const char *err; // parse error, if != 0	499	const char *err; // parse error, if != 0
441	CBOR cbor;	500	CBOR cbor;
442	U32 depth; // recursion depth	501	U32 depth; // recursion depth
443	U32 maxdepth; // recursion depth limit	502	U32 maxdepth; // recursion depth limit
		503	AV *shareable;
444	} dec_t;	504	} dec_t;
445		505
446	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	506	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
447		507
448	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	508	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
542	SvREFCNT_dec (av);	602	SvREFCNT_dec (av);
543	DEC_DEC_DEPTH;	603	DEC_DEC_DEPTH;
544	return &PL_sv_undef;	604	return &PL_sv_undef;
545	}	605	}
546		606
		607	static void
		608	decode_he (dec_t dec, HV hv)
		609	{
		610	// for speed reasons, we specialcase single-string
		611	// byte or utf-8 strings as keys.
		612
		613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		614	{
		615	I32 len = decode_uint (dec);
		616	char key = (char )dec->cur;
		617
		618	dec->cur += len;
		619
		620	hv_store (hv, key, len, decode_sv (dec), 0);
		621	}
		622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		623	{
		624	I32 len = decode_uint (dec);
		625	char key = (char )dec->cur;
		626
		627	dec->cur += len;
		628
		629	hv_store (hv, key, -len, decode_sv (dec), 0);
		630	}
		631	else
		632	{
		633	SV *k = decode_sv (dec);
		634	SV *v = decode_sv (dec);
		635
		636	hv_store_ent (hv, k, v, 0);
		637	SvREFCNT_dec (k);
		638	}
		639	}
		640
547	static SV *	641	static SV *
548	decode_hv (dec_t *dec)	642	decode_hv (dec_t *dec)
549	{	643	{
550	HV *hv = newHV ();	644	HV *hv = newHV ();
551		645
…		…
563	{	657	{
564	++dec->cur;	658	++dec->cur;
565	break;	659	break;
566	}	660	}
567		661
568	SV *k = decode_sv (dec);	662	decode_he (dec, hv);
569	SV *v = decode_sv (dec);
570
571	hv_store_ent (hv, k, v, 0);
572	}	663	}
573	}	664	}
574	else	665	else
575	{	666	{
576	int len = decode_uint (dec);	667	int pairs = decode_uint (dec);
577		668
578	while (len--)	669	while (pairs--)
579	{	670	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	}	671	}
586		672
587	DEC_DEC_DEPTH;	673	DEC_DEC_DEPTH;
588	return newRV_noinc ((SV *)hv);	674	return newRV_noinc ((SV *)hv);
589		675
…		…
638	}	724	}
639		725
640	static SV *	726	static SV *
641	decode_tagged (dec_t *dec)	727	decode_tagged (dec_t *dec)
642	{	728	{
		729	SV *sv = 0;
643	UV tag = decode_uint (dec);	730	UV tag = decode_uint (dec);
		731
		732	WANT (1);
		733
		734	switch (tag)
		735	{
		736	case CBOR_TAG_MAGIC:
		737	return decode_sv (dec);
		738
		739	case CBOR_TAG_INDIRECTION:
		740	return newRV_noinc (decode_sv (dec));
		741
		742	case CBOR_TAG_VALUE_SHAREABLE:
		743	{
		744	if (ecb_expect_false (!dec->shareable))
		745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		746
		747	sv = newSV (0);
		748	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		749
644	SV *sv = decode_sv (dec);	750	SV *osv = decode_sv (dec);
		751	sv_setsv (sv, osv);
		752	SvREFCNT_dec_NN (osv);
		753	}
645		754
646	if (tag == CBOR_TAG_MAGIC)
647	return sv;	755	return sv;
648		756
649	if (tag == CBOR_TAG_PERL_OBJECT)	757	case CBOR_TAG_VALUE_SHAREDREF:
650	{	758	{
		759	if ((*dec->cur >> 5) != 0)
		760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		761
		762	UV idx = decode_uint (dec);
		763
		764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))
		765	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		766
		767	return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		768	}
		769
		770	case CBOR_TAG_PERL_OBJECT:
		771	{
		772	sv = decode_sv (dec);
		773
651	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	774	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
652	ERR ("corrupted CBOR data (non-array perl object)");	775	ERR ("corrupted CBOR data (non-array perl object)");
		776
		777	AV av = (AV )SvRV (sv);
		778	int len = av_len (av) + 1;
		779	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		780
		781	if (!stash)
		782	ERR ("cannot decode perl-object (package does not exist)");
		783
		784	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		785
		786	if (!method)
		787	ERR ("cannot decode perl-object (package does not have a THAW method)");
		788
		789	dSP;
		790
		791	ENTER; SAVETMPS; PUSHMARK (SP);
		792	EXTEND (SP, len + 1);
		793	// we re-bless the reference to get overload and other niceties right
		794	PUSHs (*av_fetch (av, 0, 1));
		795	PUSHs (sv_cbor);
		796
		797	int i;
		798
		799	for (i = 1; i < len; ++i)
		800	PUSHs (*av_fetch (av, i, 1));
		801
		802	PUTBACK;
		803	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		804	SPAGAIN;
		805
		806	if (SvTRUE (ERRSV))
		807	{
		808	FREETMPS; LEAVE;
		809	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		810	}
		811
		812	SvREFCNT_dec (sv);
		813	sv = SvREFCNT_inc (POPs);
		814
		815	PUTBACK;
		816
		817	FREETMPS; LEAVE;
		818
		819	return sv;
653		820	}
654	// TODO
655	}
656		821
		822	default:
		823	{
		824	sv = decode_sv (dec);
		825
657	AV *av = newAV ();	826	AV *av = newAV ();
658	av_push (av, newSVuv (tag));	827	av_push (av, newSVuv (tag));
659	av_push (av, sv);	828	av_push (av, sv);
660		829
661	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
662	? cbor_tagged_stash	831	? cbor_tagged_stash
663	: gv_stashpv ("CBOR::XS::Tagged" , 1);	832	: gv_stashpv ("CBOR::XS::Tagged" , 1);
664		833
665	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		835	}
		836	}
666		837
667	fail:	838	fail:
668	SvREFCNT_dec (sv);	839	SvREFCNT_dec (sv);
669	return &PL_sv_undef;	840	return &PL_sv_undef;
670	}	841	}
…		…
693	case 7: // misc	864	case 7: // misc
694	switch (*dec->cur++ & 31)	865	switch (*dec->cur++ & 31)
695	{	866	{
696	case 20:	867	case 20:
697	#if CBOR_SLOW	868	#if CBOR_SLOW
698	cbor_false = get_bool ("CBOR::XS::false");	869	types_false = get_bool ("Types::Serialiser::false");
699	#endif	870	#endif
700	return newSVsv (cbor_false);	871	return newSVsv (types_false);
701	case 21:	872	case 21:
702	#if CBOR_SLOW	873	#if CBOR_SLOW
703	cbor_true = get_bool ("CBOR::XS::true");	874	types_true = get_bool ("Types::Serialiser::true");
704	#endif	875	#endif
705	return newSVsv (cbor_true);	876	return newSVsv (types_true);
706	case 22:	877	case 22:
707	return newSVsv (&PL_sv_undef);	878	return newSVsv (&PL_sv_undef);
		879	case 23:
		880	#if CBOR_SLOW
		881	types_error = get_bool ("Types::Serialiser::error");
		882	#endif
		883	return newSVsv (types_error);
708		884
709	case 25:	885	case 25:
710	{	886	{
711	WANT (2);	887	WANT (2);
712		888
…		…
756	}	932	}
757		933
758	static SV *	934	static SV *
759	decode_cbor (SV string, CBOR cbor, char **offset_return)	935	decode_cbor (SV string, CBOR cbor, char **offset_return)
760	{	936	{
761	dec_t dec;	937	dec_t dec = { };
762	SV *sv;	938	SV *sv;
		939	STRLEN len;
		940	char *data = SvPVbyte (string, len);
763		941
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)	942	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",	943	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);	944	(unsigned long)len, (unsigned long)cbor->max_size);
795	}
796
797	sv_utf8_downgrade (string, 0);
798		945
799	dec.cbor = *cbor;	946	dec.cbor = *cbor;
800	dec.cur = (U8 *)SvPVX (string);	947	dec.cur = (U8 *)data;
801	dec.end = (U8 *)SvEND (string);	948	dec.end = (U8 *)data + len;
802	dec.err = 0;
803	dec.depth = 0;
804		949
805	sv = decode_sv (&dec);	950	sv = decode_sv (&dec);
806		951
807	if (offset_return)	952	if (offset_return)
808	*offset_return = dec.cur;	953	*offset_return = dec.cur;
…		…
812	dec.err = "garbage after CBOR object";	957	dec.err = "garbage after CBOR object";
813		958
814	if (dec.err)	959	if (dec.err)
815	{	960	{
816	SvREFCNT_dec (sv);	961	SvREFCNT_dec (sv);
817	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	962	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
818	}	963	}
819		964
820	sv = sv_2mortal (sv);	965	sv = sv_2mortal (sv);
821		966
822	return sv;	967	return sv;
…		…
828	MODULE = CBOR::XS PACKAGE = CBOR::XS	973	MODULE = CBOR::XS PACKAGE = CBOR::XS
829		974
830	BOOT:	975	BOOT:
831	{	976	{
832	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	977	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);	978	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
835		979
836	cbor_true = get_bool ("CBOR::XS::true");	980	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
837	cbor_false = get_bool ("CBOR::XS::false");	981	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		982
		983	types_true = get_bool ("Types::Serialiser::true" );
		984	types_false = get_bool ("Types::Serialiser::false");
		985	types_error = get_bool ("Types::Serialiser::error");
		986
		987	sv_cbor = newSVpv ("CBOR", 0);
		988	SvREADONLY_on (sv_cbor);
838	}	989	}
839		990
840	PROTOTYPES: DISABLE	991	PROTOTYPES: DISABLE
841		992
842	void CLONE (...)	993	void CLONE (...)
843	CODE:	994	CODE:
844	cbor_stash = 0;	995	cbor_stash = 0;
845	cbor_boolean_stash = 0;
846	cbor_tagged_stash = 0;	996	cbor_tagged_stash = 0;
		997	types_error_stash = 0;
		998	types_boolean_stash = 0;
847		999
848	void new (char *klass)	1000	void new (char *klass)
849	PPCODE:	1001	PPCODE:
850	{	1002	{
851	SV *pv = NEWSV (0, sizeof (CBOR));	1003	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
859		1011
860	void shrink (CBOR *self, int enable = 1)	1012	void shrink (CBOR *self, int enable = 1)
861	ALIAS:	1013	ALIAS:
862	shrink = F_SHRINK	1014	shrink = F_SHRINK
863	allow_unknown = F_ALLOW_UNKNOWN	1015	allow_unknown = F_ALLOW_UNKNOWN
		1016	allow_sharing = F_ALLOW_SHARING
		1017	dedup_keys = F_DEDUP_KEYS
		1018	dedup_strings = F_DEDUP_STRINGS
864	PPCODE:	1019	PPCODE:
865	{	1020	{
866	if (enable)	1021	if (enable)
867	self->flags \|= ix;	1022	self->flags \|= ix;
868	else	1023	else
…		…
873		1028
874	void get_shrink (CBOR *self)	1029	void get_shrink (CBOR *self)
875	ALIAS:	1030	ALIAS:
876	get_shrink = F_SHRINK	1031	get_shrink = F_SHRINK
877	get_allow_unknown = F_ALLOW_UNKNOWN	1032	get_allow_unknown = F_ALLOW_UNKNOWN
		1033	get_allow_sharing = F_ALLOW_SHARING
		1034	get_dedup_keys = F_DEDUP_KEYS
		1035	get_dedup_strings = F_DEDUP_STRINGS
878	PPCODE:	1036	PPCODE:
879	XPUSHs (boolSV (self->flags & ix));	1037	XPUSHs (boolSV (self->flags & ix));
880		1038
881	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
882	PPCODE:	1040	PPCODE:
…		…
897	int get_max_size (CBOR *self)	1055	int get_max_size (CBOR *self)
898	CODE:	1056	CODE:
899	RETVAL = self->max_size;	1057	RETVAL = self->max_size;
900	OUTPUT:	1058	OUTPUT:
901	RETVAL	1059	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		1060
938	void encode (CBOR self, SV scalar)	1061	void encode (CBOR self, SV scalar)
939	PPCODE:	1062	PPCODE:
940	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1063	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
941	XPUSHs (scalar);	1064	XPUSHs (scalar);
…		…
954	EXTEND (SP, 2);	1077	EXTEND (SP, 2);
955	PUSHs (sv);	1078	PUSHs (sv);
956	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
957	}	1080	}
958		1081
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	1082	PROTOTYPES: ENABLE
969		1083
970	void encode_cbor (SV *scalar)	1084	void encode_cbor (SV *scalar)
971	PPCODE:	1085	PPCODE:
972	{	1086	{

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.19 by root, Wed Nov 20 02:03:09 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.19 by root, Wed Nov 20 02:03:09 2013 UTC