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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.6 by root, Sat Oct 26 22:25:47 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
		25	// known tags
		26	enum cbor_tag
		27	{
		28	// inofficial extensions (pending iana registration)
		29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
		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
		36
		37	// rfc7049
		38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		40	CBOR_TAG_POS_BIGNUM = 2, // byte string
		41	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		43	CBOR_TAG_BIGFLOAT = 5, // array
		44
		45	CBOR_TAG_CONV_B64U = 21, // base64url, any
		46	CBOR_TAG_CONV_B64 = 22, // base64, any
		47	CBOR_TAG_CONV_HEX = 23, // base16, any
		48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		49
		50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		55
		56	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		57	};
		58
14	#define F_SHRINK 0x00000200UL	59	#define F_SHRINK 0x00000001UL
15	#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
16		64
17	#define INIT_SIZE 32 // initial scalar size to be allocated	65	#define INIT_SIZE 32 // initial scalar size to be allocated
18		66
19	#define SB do {	67	#define SB do {
20	#define SE } while (0)	68	#define SE } while (0)
…		…
31	#else	79	#else
32	# define CBOR_SLOW 0	80	# define CBOR_SLOW 0
33	# define CBOR_STASH cbor_stash	81	# define CBOR_STASH cbor_stash
34	#endif	82	#endif
35		83
36	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::
37	static SV cbor_true, cbor_false;	85	static SV types_true, types_false, types_error, sv_cbor;
38		86
39	typedef struct {	87	typedef struct {
40	U32 flags;	88	U32 flags;
41	U32 max_depth;	89	U32 max_depth;
42	STRLEN max_size;	90	STRLEN max_size;
…		…
77	#endif	125	#endif
78	}	126	}
79	}	127	}
80		128
81	/////////////////////////////////////////////////////////////////////////////	129	/////////////////////////////////////////////////////////////////////////////
82	// fp hell
83
84	//TODO
85
86	/////////////////////////////////////////////////////////////////////////////
87	// encoder	130	// encoder
88		131
89	// structure used for encoding CBOR	132	// structure used for encoding CBOR
90	typedef struct	133	typedef struct
91	{	134	{
92	char *cur; // SvPVX (sv) + current output position	135	char *cur; // SvPVX (sv) + current output position
93	char *end; // SvEND (sv)	136	char *end; // SvEND (sv)
94	SV *sv; // result scalar	137	SV *sv; // result scalar
95	CBOR cbor;	138	CBOR cbor;
96	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;
97	} enc_t;	143	} enc_t;
98		144
99	ecb_inline void	145	ecb_inline void
100	need (enc_t *enc, STRLEN len)	146	need (enc_t *enc, STRLEN len)
101	{	147	{
…		…
162	need (enc, len);	208	need (enc, len);
163	memcpy (enc->cur, str, len);	209	memcpy (enc->cur, str, len);
164	enc->cur += len;	210	enc->cur += len;
165	}	211	}
166		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
167	static void encode_sv (enc_t enc, SV sv);	253	static void encode_sv (enc_t enc, SV sv);
168		254
169	static void	255	static void
170	encode_av (enc_t enc, AV av)	256	encode_av (enc_t enc, AV av)
171	{	257	{
…		…
228	svtype svt;	314	svtype svt;
229		315
230	SvGETMAGIC (sv);	316	SvGETMAGIC (sv);
231	svt = SvTYPE (sv);	317	svt = SvTYPE (sv);
232		318
		319	if (encode_sharable (enc, sv))
		320	return;
		321
233	if (ecb_expect_false (SvOBJECT (sv)))	322	if (ecb_expect_false (SvOBJECT (sv)))
234	{	323	{
235	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	324	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
236	? cbor_boolean_stash	325	? types_boolean_stash
237	: gv_stashpv ("CBOR::XS::Boolean", 1);	326	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		327	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		328	? types_error_stash
		329	: gv_stashpv ("Types::Serialiser::Error", 1);
238	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	330	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
239	? cbor_tagged_stash	331	? cbor_tagged_stash
240	: gv_stashpv ("CBOR::XS::Tagged" , 1);	332	: gv_stashpv ("CBOR::XS::Tagged" , 1);
241		333
		334	HV *stash = SvSTASH (sv);
		335	GV *method;
		336
242	if (SvSTASH (sv) == boolean_stash)	337	if (stash == boolean_stash)
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	338	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		339	else if (stash == error_stash)
		340	encode_ch (enc, 0xe0 \| 23);
244	else if (SvSTASH (sv) == tagged_stash)	341	else if (stash == tagged_stash)
245	{	342	{
246	if (svt != SVt_PVAV)	343	if (svt != SVt_PVAV)
247	croak ("encountered CBOR::XS::Tagged object that isn't an array");	344	croak ("encountered CBOR::XS::Tagged object that isn't an array");
248		345
249	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	346	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
250	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	347	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
251	}	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	}
252	else	401	else
253	{
254	// we re-bless the reference to get overload and other niceties right
255	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257	if (to_cbor)
258	{
259	dSP;
260
261	ENTER; SAVETMPS; PUSHMARK (SP);
262	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
263
264	// calling with G_SCALAR ensures that we always get a 1 return value
265	PUTBACK;
266	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
267	SPAGAIN;
268
269	// catch this surprisingly common error
270	if (SvROK (TOPs) && SvRV (TOPs) == sv)
271	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
272
273	sv = POPs;
274	PUTBACK;
275
276	encode_sv (enc, sv);
277
278	FREETMPS; LEAVE;
279	}
280	else
281	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",
282	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	403	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283	}
284	}	404	}
285	else if (svt == SVt_PVHV)	405	else if (svt == SVt_PVHV)
286	encode_hv (enc, (HV *)sv);	406	encode_hv (enc, (HV *)sv);
287	else if (svt == SVt_PVAV)	407	else if (svt == SVt_PVAV)
288	encode_av (enc, (AV *)sv);	408	encode_av (enc, (AV *)sv);
289	else if (svt < SVt_PVAV)
290	{
291	STRLEN len = 0;
292	char *pv = svt ? SvPV (sv, len) : 0;
293
294	if (len == 1 && *pv == '1')
295	encode_ch (enc, 0xe0 \| 21);
296	else if (len == 1 && *pv == '0')
297	encode_ch (enc, 0xe0 \| 20);
298	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299	encode_ch (enc, 0xe0 \| 23);
300	else
301	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303	}
304	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305	encode_ch (enc, 0xe0 \| 23);
306	else	409	else
307	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	410	{
308	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	411	encode_tag (enc, CBOR_TAG_INDIRECTION);
		412	encode_sv (enc, sv);
		413	}
309	}	414	}
310		415
311	static void	416	static void
312	encode_nv (enc_t enc, SV sv)	417	encode_nv (enc_t enc, SV sv)
313	{	418	{
…		…
346		451
347	static void	452	static void
348	encode_sv (enc_t enc, SV sv)	453	encode_sv (enc_t enc, SV sv)
349	{	454	{
350	SvGETMAGIC (sv);	455	SvGETMAGIC (sv);
		456
		457	if (encode_sharable (enc, sv))
		458	return;
351		459
352	if (SvPOKp (sv))	460	if (SvPOKp (sv))
353	{	461	{
354	STRLEN len;	462	STRLEN len;
355	char *str = SvPV (sv, len);	463	char *str = SvPV (sv, len);
…		…
378	}	486	}
379		487
380	static SV *	488	static SV *
381	encode_cbor (SV scalar, CBOR cbor)	489	encode_cbor (SV scalar, CBOR cbor)
382	{	490	{
383	enc_t enc;	491	enc_t enc = { };
384		492
385	enc.cbor = *cbor;	493	enc.cbor = *cbor;
386	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	494	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387	enc.cur = SvPVX (enc.sv);	495	enc.cur = SvPVX (enc.sv);
388	enc.end = SvEND (enc.sv);	496	enc.end = SvEND (enc.sv);
389	enc.depth = 0;
390		497
391	SvPOK_only (enc.sv);	498	SvPOK_only (enc.sv);
392	encode_sv (&enc, scalar);	499	encode_sv (&enc, scalar);
393		500
394	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	501	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
410	U8 *end; // end of input string	517	U8 *end; // end of input string
411	const char *err; // parse error, if != 0	518	const char *err; // parse error, if != 0
412	CBOR cbor;	519	CBOR cbor;
413	U32 depth; // recursion depth	520	U32 depth; // recursion depth
414	U32 maxdepth; // recursion depth limit	521	U32 maxdepth; // recursion depth limit
		522	AV *sharable;
415	} dec_t;	523	} dec_t;
416		524
417	#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
418		526
419	#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")
…		…
513	SvREFCNT_dec (av);	621	SvREFCNT_dec (av);
514	DEC_DEC_DEPTH;	622	DEC_DEC_DEPTH;
515	return &PL_sv_undef;	623	return &PL_sv_undef;
516	}	624	}
517		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
518	static SV *	660	static SV *
519	decode_hv (dec_t *dec)	661	decode_hv (dec_t *dec)
520	{	662	{
521	HV *hv = newHV ();	663	HV *hv = newHV ();
522		664
…		…
534	{	676	{
535	++dec->cur;	677	++dec->cur;
536	break;	678	break;
537	}	679	}
538		680
539	SV *k = decode_sv (dec);	681	decode_he (dec, hv);
540	SV *v = decode_sv (dec);
541
542	hv_store_ent (hv, k, v, 0);
543	}	682	}
544	}	683	}
545	else	684	else
546	{	685	{
547	int len = decode_uint (dec);	686	int pairs = decode_uint (dec);
548		687
549	while (len--)	688	while (pairs--)
550	{	689	decode_he (dec, hv);
551	SV *k = decode_sv (dec);
552	SV *v = decode_sv (dec);
553
554	hv_store_ent (hv, k, v, 0);
555	}
556	}	690	}
557		691
558	DEC_DEC_DEPTH;	692	DEC_DEC_DEPTH;
559	return newRV_noinc ((SV *)hv);	693	return newRV_noinc ((SV *)hv);
560		694
…		…
612	decode_tagged (dec_t *dec)	746	decode_tagged (dec_t *dec)
613	{	747	{
614	UV tag = decode_uint (dec);	748	UV tag = decode_uint (dec);
615	SV *sv = decode_sv (dec);	749	SV *sv = decode_sv (dec);
616		750
617	if (tag == 55799) // 2.4.5 Self-Describe CBOR	751	switch (tag)
		752	{
		753	case CBOR_TAG_MAGIC:
618	return sv;	754	return sv;
619		755
		756	case CBOR_TAG_INDIRECTION:
		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	{
		782	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		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;
		828	}
		829
		830	default:
		831	{
620	AV *av = newAV ();	832	AV *av = newAV ();
621	av_push (av, newSVuv (tag));	833	av_push (av, newSVuv (tag));
622	av_push (av, sv);	834	av_push (av, sv);
623	return newRV_noinc ((SV *)av);	835
		836	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		837	? cbor_tagged_stash
		838	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		839
		840	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		841	}
		842	}
		843
		844	fail:
		845	SvREFCNT_dec (sv);
		846	return &PL_sv_undef;
624	}	847	}
625		848
626	static SV *	849	static SV *
627	decode_sv (dec_t *dec)	850	decode_sv (dec_t *dec)
628	{	851	{
…		…
647	case 7: // misc	870	case 7: // misc
648	switch (*dec->cur++ & 31)	871	switch (*dec->cur++ & 31)
649	{	872	{
650	case 20:	873	case 20:
651	#if CBOR_SLOW	874	#if CBOR_SLOW
652	cbor_false = get_bool ("CBOR::XS::false");	875	types_false = get_bool ("Types::Serialiser::false");
653	#endif	876	#endif
654	return newSVsv (cbor_false);	877	return newSVsv (types_false);
655	case 21:	878	case 21:
656	#if CBOR_SLOW	879	#if CBOR_SLOW
657	cbor_true = get_bool ("CBOR::XS::true");	880	types_true = get_bool ("Types::Serialiser::true");
658	#endif	881	#endif
659	return newSVsv (cbor_true);	882	return newSVsv (types_true);
660	case 22:	883	case 22:
661	return newSVsv (&PL_sv_undef);	884	return newSVsv (&PL_sv_undef);
		885	case 23:
		886	#if CBOR_SLOW
		887	types_error = get_bool ("Types::Serialiser::error");
		888	#endif
		889	return newSVsv (types_error);
662		890
663	case 25:	891	case 25:
664	{	892	{
665	WANT (2);	893	WANT (2);
666		894
…		…
710	}	938	}
711		939
712	static SV *	940	static SV *
713	decode_cbor (SV string, CBOR cbor, char **offset_return)	941	decode_cbor (SV string, CBOR cbor, char **offset_return)
714	{	942	{
715	dec_t dec;	943	dec_t dec = { };
716	SV *sv;	944	SV *sv;
		945	STRLEN len;
		946	char *data = SvPVbyte (string, len);
717		947
718	/* work around bugs in 5.10 where manipulating magic values
719	* makes perl ignore the magic in subsequent accesses.
720	* also make a copy of non-PV values, to get them into a clean
721	* state (SvPV should do that, but it's buggy, see below).
722	*/
723	/SvGETMAGIC (string);/
724	if (SvMAGICAL (string) \|\| !SvPOK (string))
725	string = sv_2mortal (newSVsv (string));
726
727	SvUPGRADE (string, SVt_PV);
728
729	/* work around a bug in perl 5.10, which causes SvCUR to fail an
730	* assertion with -DDEBUGGING, although SvCUR is documented to
731	* return the xpv_cur field which certainly exists after upgrading.
732	* according to nicholas clark, calling SvPOK fixes this.
733	* But it doesn't fix it, so try another workaround, call SvPV_nolen
734	* and hope for the best.
735	* Damnit, SvPV_nolen still trips over yet another assertion. This
736	* assertion business is seriously broken, try yet another workaround
737	* for the broken -DDEBUGGING.
738	*/
739	{
740	#ifdef DEBUGGING
741	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
742	#else
743	STRLEN offset = SvCUR (string);
744	#endif
745
746	if (offset > cbor->max_size && cbor->max_size)	948	if (len > cbor->max_size && cbor->max_size)
747	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",
748	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	950	(unsigned long)len, (unsigned long)cbor->max_size);
749	}
750
751	sv_utf8_downgrade (string, 0);
752		951
753	dec.cbor = *cbor;	952	dec.cbor = *cbor;
754	dec.cur = (U8 *)SvPVX (string);	953	dec.cur = (U8 *)data;
755	dec.end = (U8 *)SvEND (string);	954	dec.end = (U8 *)data + len;
756	dec.err = 0;
757	dec.depth = 0;
758		955
759	sv = decode_sv (&dec);	956	sv = decode_sv (&dec);
760		957
761	if (offset_return)	958	if (offset_return)
762	*offset_return = dec.cur;	959	*offset_return = dec.cur;
…		…
766	dec.err = "garbage after CBOR object";	963	dec.err = "garbage after CBOR object";
767		964
768	if (dec.err)	965	if (dec.err)
769	{	966	{
770	SvREFCNT_dec (sv);	967	SvREFCNT_dec (sv);
771	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);
772	}	969	}
773		970
774	sv = sv_2mortal (sv);	971	sv = sv_2mortal (sv);
775		972
776	return sv;	973	return sv;
…		…
782	MODULE = CBOR::XS PACKAGE = CBOR::XS	979	MODULE = CBOR::XS PACKAGE = CBOR::XS
783		980
784	BOOT:	981	BOOT:
785	{	982	{
786	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	983	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
787	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
788	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	984	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
789		985
790	cbor_true = get_bool ("CBOR::XS::true");	986	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
791	cbor_false = get_bool ("CBOR::XS::false");	987	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		988
		989	types_true = get_bool ("Types::Serialiser::true" );
		990	types_false = get_bool ("Types::Serialiser::false");
		991	types_error = get_bool ("Types::Serialiser::error");
		992
		993	sv_cbor = newSVpv ("CBOR", 0);
		994	SvREADONLY_on (sv_cbor);
792	}	995	}
793		996
794	PROTOTYPES: DISABLE	997	PROTOTYPES: DISABLE
795		998
796	void CLONE (...)	999	void CLONE (...)
797	CODE:	1000	CODE:
798	cbor_stash = 0;	1001	cbor_stash = 0;
799	cbor_boolean_stash = 0;
800	cbor_tagged_stash = 0;	1002	cbor_tagged_stash = 0;
		1003	types_error_stash = 0;
		1004	types_boolean_stash = 0;
801		1005
802	void new (char *klass)	1006	void new (char *klass)
803	PPCODE:	1007	PPCODE:
804	{	1008	{
805	SV *pv = NEWSV (0, sizeof (CBOR));	1009	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
813		1017
814	void shrink (CBOR *self, int enable = 1)	1018	void shrink (CBOR *self, int enable = 1)
815	ALIAS:	1019	ALIAS:
816	shrink = F_SHRINK	1020	shrink = F_SHRINK
817	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
818	PPCODE:	1025	PPCODE:
819	{	1026	{
820	if (enable)	1027	if (enable)
821	self->flags \|= ix;	1028	self->flags \|= ix;
822	else	1029	else
…		…
827		1034
828	void get_shrink (CBOR *self)	1035	void get_shrink (CBOR *self)
829	ALIAS:	1036	ALIAS:
830	get_shrink = F_SHRINK	1037	get_shrink = F_SHRINK
831	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
832	PPCODE:	1042	PPCODE:
833	XPUSHs (boolSV (self->flags & ix));	1043	XPUSHs (boolSV (self->flags & ix));
834		1044
835	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1045	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
836	PPCODE:	1046	PPCODE:
…		…
851	int get_max_size (CBOR *self)	1061	int get_max_size (CBOR *self)
852	CODE:	1062	CODE:
853	RETVAL = self->max_size;	1063	RETVAL = self->max_size;
854	OUTPUT:	1064	OUTPUT:
855	RETVAL	1065	RETVAL
856
857	#if 0 //TODO
858
859	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
860	PPCODE:
861	{
862	SvREFCNT_dec (self->cb_object);
863	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
864
865	XPUSHs (ST (0));
866	}
867
868	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
869	PPCODE:
870	{
871	if (!self->cb_sk_object)
872	self->cb_sk_object = newHV ();
873
874	if (SvOK (cb))
875	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
876	else
877	{
878	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
879
880	if (!HvKEYS (self->cb_sk_object))
881	{
882	SvREFCNT_dec (self->cb_sk_object);
883	self->cb_sk_object = 0;
884	}
885	}
886
887	XPUSHs (ST (0));
888	}
889
890	#endif
891		1066
892	void encode (CBOR self, SV scalar)	1067	void encode (CBOR self, SV scalar)
893	PPCODE:	1068	PPCODE:
894	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1069	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
895	XPUSHs (scalar);	1070	XPUSHs (scalar);
…		…
908	EXTEND (SP, 2);	1083	EXTEND (SP, 2);
909	PUSHs (sv);	1084	PUSHs (sv);
910	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1085	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
911	}	1086	}
912		1087
913	#if 0
914
915	void DESTROY (CBOR *self)
916	CODE:
917	SvREFCNT_dec (self->cb_sk_object);
918	SvREFCNT_dec (self->cb_object);
919
920	#endif
921
922	PROTOTYPES: ENABLE	1088	PROTOTYPES: ENABLE
923		1089
924	void encode_cbor (SV *scalar)	1090	void encode_cbor (SV *scalar)
925	PPCODE:	1091	PPCODE:
926	{	1092	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.6 by root, Sat Oct 26 22:25:47 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.6 by root, Sat Oct 26 22:25:47 2013 UTC vs.
Revision 1.18 by root, Wed Nov 20 01:09:46 2013 UTC