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

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

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.4 by root, Sat Oct 26 21:06:37 2013 UTC vs. Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.4 by root, Sat Oct 26 21:06:37 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC