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

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

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.1 by root, Fri Oct 25 23:09:45 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.1 by root, Fri Oct 25 23:09:45 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC