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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.2 by root, Sat Oct 26 10:41:12 2013 UTC vs.
Revision 1.23 by root, Wed Nov 20 16:19:47 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_DEDUP_STRINGS 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_DEDUP_STRINGS))
		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	}
…		…
203	}	271	}
204		272
205	--enc->depth;	273	--enc->depth;
206	}	274	}
207		275
		276	ecb_inline void
		277	encode_he (enc_t enc, HE he)
		278	{
		279	}
		280
208	static void	281	static void
209	encode_hv (enc_t enc, HV hv)	282	encode_hv (enc_t enc, HV hv)
210	{	283	{
211	HE *he;	284	HE *he;
212		285
…		…
228	if (HeKLEN (he) == HEf_SVKEY)	301	if (HeKLEN (he) == HEf_SVKEY)
229	encode_sv (enc, HeSVKEY (he));	302	encode_sv (enc, HeSVKEY (he));
230	else	303	else
231	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	304	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
232		305
233	encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	306	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
234	}	307	}
235		308
236	if (mg)	309	if (mg)
237	encode_ch (enc, 0xe0 \| 31);	310	encode_ch (enc, 0xe0 \| 31);
238		311
…		…
241		314
242	// encode objects, arrays and special \0=false and \1=true values.	315	// encode objects, arrays and special \0=false and \1=true values.
243	static void	316	static void
244	encode_rv (enc_t enc, SV sv)	317	encode_rv (enc_t enc, SV sv)
245	{	318	{
246	svtype svt;
247
248	SvGETMAGIC (sv);	319	SvGETMAGIC (sv);
		320
		321	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		322	&& ecb_expect_false (SvREFCNT (sv) > 1))
		323	{
		324	if (!enc->shareable)
		325	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		326
		327	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		328
		329	if (SvOK (*svp))
		330	{
		331	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		332	encode_uint (enc, 0x00, SvUV (*svp));
		333	return;
		334	}
		335	else
		336	{
		337	sv_setuv (*svp, enc->shareable_idx);
		338	++enc->shareable_idx;
		339	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		340	}
		341	}
		342
249	svt = SvTYPE (sv);	343	svtype svt = SvTYPE (sv);
250		344
251	if (expect_false (SvOBJECT (sv)))	345	if (ecb_expect_false (SvOBJECT (sv)))
252	{	346	{
253	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	347	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
254	? cbor_boolean_stash	348	? types_boolean_stash
		349	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		350	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		351	? types_error_stash
		352	: gv_stashpv ("Types::Serialiser::Error", 1);
		353	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		354	? cbor_tagged_stash
255	: gv_stashpv ("CBOR::XS::Boolean", 1);	355	: gv_stashpv ("CBOR::XS::Tagged" , 1);
256		356
257	if (SvSTASH (sv) == stash)	357	HV *stash = SvSTASH (sv);
		358	GV *method;
		359
		360	if (stash == boolean_stash)
258	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	361	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		362	else if (stash == error_stash)
		363	encode_ch (enc, 0xe0 \| 23);
		364	else if (stash == tagged_stash)
		365	{
		366	if (svt != SVt_PVAV)
		367	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		368
		369	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		370	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		371	}
		372	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		373	{
		374	dSP;
		375
		376	ENTER; SAVETMPS; PUSHMARK (SP);
		377	// we re-bless the reference to get overload and other niceties right
		378	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		379
		380	PUTBACK;
		381	// G_SCALAR ensures that return value is 1
		382	call_sv ((SV *)GvCV (method), G_SCALAR);
		383	SPAGAIN;
		384
		385	// catch this surprisingly common error
		386	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		387	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		388
		389	encode_sv (enc, POPs);
		390
		391	PUTBACK;
		392
		393	FREETMPS; LEAVE;
		394	}
		395	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		396	{
		397	dSP;
		398
		399	ENTER; SAVETMPS; PUSHMARK (SP);
		400	EXTEND (SP, 2);
		401	// we re-bless the reference to get overload and other niceties right
		402	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		403	PUSHs (sv_cbor);
		404
		405	PUTBACK;
		406	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		407	SPAGAIN;
		408
		409	// catch this surprisingly common error
		410	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		411	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		412
		413	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		414	encode_uint (enc, 0x80, count + 1);
		415	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		416
		417	while (count)
		418	encode_sv (enc, SP[1 - count--]);
		419
		420	PUTBACK;
		421
		422	FREETMPS; LEAVE;
		423	}
259	else	424	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",	425	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))));	426	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
301	#endif
302	}
303	}	427	}
304	else if (svt == SVt_PVHV)	428	else if (svt == SVt_PVHV)
305	encode_hv (enc, (HV *)sv);	429	encode_hv (enc, (HV *)sv);
306	else if (svt == SVt_PVAV)	430	else if (svt == SVt_PVAV)
307	encode_av (enc, (AV *)sv);	431	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	432	else
326	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	433	{
327	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	434	encode_tag (enc, CBOR_TAG_INDIRECTION);
		435	encode_sv (enc, sv);
		436	}
328	}	437	}
329		438
330	static void	439	static void
331	encode_nv (enc_t enc, SV sv)	440	encode_nv (enc_t enc, SV sv)
332	{	441	{
333	double nv = SvNVX (sv);	442	double nv = SvNVX (sv);
334		443
335	need (enc, 9);	444	need (enc, 9);
336		445
337	if (expect_false (nv == (U32)nv))	446	if (ecb_expect_false (nv == (U32)nv))
338	encode_uint (enc, 0x00, (U32)nv);	447	encode_uint (enc, 0x00, (U32)nv);
339	//TODO: maybe I32?	448	//TODO: maybe I32?
340	else if (expect_false (nv == (float)nv))	449	else if (ecb_expect_false (nv == (float)nv))
341	{	450	{
342	uint32_t fp = ecb_float_to_binary32 (nv);	451	uint32_t fp = ecb_float_to_binary32 (nv);
343		452
344	*enc->cur++ = 0xe0 \| 26;	453	*enc->cur++ = 0xe0 \| 26;
345		454
…		…
397	}	506	}
398		507
399	static SV *	508	static SV *
400	encode_cbor (SV scalar, CBOR cbor)	509	encode_cbor (SV scalar, CBOR cbor)
401	{	510	{
402	enc_t enc;	511	enc_t enc = { };
403		512
404	enc.cbor = *cbor;	513	enc.cbor = *cbor;
405	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	514	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
406	enc.cur = SvPVX (enc.sv);	515	enc.cur = SvPVX (enc.sv);
407	enc.end = SvEND (enc.sv);	516	enc.end = SvEND (enc.sv);
408	enc.depth = 0;
409		517
410	SvPOK_only (enc.sv);	518	SvPOK_only (enc.sv);
		519
		520	if (cbor->flags & F_DEDUP_STRINGS)
		521	{
		522	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		523	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		524	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		525	}
		526
411	encode_sv (&enc, scalar);	527	encode_sv (&enc, scalar);
412		528
413	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	529	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
414	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	530	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
415		531
…		…
429	U8 *end; // end of input string	545	U8 *end; // end of input string
430	const char *err; // parse error, if != 0	546	const char *err; // parse error, if != 0
431	CBOR cbor;	547	CBOR cbor;
432	U32 depth; // recursion depth	548	U32 depth; // recursion depth
433	U32 maxdepth; // recursion depth limit	549	U32 maxdepth; // recursion depth limit
		550	AV *shareable;
		551	AV *stringref;
434	} dec_t;	552	} dec_t;
435		553
436	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	554	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
437		555
438	#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data");	556	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
439		557
440	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)	558	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
441	#define DEC_DEC_DEPTH --dec->depth	559	#define DEC_DEC_DEPTH --dec->depth
442		560
443	static UV	561	static UV
…		…
532	SvREFCNT_dec (av);	650	SvREFCNT_dec (av);
533	DEC_DEC_DEPTH;	651	DEC_DEC_DEPTH;
534	return &PL_sv_undef;	652	return &PL_sv_undef;
535	}	653	}
536		654
		655	static void
		656	decode_he (dec_t dec, HV hv)
		657	{
		658	// for speed reasons, we specialcase single-string
		659	// byte or utf-8 strings as keys, but only when !stringref
		660
		661	if (ecb_expect_true (!dec->stringref))
		662	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		663	{
		664	I32 len = decode_uint (dec);
		665	char key = (char )dec->cur;
		666
		667	dec->cur += len;
		668
		669	if (ecb_expect_false (dec->stringref))
		670	av_push (dec->stringref, newSVpvn (key, len));
		671
		672	hv_store (hv, key, len, decode_sv (dec), 0);
		673
		674	return;
		675	}
		676	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		677	{
		678	I32 len = decode_uint (dec);
		679	char key = (char )dec->cur;
		680
		681	dec->cur += len;
		682
		683	if (ecb_expect_false (dec->stringref))
		684	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		685
		686	hv_store (hv, key, -len, decode_sv (dec), 0);
		687
		688	return;
		689	}
		690
		691	SV *k = decode_sv (dec);
		692	SV *v = decode_sv (dec);
		693
		694	hv_store_ent (hv, k, v, 0);
		695	SvREFCNT_dec (k);
		696	}
		697
537	static SV *	698	static SV *
538	decode_hv (dec_t *dec)	699	decode_hv (dec_t *dec)
539	{	700	{
540	HV *hv = newHV ();	701	HV *hv = newHV ();
541		702
…		…
553	{	714	{
554	++dec->cur;	715	++dec->cur;
555	break;	716	break;
556	}	717	}
557		718
558	SV *k = decode_sv (dec);	719	decode_he (dec, hv);
559	SV *v = decode_sv (dec);
560
561	hv_store_ent (hv, k, v, 0);
562	}	720	}
563	}	721	}
564	else	722	else
565	{	723	{
566	int len = decode_uint (dec);	724	int pairs = decode_uint (dec);
567		725
568	while (len--)	726	while (pairs--)
569	{	727	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	}	728	}
576		729
577	DEC_DEC_DEPTH;	730	DEC_DEC_DEPTH;
578	return newRV_noinc ((SV *)hv);	731	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		732
735	fail:	733	fail:
736	SvREFCNT_dec (hv);	734	SvREFCNT_dec (hv);
737	DEC_DEC_DEPTH;	735	DEC_DEC_DEPTH;
738	return &PL_sv_undef;	736	return &PL_sv_undef;
739	}	737	}
740		738
741	static SV *	739	static SV *
742	decode_str (dec_t *dec, int utf8)	740	decode_str (dec_t *dec, int utf8)
743	{	741	{
744	SV *sv;	742	SV *sv = 0;
745		743
746	if ((*dec->cur & 31) == 31)	744	if ((*dec->cur & 31) == 31)
747	{	745	{
748	++dec->cur;	746	++dec->cur;
749		747
…		…
758	{	756	{
759	++dec->cur;	757	++dec->cur;
760	break;	758	break;
761	}	759	}
762		760
763	SV *sv2 = decode_sv (dec);
764	sv_catsv (sv, sv2);	761	sv_catsv (sv, decode_sv (dec));
765	}	762	}
766	}	763	}
767	else	764	else
768	{	765	{
769	STRLEN len = decode_uint (dec);	766	STRLEN len = decode_uint (dec);
…		…
774	}	771	}
775		772
776	if (utf8)	773	if (utf8)
777	SvUTF8_on (sv);	774	SvUTF8_on (sv);
778		775
		776	if (ecb_expect_false (dec->stringref)
		777	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		778	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
		779
779	return sv;	780	return sv;
780		781
781	fail:	782	fail:
		783	SvREFCNT_dec (sv);
		784	return &PL_sv_undef;
		785	}
		786
		787	static SV *
		788	decode_tagged (dec_t *dec)
		789	{
		790	SV *sv = 0;
		791	UV tag = decode_uint (dec);
		792
		793	WANT (1);
		794
		795	switch (tag)
		796	{
		797	case CBOR_TAG_MAGIC:
		798	sv = decode_sv (dec);
		799	break;
		800
		801	case CBOR_TAG_INDIRECTION:
		802	sv = newRV_noinc (decode_sv (dec));
		803	break;
		804
		805	case CBOR_TAG_STRINGREF_NAMESPACE:
		806	{
		807	ENTER; SAVETMPS;
		808
		809	SAVESPTR (dec->stringref);
		810	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		811
		812	sv = decode_sv (dec);
		813
		814	FREETMPS; LEAVE;
		815	}
		816	break;
		817
		818	case CBOR_TAG_STRINGREF:
		819	{
		820	if ((*dec->cur >> 5) != 0)
		821	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		822
		823	UV idx = decode_uint (dec);
		824
		825	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		826	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		827
		828	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		829	}
		830	break;
		831
		832	case CBOR_TAG_VALUE_SHAREABLE:
		833	{
		834	if (ecb_expect_false (!dec->shareable))
		835	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		836
		837	sv = newSV (0);
		838	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		839
		840	SV *osv = decode_sv (dec);
		841	sv_setsv (sv, osv);
		842	SvREFCNT_dec_NN (osv);
		843	}
		844	break;
		845
		846	case CBOR_TAG_VALUE_SHAREDREF:
		847	{
		848	if ((*dec->cur >> 5) != 0)
		849	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		850
		851	UV idx = decode_uint (dec);
		852
		853	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		854	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		855
		856	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		857	}
		858	break;
		859
		860	case CBOR_TAG_PERL_OBJECT:
		861	{
		862	sv = decode_sv (dec);
		863
		864	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		865	ERR ("corrupted CBOR data (non-array perl object)");
		866
		867	AV av = (AV )SvRV (sv);
		868	int len = av_len (av) + 1;
		869	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		870
		871	if (!stash)
		872	ERR ("cannot decode perl-object (package does not exist)");
		873
		874	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		875
		876	if (!method)
		877	ERR ("cannot decode perl-object (package does not have a THAW method)");
		878
		879	dSP;
		880
		881	ENTER; SAVETMPS; PUSHMARK (SP);
		882	EXTEND (SP, len + 1);
		883	// we re-bless the reference to get overload and other niceties right
		884	PUSHs (*av_fetch (av, 0, 1));
		885	PUSHs (sv_cbor);
		886
		887	int i;
		888
		889	for (i = 1; i < len; ++i)
		890	PUSHs (*av_fetch (av, i, 1));
		891
		892	PUTBACK;
		893	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		894	SPAGAIN;
		895
		896	if (SvTRUE (ERRSV))
		897	{
		898	FREETMPS; LEAVE;
		899	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		900	}
		901
		902	SvREFCNT_dec (sv);
		903	sv = SvREFCNT_inc (POPs);
		904
		905	PUTBACK;
		906
		907	FREETMPS; LEAVE;
		908	}
		909	break;
		910
		911	default:
		912	{
		913	sv = decode_sv (dec);
		914
		915	AV *av = newAV ();
		916	av_push (av, newSVuv (tag));
		917	av_push (av, sv);
		918
		919	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		920	? cbor_tagged_stash
		921	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		922
		923	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		924	}
		925	break;
		926	}
		927
		928	return sv;
		929
		930	fail:
		931	SvREFCNT_dec (sv);
782	return &PL_sv_undef;	932	return &PL_sv_undef;
783	}	933	}
784		934
785	static SV *	935	static SV *
786	decode_sv (dec_t *dec)	936	decode_sv (dec_t *dec)
…		…
788	WANT (1);	938	WANT (1);
789		939
790	switch (*dec->cur >> 5)	940	switch (*dec->cur >> 5)
791	{	941	{
792	case 0: // unsigned int	942	case 0: // unsigned int
793	//TODO: 64 bit values on 3 2bit perls
794	return newSVuv (decode_uint (dec));	943	return newSVuv (decode_uint (dec));
795	case 1: // negative int	944	case 1: // negative int
796	return newSViv (-1 - (IV)decode_uint (dec));	945	return newSViv (-1 - (IV)decode_uint (dec));
797	case 2: // octet string	946	case 2: // octet string
798	return decode_str (dec, 0);	947	return decode_str (dec, 0);
…		…
801	case 4: // array	950	case 4: // array
802	return decode_av (dec);	951	return decode_av (dec);
803	case 5: // map	952	case 5: // map
804	return decode_hv (dec);	953	return decode_hv (dec);
805	case 6: // tag	954	case 6: // tag
806	abort ();	955	return decode_tagged (dec);
807	break;
808	case 7: // misc	956	case 7: // misc
809	switch (*dec->cur++ & 31)	957	switch (*dec->cur++ & 31)
810	{	958	{
811	case 20:	959	case 20:
812	#if CBOR_SLOW	960	#if CBOR_SLOW
813	cbor_false = get_bool ("CBOR::XS::false");	961	types_false = get_bool ("Types::Serialiser::false");
814	#endif	962	#endif
815	return newSVsv (cbor_false);	963	return newSVsv (types_false);
816	case 21:	964	case 21:
817	#if CBOR_SLOW	965	#if CBOR_SLOW
818	cbor_true = get_bool ("CBOR::XS::true");	966	types_true = get_bool ("Types::Serialiser::true");
819	#endif	967	#endif
820	return newSVsv (cbor_true);	968	return newSVsv (types_true);
821	case 22:	969	case 22:
822	return newSVsv (&PL_sv_undef);	970	return newSVsv (&PL_sv_undef);
		971	case 23:
		972	#if CBOR_SLOW
		973	types_error = get_bool ("Types::Serialiser::error");
		974	#endif
		975	return newSVsv (types_error);
823		976
824	case 25:	977	case 25:
825	{	978	{
826	WANT (2);	979	WANT (2);
827		980
…		…
863	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1016	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
864	}	1017	}
865		1018
866	break;	1019	break;
867	}	1020	}
868	#if 0
869	switch (*dec->cur)
870	{
871	//case '"': ++dec->cur; return decode_str (dec);
872	case '[': ++dec->cur; return decode_av (dec);
873	case '{': ++dec->cur; return decode_hv (dec);
874
875	case '-':
876	case '0': case '1': case '2': case '3': case '4':
877	case '5': case '6': case '7': case '8': case '9':
878	//TODO return decode_num (dec);
879
880	case 't':
881	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
882	{
883	dec->cur += 4;
884	#if CBOR_SLOW
885	cbor_true = get_bool ("CBOR::XS::true");
886	#endif
887	return newSVsv (cbor_true);
888	}
889	else
890	ERR ("'true' expected");
891
892	break;
893
894	case 'f':
895	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
896	{
897	dec->cur += 5;
898	#if CBOR_SLOW
899	cbor_false = get_bool ("CBOR::XS::false");
900	#endif
901	return newSVsv (cbor_false);
902	}
903	else
904	ERR ("'false' expected");
905
906	break;
907
908	case 'n':
909	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
910	{
911	dec->cur += 4;
912	return newSVsv (&PL_sv_undef);
913	}
914	else
915	ERR ("'null' expected");
916
917	break;
918
919	default:
920	ERR ("malformed CBOR string, neither array, object, number, string or atom");
921	break;
922	}
923	#endif
924		1021
925	fail:	1022	fail:
926	return &PL_sv_undef;	1023	return &PL_sv_undef;
927	}	1024	}
928		1025
929	static SV *	1026	static SV *
930	decode_cbor (SV string, CBOR cbor, char **offset_return)	1027	decode_cbor (SV string, CBOR cbor, char **offset_return)
931	{	1028	{
932	dec_t dec;	1029	dec_t dec = { };
933	SV *sv;	1030	SV *sv;
		1031	STRLEN len;
		1032	char *data = SvPVbyte (string, len);
934		1033
935	/* work around bugs in 5.10 where manipulating magic values
936	* makes perl ignore the magic in subsequent accesses.
937	* also make a copy of non-PV values, to get them into a clean
938	* state (SvPV should do that, but it's buggy, see below).
939	*/
940	/SvGETMAGIC (string);/
941	if (SvMAGICAL (string) \|\| !SvPOK (string))
942	string = sv_2mortal (newSVsv (string));
943
944	SvUPGRADE (string, SVt_PV);
945
946	/* work around a bug in perl 5.10, which causes SvCUR to fail an
947	* assertion with -DDEBUGGING, although SvCUR is documented to
948	* return the xpv_cur field which certainly exists after upgrading.
949	* according to nicholas clark, calling SvPOK fixes this.
950	* But it doesn't fix it, so try another workaround, call SvPV_nolen
951	* and hope for the best.
952	* Damnit, SvPV_nolen still trips over yet another assertion. This
953	* assertion business is seriously broken, try yet another workaround
954	* for the broken -DDEBUGGING.
955	*/
956	{
957	#ifdef DEBUGGING
958	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
959	#else
960	STRLEN offset = SvCUR (string);
961	#endif
962
963	if (offset > cbor->max_size && cbor->max_size)	1034	if (len > cbor->max_size && cbor->max_size)
964	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1035	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
965	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1036	(unsigned long)len, (unsigned long)cbor->max_size);
966	}
967
968	sv_utf8_downgrade (string, 0);
969		1037
970	dec.cbor = *cbor;	1038	dec.cbor = *cbor;
971	dec.cur = (U8 *)SvPVX (string);	1039	dec.cur = (U8 *)data;
972	dec.end = (U8 *)SvEND (string);	1040	dec.end = (U8 *)data + len;
973	dec.err = 0;
974	dec.depth = 0;
975
976	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
977	;//TODO dec.cbor.flags \|= F_HOOK;
978		1041
979	sv = decode_sv (&dec);	1042	sv = decode_sv (&dec);
980		1043
981	if (offset_return)	1044	if (offset_return)
982	*offset_return = dec.cur;	1045	*offset_return = dec.cur;
…		…
986	dec.err = "garbage after CBOR object";	1049	dec.err = "garbage after CBOR object";
987		1050
988	if (dec.err)	1051	if (dec.err)
989	{	1052	{
990	SvREFCNT_dec (sv);	1053	SvREFCNT_dec (sv);
991	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1054	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
992	}	1055	}
993		1056
994	sv = sv_2mortal (sv);	1057	sv = sv_2mortal (sv);
995		1058
996	return sv;	1059	return sv;
…		…
1002	MODULE = CBOR::XS PACKAGE = CBOR::XS	1065	MODULE = CBOR::XS PACKAGE = CBOR::XS
1003		1066
1004	BOOT:	1067	BOOT:
1005	{	1068	{
1006	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1069	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1007	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	1070	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1008		1071
1009	cbor_true = get_bool ("CBOR::XS::true");	1072	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1010	cbor_false = get_bool ("CBOR::XS::false");	1073	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1074
		1075	types_true = get_bool ("Types::Serialiser::true" );
		1076	types_false = get_bool ("Types::Serialiser::false");
		1077	types_error = get_bool ("Types::Serialiser::error");
		1078
		1079	sv_cbor = newSVpv ("CBOR", 0);
		1080	SvREADONLY_on (sv_cbor);
1011	}	1081	}
1012		1082
1013	PROTOTYPES: DISABLE	1083	PROTOTYPES: DISABLE
1014		1084
1015	void CLONE (...)	1085	void CLONE (...)
1016	CODE:	1086	CODE:
1017	cbor_stash = 0;	1087	cbor_stash = 0;
		1088	cbor_tagged_stash = 0;
		1089	types_error_stash = 0;
1018	cbor_boolean_stash = 0;	1090	types_boolean_stash = 0;
1019		1091
1020	void new (char *klass)	1092	void new (char *klass)
1021	PPCODE:	1093	PPCODE:
1022	{	1094	{
1023	SV *pv = NEWSV (0, sizeof (CBOR));	1095	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1031		1103
1032	void shrink (CBOR *self, int enable = 1)	1104	void shrink (CBOR *self, int enable = 1)
1033	ALIAS:	1105	ALIAS:
1034	shrink = F_SHRINK	1106	shrink = F_SHRINK
1035	allow_unknown = F_ALLOW_UNKNOWN	1107	allow_unknown = F_ALLOW_UNKNOWN
		1108	allow_sharing = F_ALLOW_SHARING
		1109	dedup_strings = F_DEDUP_STRINGS
1036	PPCODE:	1110	PPCODE:
1037	{	1111	{
1038	if (enable)	1112	if (enable)
1039	self->flags \|= ix;	1113	self->flags \|= ix;
1040	else	1114	else
…		…
1045		1119
1046	void get_shrink (CBOR *self)	1120	void get_shrink (CBOR *self)
1047	ALIAS:	1121	ALIAS:
1048	get_shrink = F_SHRINK	1122	get_shrink = F_SHRINK
1049	get_allow_unknown = F_ALLOW_UNKNOWN	1123	get_allow_unknown = F_ALLOW_UNKNOWN
		1124	get_allow_sharing = F_ALLOW_SHARING
		1125	get_dedup_strings = F_DEDUP_STRINGS
1050	PPCODE:	1126	PPCODE:
1051	XPUSHs (boolSV (self->flags & ix));	1127	XPUSHs (boolSV (self->flags & ix));
1052		1128
1053	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1129	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1054	PPCODE:	1130	PPCODE:
…		…
1069	int get_max_size (CBOR *self)	1145	int get_max_size (CBOR *self)
1070	CODE:	1146	CODE:
1071	RETVAL = self->max_size;	1147	RETVAL = self->max_size;
1072	OUTPUT:	1148	OUTPUT:
1073	RETVAL	1149	RETVAL
1074
1075	#if 0 //TODO
1076
1077	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1078	PPCODE:
1079	{
1080	SvREFCNT_dec (self->cb_object);
1081	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1082
1083	XPUSHs (ST (0));
1084	}
1085
1086	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
1087	PPCODE:
1088	{
1089	if (!self->cb_sk_object)
1090	self->cb_sk_object = newHV ();
1091
1092	if (SvOK (cb))
1093	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1094	else
1095	{
1096	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1097
1098	if (!HvKEYS (self->cb_sk_object))
1099	{
1100	SvREFCNT_dec (self->cb_sk_object);
1101	self->cb_sk_object = 0;
1102	}
1103	}
1104
1105	XPUSHs (ST (0));
1106	}
1107
1108	#endif
1109		1150
1110	void encode (CBOR self, SV scalar)	1151	void encode (CBOR self, SV scalar)
1111	PPCODE:	1152	PPCODE:
1112	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1153	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1113	XPUSHs (scalar);	1154	XPUSHs (scalar);
…		…
1126	EXTEND (SP, 2);	1167	EXTEND (SP, 2);
1127	PUSHs (sv);	1168	PUSHs (sv);
1128	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1169	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1129	}	1170	}
1130		1171
1131	void DESTROY (CBOR *self)
1132	CODE:
1133	SvREFCNT_dec (self->cb_sk_object);
1134	SvREFCNT_dec (self->cb_object);
1135
1136	PROTOTYPES: ENABLE	1172	PROTOTYPES: ENABLE
1137		1173
1138	void encode_cbor (SV *scalar)	1174	void encode_cbor (SV *scalar)
1139	PPCODE:	1175	PPCODE:
1140	{	1176	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.2 by root, Sat Oct 26 10:41:12 2013 UTC vs. Revision 1.23 by root, Wed Nov 20 16:19:47 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.2 by root, Sat Oct 26 10:41:12 2013 UTC vs.
Revision 1.23 by root, Wed Nov 20 16:19:47 2013 UTC