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

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 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
		28	// known tags
		29	enum cbor_tag
		30	{
		31	// extensions
		32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
		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
		39
		40	// rfc7049
		41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		43	CBOR_TAG_POS_BIGNUM = 2, // byte string
		44	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		45	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		46	CBOR_TAG_BIGFLOAT = 5, // array
		47
		48	CBOR_TAG_CONV_B64U = 21, // base64url, any
		49	CBOR_TAG_CONV_B64 = 22, // base64, any
		50	CBOR_TAG_CONV_HEX = 23, // base16, any
		51	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		52
		53	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		54	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		55	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		56	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		58
		59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		60	};
		61
14	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
15	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL
		65	#define F_PACK_STRINGS 0x00000008UL
16		66
17	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
18		68
19	#define SB do {	69	#define SB do {
20	#define SE } while (0)	70	#define SE } while (0)
…		…
31	#else	81	#else
32	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
33	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
34	#endif	84	#endif
35		85
36	static HV cbor_stash, cbor_boolean_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
37	static SV cbor_true, cbor_false;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
38		88
39	typedef struct {	89	typedef struct {
40	U32 flags;	90	U32 flags;
41	U32 max_depth;	91	U32 max_depth;
42	STRLEN max_size;	92	STRLEN max_size;
43		93	SV *filter;
44	SV *cb_object;
45	HV *cb_sk_object;
46	} CBOR;	94	} CBOR;
47		95
48	ecb_inline void	96	ecb_inline void
49	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
50	{	98	{
51	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
52	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);
53	}	107	}
54		108
55	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
56	// utility functions	110	// utility functions
57		111
…		…
79	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
80	#endif	134	#endif
81	}	135	}
82	}	136	}
83		137
84	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
85	// fp hell	139	ecb_inline int
86		140	minimum_string_length (UV idx)
87	//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	}
88		152
89	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
90	// encoder	154	// encoder
91		155
92	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
95	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
96	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
97	SV *sv; // result scalar	161	SV *sv; // result scalar
98	CBOR cbor;	162	CBOR cbor;
99	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;
100	} enc_t;	168	} enc_t;
101		169
102	ecb_inline void	170	ecb_inline void
103	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
104	{	172	{
…		…
121	static void	189	static void
122	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
123	{	191	{
124	need (enc, 9);	192	need (enc, 9);
125		193
126	if (len < 24)	194	if (ecb_expect_true (len < 24))
127	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
128	else if (len <= 0xff)	196	else if (ecb_expect_true (len <= 0xff))
129	{	197	{
130	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
131	*enc->cur++ = len;	199	*enc->cur++ = len;
132	}	200	}
133	else if (len <= 0xffff)	201	else if (len <= 0xffff)
…		…
156	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
157	*enc->cur++ = len;	225	*enc->cur++ = len;
158	}	226	}
159	}	227	}
160		228
161	static void	229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
		235	ecb_inline void
162	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
163	{	237	{
164	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
165	need (enc, len);	239	need (enc, len);
166	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
167	enc->cur += len;	241	enc->cur += len;
168	}	242	}
169		243
		244	static void
		245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		246	{
		247	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		248	{
		249	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		250
		251	if (SvOK (*svp))
		252	{
		253	// already registered, use stringref
		254	encode_tag (enc, CBOR_TAG_STRINGREF);
		255	encode_uint (enc, 0x00, SvUV (*svp));
		256	return;
		257	}
		258	else if (len >= minimum_string_length (enc->stringref_idx))
		259	{
		260	// register only
		261	sv_setuv (*svp, enc->stringref_idx);
		262	++enc->stringref_idx;
		263	}
		264	}
		265
		266	encode_str (enc, utf8, str, len);
		267	}
		268
170	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
171		270
172	static void	271	static void
173	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
174	{	273	{
…		…
211	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
212	{	311	{
213	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
214	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
215	else	314	else
216	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
217		316
218	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
219	}	318	}
220		319
221	if (mg)	320	if (mg)
…		…
226		325
227	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
228	static void	327	static void
229	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
230	{	329	{
231	svtype svt;
232
233	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
		331
234	svt = SvTYPE (sv);	332	svtype svt = SvTYPE (sv);
235		333
236	if (ecb_expect_false (SvOBJECT (sv)))	334	if (ecb_expect_false (SvOBJECT (sv)))
237	{	335	{
238	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	336	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
239	? cbor_boolean_stash	337	? types_boolean_stash
		338	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		339	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		340	? types_error_stash
		341	: gv_stashpv ("Types::Serialiser::Error", 1);
		342	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		343	? cbor_tagged_stash
240	: gv_stashpv ("CBOR::XS::Boolean", 1);	344	: gv_stashpv ("CBOR::XS::Tagged" , 1);
241		345
242	if (SvSTASH (sv) == stash)	346	HV *stash = SvSTASH (sv);
		347
		348	if (stash == boolean_stash)
		349	{
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	350	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		351	return;
		352	}
		353	else if (stash == error_stash)
		354	{
		355	encode_ch (enc, 0xe0 \| 23);
		356	return;
		357	}
		358	else if (stash == tagged_stash)
		359	{
		360	if (svt != SVt_PVAV)
		361	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		362
		363	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		364	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		365
		366	return;
		367	}
		368	}
		369
		370	if (ecb_expect_false (SvREFCNT (sv) > 1)
		371	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		372	{
		373	if (!enc->shareable)
		374	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		375
		376	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		377
		378	if (SvOK (*svp))
		379	{
		380	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		381	encode_uint (enc, 0x00, SvUV (*svp));
		382	return;
		383	}
244	else	384	else
245	{	385	{
246	#if 0 //TODO	386	sv_setuv (*svp, enc->shareable_idx);
247	if (enc->cbor.flags & F_CONV_BLESSED)	387	++enc->shareable_idx;
		388	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		389	}
		390	}
		391
		392	if (ecb_expect_false (SvOBJECT (sv)))
		393	{
		394	HV *stash = SvSTASH (sv);
		395	GV *method;
		396
		397	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
248	{	398	{
		399	dSP;
		400
		401	ENTER; SAVETMPS; PUSHMARK (SP);
249	// we re-bless the reference to get overload and other niceties right	402	// we re-bless the reference to get overload and other niceties right
250	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
251
252	if (to_cbor)
253	{
254	dSP;
255
256	ENTER; SAVETMPS; PUSHMARK (SP);
257	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	403	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
258		404
259	// calling with G_SCALAR ensures that we always get a 1 return value
260	PUTBACK;	405	PUTBACK;
		406	// G_SCALAR ensures that return value is 1
261	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);	407	call_sv ((SV *)GvCV (method), G_SCALAR);
262	SPAGAIN;	408	SPAGAIN;
263		409
264	// catch this surprisingly common error	410	// catch this surprisingly common error
265	if (SvROK (TOPs) && SvRV (TOPs) == sv)	411	if (SvROK (TOPs) && SvRV (TOPs) == sv)
266	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));	412	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
267		413
268	sv = POPs;
269	PUTBACK;
270
271	encode_sv (enc, sv);	414	encode_sv (enc, POPs);
272		415
		416	PUTBACK;
		417
273	FREETMPS; LEAVE;	418	FREETMPS; LEAVE;
274	}
275	else if (enc->cbor.flags & F_ALLOW_BLESSED)
276	encode_str (enc, "null", 4, 0);
277	else
278	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",
279	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
280	}	419	}
281	else if (enc->cbor.flags & F_ALLOW_BLESSED)	420	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
282	encode_str (enc, "null", 4, 0);	421	{
		422	dSP;
		423
		424	ENTER; SAVETMPS; PUSHMARK (SP);
		425	EXTEND (SP, 2);
		426	// we re-bless the reference to get overload and other niceties right
		427	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		428	PUSHs (sv_cbor);
		429
		430	PUTBACK;
		431	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		432	SPAGAIN;
		433
		434	// catch this surprisingly common error
		435	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		436	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		437
		438	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		439	encode_uint (enc, 0x80, count + 1);
		440	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		441
		442	while (count)
		443	encode_sv (enc, SP[1 - count--]);
		444
		445	PUTBACK;
		446
		447	FREETMPS; LEAVE;
		448	}
283	else	449	else
284	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	450	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
285	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	451	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286	#endif
287	}
288	}	452	}
289	else if (svt == SVt_PVHV)	453	else if (svt == SVt_PVHV)
290	encode_hv (enc, (HV *)sv);	454	encode_hv (enc, (HV *)sv);
291	else if (svt == SVt_PVAV)	455	else if (svt == SVt_PVAV)
292	encode_av (enc, (AV *)sv);	456	encode_av (enc, (AV *)sv);
293	else if (svt < SVt_PVAV)
294	{
295	STRLEN len = 0;
296	char *pv = svt ? SvPV (sv, len) : 0;
297
298	if (len == 1 && *pv == '1')
299	encode_ch (enc, 0xe0 \| 21);
300	else if (len == 1 && *pv == '0')
301	encode_ch (enc, 0xe0 \| 20);
302	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
303	encode_ch (enc, 0xe0 \| 23);
304	else
305	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
306	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307	}
308	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
309	encode_ch (enc, 0xe0 \| 23);
310	else	457	else
311	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	458	{
312	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	459	encode_tag (enc, CBOR_TAG_INDIRECTION);
		460	encode_sv (enc, sv);
		461	}
313	}	462	}
314		463
315	static void	464	static void
316	encode_nv (enc_t enc, SV sv)	465	encode_nv (enc_t enc, SV sv)
317	{	466	{
…		…
355		504
356	if (SvPOKp (sv))	505	if (SvPOKp (sv))
357	{	506	{
358	STRLEN len;	507	STRLEN len;
359	char *str = SvPV (sv, len);	508	char *str = SvPV (sv, len);
360	encode_str (enc, SvUTF8 (sv), str, len);	509	encode_strref (enc, SvUTF8 (sv), str, len);
361	}	510	}
362	else if (SvNOKp (sv))	511	else if (SvNOKp (sv))
363	encode_nv (enc, sv);	512	encode_nv (enc, sv);
364	else if (SvIOKp (sv))	513	else if (SvIOKp (sv))
365	{	514	{
…		…
382	}	531	}
383		532
384	static SV *	533	static SV *
385	encode_cbor (SV scalar, CBOR cbor)	534	encode_cbor (SV scalar, CBOR cbor)
386	{	535	{
387	enc_t enc;	536	enc_t enc = { };
388		537
389	enc.cbor = *cbor;	538	enc.cbor = *cbor;
390	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	539	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
391	enc.cur = SvPVX (enc.sv);	540	enc.cur = SvPVX (enc.sv);
392	enc.end = SvEND (enc.sv);	541	enc.end = SvEND (enc.sv);
393	enc.depth = 0;
394		542
395	SvPOK_only (enc.sv);	543	SvPOK_only (enc.sv);
		544
		545	if (cbor->flags & F_PACK_STRINGS)
		546	{
		547	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		548	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		549	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		550	}
		551
396	encode_sv (&enc, scalar);	552	encode_sv (&enc, scalar);
397		553
398	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	554	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
399	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	555	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
400		556
…		…
414	U8 *end; // end of input string	570	U8 *end; // end of input string
415	const char *err; // parse error, if != 0	571	const char *err; // parse error, if != 0
416	CBOR cbor;	572	CBOR cbor;
417	U32 depth; // recursion depth	573	U32 depth; // recursion depth
418	U32 maxdepth; // recursion depth limit	574	U32 maxdepth; // recursion depth limit
		575	AV *shareable;
		576	AV *stringref;
		577	SV *decode_tagged;
419	} dec_t;	578	} dec_t;
420		579
421	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	580	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
422		581
423	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	582	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
455	\| ((UV)dec->cur[-1]);	614	\| ((UV)dec->cur[-1]);
456		615
457	case 27:	616	case 27:
458	WANT (9);	617	WANT (9);
459	dec->cur += 9;	618	dec->cur += 9;
		619
		620	return
		621	#if UVSIZE < 8
		622	0
		623	#else
460	return (((UV)dec->cur[-8]) << 56)	624	(((UV)dec->cur[-8]) << 56)
461	\| (((UV)dec->cur[-7]) << 48)	625	\| (((UV)dec->cur[-7]) << 48)
462	\| (((UV)dec->cur[-6]) << 40)	626	\| (((UV)dec->cur[-6]) << 40)
463	\| (((UV)dec->cur[-5]) << 32)	627	\| (((UV)dec->cur[-5]) << 32)
		628	#endif
464	\| (((UV)dec->cur[-4]) << 24)	629	\| (((UV)dec->cur[-4]) << 24)
465	\| (((UV)dec->cur[-3]) << 16)	630	\| (((UV)dec->cur[-3]) << 16)
466	\| (((UV)dec->cur[-2]) << 8)	631	\| (((UV)dec->cur[-2]) << 8)
467	\| ((UV)dec->cur[-1]);	632	\| ((UV)dec->cur[-1]);
468		633
…		…
517	SvREFCNT_dec (av);	682	SvREFCNT_dec (av);
518	DEC_DEC_DEPTH;	683	DEC_DEC_DEPTH;
519	return &PL_sv_undef;	684	return &PL_sv_undef;
520	}	685	}
521		686
		687	static void
		688	decode_he (dec_t dec, HV hv)
		689	{
		690	// for speed reasons, we specialcase single-string
		691	// byte or utf-8 strings as keys, but only when !stringref
		692
		693	if (ecb_expect_true (!dec->stringref))
		694	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		695	{
		696	I32 len = decode_uint (dec);
		697	char key = (char )dec->cur;
		698
		699	dec->cur += len;
		700
		701	if (ecb_expect_false (dec->stringref))
		702	av_push (dec->stringref, newSVpvn (key, len));
		703
		704	hv_store (hv, key, len, decode_sv (dec), 0);
		705
		706	return;
		707	}
		708	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		709	{
		710	I32 len = decode_uint (dec);
		711	char key = (char )dec->cur;
		712
		713	dec->cur += len;
		714
		715	if (ecb_expect_false (dec->stringref))
		716	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		717
		718	hv_store (hv, key, -len, decode_sv (dec), 0);
		719
		720	return;
		721	}
		722
		723	SV *k = decode_sv (dec);
		724	SV *v = decode_sv (dec);
		725
		726	hv_store_ent (hv, k, v, 0);
		727	SvREFCNT_dec (k);
		728	}
		729
522	static SV *	730	static SV *
523	decode_hv (dec_t *dec)	731	decode_hv (dec_t *dec)
524	{	732	{
525	HV *hv = newHV ();	733	HV *hv = newHV ();
526		734
…		…
538	{	746	{
539	++dec->cur;	747	++dec->cur;
540	break;	748	break;
541	}	749	}
542		750
543	SV *k = decode_sv (dec);	751	decode_he (dec, hv);
544	SV *v = decode_sv (dec);
545
546	hv_store_ent (hv, k, v, 0);
547	}	752	}
548	}	753	}
549	else	754	else
550	{	755	{
551	int len = decode_uint (dec);	756	int pairs = decode_uint (dec);
552		757
553	while (len--)	758	while (pairs--)
554	{	759	decode_he (dec, hv);
555	SV *k = decode_sv (dec);
556	SV *v = decode_sv (dec);
557
558	hv_store_ent (hv, k, v, 0);
559	}
560	}	760	}
561		761
562	DEC_DEC_DEPTH;	762	DEC_DEC_DEPTH;
563	return newRV_noinc ((SV *)hv);	763	return newRV_noinc ((SV *)hv);
564
565	#if 0
566	SV *sv;
567	HV *hv = newHV ();
568
569	DEC_INC_DEPTH;
570	decode_ws (dec);
571
572	for (;;)
573	{
574	// heuristic: assume that
575	// a) decode_str + hv_store_ent are abysmally slow.
576	// b) most hash keys are short, simple ascii text.
577	// => try to "fast-match" such strings to avoid
578	// the overhead of decode_str + hv_store_ent.
579	{
580	SV *value;
581	char *p = dec->cur;
582	char *e = p + 24; // only try up to 24 bytes
583
584	for (;;)
585	{
586	// the >= 0x80 is false on most architectures
587	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
588	{
589	// slow path, back up and use decode_str
590	SV *key = decode_str (dec);
591	if (!key)
592	goto fail;
593
594	decode_ws (dec); EXPECT_CH (':');
595
596	decode_ws (dec);
597	value = decode_sv (dec);
598	if (!value)
599	{
600	SvREFCNT_dec (key);
601	goto fail;
602	}
603
604	hv_store_ent (hv, key, value, 0);
605	SvREFCNT_dec (key);
606
607	break;
608	}
609	else if (*p == '"')
610	{
611	// fast path, got a simple key
612	char *key = dec->cur;
613	int len = p - key;
614	dec->cur = p + 1;
615
616	decode_ws (dec); EXPECT_CH (':');
617
618	decode_ws (dec);
619	value = decode_sv (dec);
620	if (!value)
621	goto fail;
622
623	hv_store (hv, key, len, value, 0);
624
625	break;
626	}
627
628	++p;
629	}
630	}
631
632	decode_ws (dec);
633
634	if (*dec->cur == '}')
635	{
636	++dec->cur;
637	break;
638	}
639
640	if (*dec->cur != ',')
641	ERR (", or } expected while parsing object/hash");
642
643	++dec->cur;
644
645	decode_ws (dec);
646
647	if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
648	{
649	++dec->cur;
650	break;
651	}
652	}
653
654	DEC_DEC_DEPTH;
655	sv = newRV_noinc ((SV *)hv);
656
657	// check filter callbacks
658	if (dec->cbor.flags & F_HOOK)
659	{
660	if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
661	{
662	HE cb, he;
663
664	hv_iterinit (hv);
665	he = hv_iternext (hv);
666	hv_iterinit (hv);
667
668	// the next line creates a mortal sv each time its called.
669	// might want to optimise this for common cases.
670	cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
671
672	if (cb)
673	{
674	dSP;
675	int count;
676
677	ENTER; SAVETMPS; PUSHMARK (SP);
678	XPUSHs (HeVAL (he));
679	sv_2mortal (sv);
680
681	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
682
683	if (count == 1)
684	{
685	sv = newSVsv (POPs);
686	FREETMPS; LEAVE;
687	return sv;
688	}
689
690	SvREFCNT_inc (sv);
691	FREETMPS; LEAVE;
692	}
693	}
694
695	if (dec->cbor.cb_object)
696	{
697	dSP;
698	int count;
699
700	ENTER; SAVETMPS; PUSHMARK (SP);
701	XPUSHs (sv_2mortal (sv));
702
703	PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
704
705	if (count == 1)
706	{
707	sv = newSVsv (POPs);
708	FREETMPS; LEAVE;
709	return sv;
710	}
711
712	SvREFCNT_inc (sv);
713	FREETMPS; LEAVE;
714	}
715	}
716
717	return sv;
718	#endif
719		764
720	fail:	765	fail:
721	SvREFCNT_dec (hv);	766	SvREFCNT_dec (hv);
722	DEC_DEC_DEPTH;	767	DEC_DEC_DEPTH;
723	return &PL_sv_undef;	768	return &PL_sv_undef;
724	}	769	}
725		770
726	static SV *	771	static SV *
727	decode_str (dec_t *dec, int utf8)	772	decode_str (dec_t *dec, int utf8)
728	{	773	{
729	SV *sv;	774	SV *sv = 0;
730		775
731	if ((*dec->cur & 31) == 31)	776	if ((*dec->cur & 31) == 31)
732	{	777	{
		778	// indefinite length strings
733	++dec->cur;	779	++dec->cur;
734		780
		781	unsigned char major = *dec->cur & 0xe0;
		782
735	sv = newSVpvn ("", 0);	783	sv = newSVpvn ("", 0);
736		784
737	// not very fast, and certainly not robust against illegal input
738	for (;;)	785	for (;;)
739	{	786	{
740	WANT (1);	787	WANT (1);
741		788
		789	if ((*dec->cur ^ major) >= 31)
742	if (*dec->cur == (0xe0 \| 31))	790	if (*dec->cur == (0xe0 \| 31))
743	{	791	{
744	++dec->cur;	792	++dec->cur;
745	break;	793	break;
746	}	794	}
		795	else
		796	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
747		797
748	SV *sv2 = decode_sv (dec);	798	STRLEN len = decode_uint (dec);
749	sv_catsv (sv, sv2);	799
		800	WANT (len);
		801	sv_catpvn (sv, dec->cur, len);
		802	dec->cur += len;
750	}	803	}
751	}	804	}
752	else	805	else
753	{	806	{
754	STRLEN len = decode_uint (dec);	807	STRLEN len = decode_uint (dec);
755		808
756	WANT (len);	809	WANT (len);
757	sv = newSVpvn (dec->cur, len);	810	sv = newSVpvn (dec->cur, len);
758	dec->cur += len;	811	dec->cur += len;
		812
		813	if (ecb_expect_false (dec->stringref)
		814	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		815	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
759	}	816	}
760		817
761	if (utf8)	818	if (utf8)
762	SvUTF8_on (sv);	819	SvUTF8_on (sv);
763		820
764	return sv;	821	return sv;
765		822
766	fail:	823	fail:
		824	SvREFCNT_dec (sv);
767	return &PL_sv_undef;	825	return &PL_sv_undef;
768	}	826	}
769		827
770	static SV *	828	static SV *
771	decode_tagged (dec_t *dec)	829	decode_tagged (dec_t *dec)
772	{	830	{
		831	SV *sv = 0;
773	UV tag = decode_uint (dec);	832	UV tag = decode_uint (dec);
		833
		834	WANT (1);
		835
		836	switch (tag)
		837	{
		838	case CBOR_TAG_MAGIC:
		839	sv = decode_sv (dec);
		840	break;
		841
		842	case CBOR_TAG_INDIRECTION:
		843	sv = newRV_noinc (decode_sv (dec));
		844	break;
		845
		846	case CBOR_TAG_STRINGREF_NAMESPACE:
		847	{
		848	ENTER; SAVETMPS;
		849
		850	SAVESPTR (dec->stringref);
		851	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		852
		853	sv = decode_sv (dec);
		854
		855	FREETMPS; LEAVE;
		856	}
		857	break;
		858
		859	case CBOR_TAG_STRINGREF:
		860	{
		861	if ((*dec->cur >> 5) != 0)
		862	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		863
		864	UV idx = decode_uint (dec);
		865
		866	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		867	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		868
		869	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		870	}
		871	break;
		872
		873	case CBOR_TAG_VALUE_SHAREABLE:
		874	{
		875	if (ecb_expect_false (!dec->shareable))
		876	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		877
		878	sv = newSV (0);
		879	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		880
774	SV *sv = decode_sv (dec);	881	SV *osv = decode_sv (dec);
		882	sv_setsv (sv, osv);
		883	SvREFCNT_dec_NN (osv);
		884	}
		885	break;
775		886
776	if (tag == 55799) // 2.4.5 Self-Describe CBOR	887	case CBOR_TAG_VALUE_SHAREDREF:
		888	{
		889	if ((*dec->cur >> 5) != 0)
		890	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		891
		892	UV idx = decode_uint (dec);
		893
		894	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		895	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		896
		897	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		898	}
		899	break;
		900
		901	case CBOR_TAG_PERL_OBJECT:
		902	{
		903	sv = decode_sv (dec);
		904
		905	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		906	ERR ("corrupted CBOR data (non-array perl object)");
		907
		908	AV av = (AV )SvRV (sv);
		909	int len = av_len (av) + 1;
		910	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		911
		912	if (!stash)
		913	ERR ("cannot decode perl-object (package does not exist)");
		914
		915	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		916
		917	if (!method)
		918	ERR ("cannot decode perl-object (package does not have a THAW method)");
		919
		920	dSP;
		921
		922	ENTER; SAVETMPS; PUSHMARK (SP);
		923	EXTEND (SP, len + 1);
		924	// we re-bless the reference to get overload and other niceties right
		925	PUSHs (*av_fetch (av, 0, 1));
		926	PUSHs (sv_cbor);
		927
		928	int i;
		929
		930	for (i = 1; i < len; ++i)
		931	PUSHs (*av_fetch (av, i, 1));
		932
		933	PUTBACK;
		934	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		935	SPAGAIN;
		936
		937	if (SvTRUE (ERRSV))
		938	{
		939	FREETMPS; LEAVE;
		940	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		941	}
		942
		943	SvREFCNT_dec (sv);
		944	sv = SvREFCNT_inc (POPs);
		945
		946	PUTBACK;
		947
		948	FREETMPS; LEAVE;
		949	}
		950	break;
		951
		952	default:
		953	{
		954	sv = decode_sv (dec);
		955
		956	dSP;
		957	ENTER; SAVETMPS; PUSHMARK (SP);
		958	EXTEND (SP, 2);
		959	PUSHs (newSVuv (tag));
		960	PUSHs (sv);
		961
		962	PUTBACK;
		963	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		964	SPAGAIN;
		965
		966	if (SvTRUE (ERRSV))
		967	{
		968	FREETMPS; LEAVE;
		969	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		970	}
		971
		972	if (count)
		973	{
		974	SvREFCNT_dec (sv);
		975	sv = SvREFCNT_inc (POPs);
		976	}
		977	else
		978	{
		979	AV *av = newAV ();
		980	av_push (av, newSVuv (tag));
		981	av_push (av, sv);
		982
		983	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		984	? cbor_tagged_stash
		985	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		986	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		987	}
		988
		989	PUTBACK;
		990
		991	FREETMPS; LEAVE;
		992	}
		993	break;
		994	}
		995
777	return sv;	996	return sv;
778		997
779	AV *av = newAV ();	998	fail:
780	av_push (av, newSVuv (tag));	999	SvREFCNT_dec (sv);
781	av_push (av, sv);	1000	return &PL_sv_undef;
782	return newRV_noinc ((SV *)av);
783	}	1001	}
784		1002
785	static SV *	1003	static SV *
786	decode_sv (dec_t *dec)	1004	decode_sv (dec_t *dec)
787	{	1005	{
788	WANT (1);	1006	WANT (1);
789		1007
790	switch (*dec->cur >> 5)	1008	switch (*dec->cur >> 5)
791	{	1009	{
792	case 0: // unsigned int	1010	case 0: // unsigned int
793	//TODO: 64 bit values on 3 2bit perls
794	return newSVuv (decode_uint (dec));	1011	return newSVuv (decode_uint (dec));
795	case 1: // negative int	1012	case 1: // negative int
796	return newSViv (-1 - (IV)decode_uint (dec));	1013	return newSViv (-1 - (IV)decode_uint (dec));
797	case 2: // octet string	1014	case 2: // octet string
798	return decode_str (dec, 0);	1015	return decode_str (dec, 0);
…		…
807	case 7: // misc	1024	case 7: // misc
808	switch (*dec->cur++ & 31)	1025	switch (*dec->cur++ & 31)
809	{	1026	{
810	case 20:	1027	case 20:
811	#if CBOR_SLOW	1028	#if CBOR_SLOW
812	cbor_false = get_bool ("CBOR::XS::false");	1029	types_false = get_bool ("Types::Serialiser::false");
813	#endif	1030	#endif
814	return newSVsv (cbor_false);	1031	return newSVsv (types_false);
815	case 21:	1032	case 21:
816	#if CBOR_SLOW	1033	#if CBOR_SLOW
817	cbor_true = get_bool ("CBOR::XS::true");	1034	types_true = get_bool ("Types::Serialiser::true");
818	#endif	1035	#endif
819	return newSVsv (cbor_true);	1036	return newSVsv (types_true);
820	case 22:	1037	case 22:
821	return newSVsv (&PL_sv_undef);	1038	return newSVsv (&PL_sv_undef);
		1039	case 23:
		1040	#if CBOR_SLOW
		1041	types_error = get_bool ("Types::Serialiser::error");
		1042	#endif
		1043	return newSVsv (types_error);
822		1044
823	case 25:	1045	case 25:
824	{	1046	{
825	WANT (2);	1047	WANT (2);
826		1048
…		…
862	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1084	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863	}	1085	}
864		1086
865	break;	1087	break;
866	}	1088	}
867	#if 0
868	switch (*dec->cur)
869	{
870	//case '"': ++dec->cur; return decode_str (dec);
871	case '[': ++dec->cur; return decode_av (dec);
872	case '{': ++dec->cur; return decode_hv (dec);
873
874	case '-':
875	case '0': case '1': case '2': case '3': case '4':
876	case '5': case '6': case '7': case '8': case '9':
877	//TODO return decode_num (dec);
878
879	case 't':
880	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
881	{
882	dec->cur += 4;
883	#if CBOR_SLOW
884	cbor_true = get_bool ("CBOR::XS::true");
885	#endif
886	return newSVsv (cbor_true);
887	}
888	else
889	ERR ("'true' expected");
890
891	break;
892
893	case 'f':
894	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
895	{
896	dec->cur += 5;
897	#if CBOR_SLOW
898	cbor_false = get_bool ("CBOR::XS::false");
899	#endif
900	return newSVsv (cbor_false);
901	}
902	else
903	ERR ("'false' expected");
904
905	break;
906
907	case 'n':
908	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
909	{
910	dec->cur += 4;
911	return newSVsv (&PL_sv_undef);
912	}
913	else
914	ERR ("'null' expected");
915
916	break;
917
918	default:
919	ERR ("malformed CBOR string, neither array, object, number, string or atom");
920	break;
921	}
922	#endif
923		1089
924	fail:	1090	fail:
925	return &PL_sv_undef;	1091	return &PL_sv_undef;
926	}	1092	}
927		1093
928	static SV *	1094	static SV *
929	decode_cbor (SV string, CBOR cbor, char **offset_return)	1095	decode_cbor (SV string, CBOR cbor, char **offset_return)
930	{	1096	{
931	dec_t dec;	1097	dec_t dec = { };
932	SV *sv;	1098	SV *sv;
		1099	STRLEN len;
		1100	char *data = SvPVbyte (string, len);
933		1101
934	/* work around bugs in 5.10 where manipulating magic values
935	* makes perl ignore the magic in subsequent accesses.
936	* also make a copy of non-PV values, to get them into a clean
937	* state (SvPV should do that, but it's buggy, see below).
938	*/
939	/SvGETMAGIC (string);/
940	if (SvMAGICAL (string) \|\| !SvPOK (string))
941	string = sv_2mortal (newSVsv (string));
942
943	SvUPGRADE (string, SVt_PV);
944
945	/* work around a bug in perl 5.10, which causes SvCUR to fail an
946	* assertion with -DDEBUGGING, although SvCUR is documented to
947	* return the xpv_cur field which certainly exists after upgrading.
948	* according to nicholas clark, calling SvPOK fixes this.
949	* But it doesn't fix it, so try another workaround, call SvPV_nolen
950	* and hope for the best.
951	* Damnit, SvPV_nolen still trips over yet another assertion. This
952	* assertion business is seriously broken, try yet another workaround
953	* for the broken -DDEBUGGING.
954	*/
955	{
956	#ifdef DEBUGGING
957	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
958	#else
959	STRLEN offset = SvCUR (string);
960	#endif
961
962	if (offset > cbor->max_size && cbor->max_size)	1102	if (len > cbor->max_size && cbor->max_size)
963	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1103	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
964	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1104	(unsigned long)len, (unsigned long)cbor->max_size);
965	}
966
967	sv_utf8_downgrade (string, 0);
968		1105
969	dec.cbor = *cbor;	1106	dec.cbor = *cbor;
970	dec.cur = (U8 *)SvPVX (string);	1107	dec.cur = (U8 *)data;
971	dec.end = (U8 *)SvEND (string);	1108	dec.end = (U8 *)data + len;
972	dec.err = 0;
973	dec.depth = 0;
974
975	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
976	;//TODO dec.cbor.flags \|= F_HOOK;
977		1109
978	sv = decode_sv (&dec);	1110	sv = decode_sv (&dec);
979		1111
980	if (offset_return)	1112	if (offset_return)
981	*offset_return = dec.cur;	1113	*offset_return = dec.cur;
…		…
985	dec.err = "garbage after CBOR object";	1117	dec.err = "garbage after CBOR object";
986		1118
987	if (dec.err)	1119	if (dec.err)
988	{	1120	{
989	SvREFCNT_dec (sv);	1121	SvREFCNT_dec (sv);
990	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1122	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
991	}	1123	}
992		1124
993	sv = sv_2mortal (sv);	1125	sv = sv_2mortal (sv);
994		1126
995	return sv;	1127	return sv;
…		…
1001	MODULE = CBOR::XS PACKAGE = CBOR::XS	1133	MODULE = CBOR::XS PACKAGE = CBOR::XS
1002		1134
1003	BOOT:	1135	BOOT:
1004	{	1136	{
1005	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1137	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	1138	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007		1139
1008	cbor_true = get_bool ("CBOR::XS::true");	1140	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1009	cbor_false = get_bool ("CBOR::XS::false");	1141	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1142
		1143	types_true = get_bool ("Types::Serialiser::true" );
		1144	types_false = get_bool ("Types::Serialiser::false");
		1145	types_error = get_bool ("Types::Serialiser::error");
		1146
		1147	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1148
		1149	sv_cbor = newSVpv ("CBOR", 0);
		1150	SvREADONLY_on (sv_cbor);
1010	}	1151	}
1011		1152
1012	PROTOTYPES: DISABLE	1153	PROTOTYPES: DISABLE
1013		1154
1014	void CLONE (...)	1155	void CLONE (...)
1015	CODE:	1156	CODE:
1016	cbor_stash = 0;	1157	cbor_stash = 0;
		1158	cbor_tagged_stash = 0;
		1159	types_error_stash = 0;
1017	cbor_boolean_stash = 0;	1160	types_boolean_stash = 0;
1018		1161
1019	void new (char *klass)	1162	void new (char *klass)
1020	PPCODE:	1163	PPCODE:
1021	{	1164	{
1022	SV *pv = NEWSV (0, sizeof (CBOR));	1165	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1030		1173
1031	void shrink (CBOR *self, int enable = 1)	1174	void shrink (CBOR *self, int enable = 1)
1032	ALIAS:	1175	ALIAS:
1033	shrink = F_SHRINK	1176	shrink = F_SHRINK
1034	allow_unknown = F_ALLOW_UNKNOWN	1177	allow_unknown = F_ALLOW_UNKNOWN
		1178	allow_sharing = F_ALLOW_SHARING
		1179	pack_strings = F_PACK_STRINGS
1035	PPCODE:	1180	PPCODE:
1036	{	1181	{
1037	if (enable)	1182	if (enable)
1038	self->flags \|= ix;	1183	self->flags \|= ix;
1039	else	1184	else
…		…
1044		1189
1045	void get_shrink (CBOR *self)	1190	void get_shrink (CBOR *self)
1046	ALIAS:	1191	ALIAS:
1047	get_shrink = F_SHRINK	1192	get_shrink = F_SHRINK
1048	get_allow_unknown = F_ALLOW_UNKNOWN	1193	get_allow_unknown = F_ALLOW_UNKNOWN
		1194	get_allow_sharing = F_ALLOW_SHARING
		1195	get_pack_strings = F_PACK_STRINGS
1049	PPCODE:	1196	PPCODE:
1050	XPUSHs (boolSV (self->flags & ix));	1197	XPUSHs (boolSV (self->flags & ix));
1051		1198
1052	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1199	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1053	PPCODE:	1200	PPCODE:
…		…
1069	CODE:	1216	CODE:
1070	RETVAL = self->max_size;	1217	RETVAL = self->max_size;
1071	OUTPUT:	1218	OUTPUT:
1072	RETVAL	1219	RETVAL
1073		1220
1074	#if 0 //TODO	1221	void filter (CBOR self, SV filter = 0)
1075
1076	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1077	PPCODE:	1222	PPCODE:
1078	{
1079	SvREFCNT_dec (self->cb_object);	1223	SvREFCNT_dec (self->filter);
1080	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1224	self->filter = filter ? newSVsv (filter) : filter;
1081
1082	XPUSHs (ST (0));	1225	XPUSHs (ST (0));
1083	}
1084		1226
1085	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1227	SV get_filter (CBOR self)
1086	PPCODE:	1228	CODE:
1087	{	1229	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1088	if (!self->cb_sk_object)	1230	OUTPUT:
1089	self->cb_sk_object = newHV ();	1231	RETVAL
1090
1091	if (SvOK (cb))
1092	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1093	else
1094	{
1095	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1096
1097	if (!HvKEYS (self->cb_sk_object))
1098	{
1099	SvREFCNT_dec (self->cb_sk_object);
1100	self->cb_sk_object = 0;
1101	}
1102	}
1103
1104	XPUSHs (ST (0));
1105	}
1106
1107	#endif
1108		1232
1109	void encode (CBOR self, SV scalar)	1233	void encode (CBOR self, SV scalar)
1110	PPCODE:	1234	PPCODE:
1111	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1235	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1112	XPUSHs (scalar);	1236	XPUSHs (scalar);
…		…
1126	PUSHs (sv);	1250	PUSHs (sv);
1127	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1251	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128	}	1252	}
1129		1253
1130	void DESTROY (CBOR *self)	1254	void DESTROY (CBOR *self)
1131	CODE:	1255	PPCODE:
1132	SvREFCNT_dec (self->cb_sk_object);	1256	cbor_free (self);
1133	SvREFCNT_dec (self->cb_object);
1134		1257
1135	PROTOTYPES: ENABLE	1258	PROTOTYPES: ENABLE
1136		1259
1137	void encode_cbor (SV *scalar)	1260	void encode_cbor (SV *scalar)
1138	PPCODE:	1261	PPCODE:

Diff Legend

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

Comparing cvsroot/CBOR-XS/XS.xs (file contents): Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs. Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

Diff Legend

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC