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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.31 by root, Thu Nov 28 11:43:26 2013 UTC

…		…
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
12	#include "ecb.h"	12	#include "ecb.h"
13		13
		14	// compatibility with perl <5.18
		15	#ifndef HvNAMELEN_get
		16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		17	#endif
		18	#ifndef HvNAMELEN
		19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		20	#endif
		21	#ifndef HvNAMEUTF8
		22	# define HvNAMEUTF8(hv) 0
		23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
		27
		28	// known tags
		29	enum cbor_tag
		30	{
		31	// extensions
		32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
		33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
		34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
		35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
		36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
		37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
		38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
		39
		40	// rfc7049
		41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		43	CBOR_TAG_POS_BIGNUM = 2, // byte string
		44	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		45	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		46	CBOR_TAG_BIGFLOAT = 5, // array
		47
		48	CBOR_TAG_CONV_B64U = 21, // base64url, any
		49	CBOR_TAG_CONV_B64 = 22, // base64, any
		50	CBOR_TAG_CONV_HEX = 23, // base16, any
		51	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		52
		53	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		54	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		55	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		56	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		58
		59	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		60	};
		61
14	#define F_SHRINK 0x00000200UL	62	#define F_SHRINK 0x00000001UL
15	#define F_ALLOW_UNKNOWN 0x00002000UL	63	#define F_ALLOW_UNKNOWN 0x00000002UL
		64	#define F_ALLOW_SHARING 0x00000004UL //TODO
		65	#define F_ALLOW_STRINGREF 0x00000008UL //TODO
16		66
17	#define INIT_SIZE 32 // initial scalar size to be allocated	67	#define INIT_SIZE 32 // initial scalar size to be allocated
18		68
19	#define SB do {	69	#define SB do {
20	#define SE } while (0)	70	#define SE } while (0)
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		71
33	#define IN_RANGE_INC(type,val,beg,end) \	72	#define IN_RANGE_INC(type,val,beg,end) \
34	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	73	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
35	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	74	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
36		75
…		…
42	#else	81	#else
43	# define CBOR_SLOW 0	82	# define CBOR_SLOW 0
44	# define CBOR_STASH cbor_stash	83	# define CBOR_STASH cbor_stash
45	#endif	84	#endif
46		85
47	static HV cbor_stash, cbor_boolean_stash; // CBOR::XS::	86	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
48	static SV cbor_true, cbor_false;	87	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
49		88
50	typedef struct {	89	typedef struct {
51	U32 flags;	90	U32 flags;
52	U32 max_depth;	91	U32 max_depth;
53	STRLEN max_size;	92	STRLEN max_size;
54		93	SV *filter;
55	SV *cb_object;
56	HV *cb_sk_object;
57	} CBOR;	94	} CBOR;
58		95
59	INLINE void	96	ecb_inline void
60	cbor_init (CBOR *cbor)	97	cbor_init (CBOR *cbor)
61	{	98	{
62	Zero (cbor, 1, CBOR);	99	Zero (cbor, 1, CBOR);
63	cbor->max_depth = 512;	100	cbor->max_depth = 512;
64	}	101	}
65		102
		103	ecb_inline void
		104	cbor_free (CBOR *cbor)
		105	{
		106	SvREFCNT_dec (cbor->filter);
		107	}
		108
66	/////////////////////////////////////////////////////////////////////////////	109	/////////////////////////////////////////////////////////////////////////////
67	// utility functions	110	// utility functions
68		111
69	INLINE SV *	112	ecb_inline SV *
70	get_bool (const char *name)	113	get_bool (const char *name)
71	{	114	{
72	SV *sv = get_sv (name, 1);	115	SV *sv = get_sv (name, 1);
73		116
74	SvREADONLY_on (sv);	117	SvREADONLY_on (sv);
75	SvREADONLY_on (SvRV (sv));	118	SvREADONLY_on (SvRV (sv));
76		119
77	return sv;	120	return sv;
78	}	121	}
79		122
80	INLINE void	123	ecb_inline void
81	shrink (SV *sv)	124	shrink (SV *sv)
82	{	125	{
83	sv_utf8_downgrade (sv, 1);	126	sv_utf8_downgrade (sv, 1);
84		127
85	if (SvLEN (sv) > SvCUR (sv) + 1)	128	if (SvLEN (sv) > SvCUR (sv) + 1)
…		…
90	SvPV_renew (sv, SvCUR (sv) + 1);	133	SvPV_renew (sv, SvCUR (sv) + 1);
91	#endif	134	#endif
92	}	135	}
93	}	136	}
94		137
95	/////////////////////////////////////////////////////////////////////////////	138	// minimum length of a string to be registered for stringref
96	// fp hell	139	ecb_inline int
97		140	minimum_string_length (UV idx)
98	//TODO	141	{
		142	return idx > 23
		143	? idx > 0xffU
		144	? idx > 0xffffU
		145	? idx > 0xffffffffU
		146	? 11
		147	: 7
		148	: 5
		149	: 4
		150	: 3;
		151	}
99		152
100	/////////////////////////////////////////////////////////////////////////////	153	/////////////////////////////////////////////////////////////////////////////
101	// encoder	154	// encoder
102		155
103	// structure used for encoding CBOR	156	// structure used for encoding CBOR
…		…
106	char *cur; // SvPVX (sv) + current output position	159	char *cur; // SvPVX (sv) + current output position
107	char *end; // SvEND (sv)	160	char *end; // SvEND (sv)
108	SV *sv; // result scalar	161	SV *sv; // result scalar
109	CBOR cbor;	162	CBOR cbor;
110	U32 depth; // recursion level	163	U32 depth; // recursion level
		164	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		165	UV stringref_idx;
		166	HV *shareable; // ptr => index, or 0
		167	UV shareable_idx;
111	} enc_t;	168	} enc_t;
112		169
113	INLINE void	170	ecb_inline void
114	need (enc_t *enc, STRLEN len)	171	need (enc_t *enc, STRLEN len)
115	{	172	{
116	if (expect_false (enc->cur + len >= enc->end))	173	if (ecb_expect_false (enc->cur + len >= enc->end))
117	{	174	{
118	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	175	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
119	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	176	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
120	enc->cur = SvPVX (enc->sv) + cur;	177	enc->cur = SvPVX (enc->sv) + cur;
121	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	178	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
122	}	179	}
123	}	180	}
124		181
125	INLINE void	182	ecb_inline void
126	encode_ch (enc_t *enc, char ch)	183	encode_ch (enc_t *enc, char ch)
127	{	184	{
128	need (enc, 1);	185	need (enc, 1);
129	*enc->cur++ = ch;	186	*enc->cur++ = ch;
130	}	187	}
…		…
132	static void	189	static void
133	encode_uint (enc_t *enc, int major, UV len)	190	encode_uint (enc_t *enc, int major, UV len)
134	{	191	{
135	need (enc, 9);	192	need (enc, 9);
136		193
137	if (len < 24)	194	if (ecb_expect_true (len < 24))
138	*enc->cur++ = major \| len;	195	*enc->cur++ = major \| len;
139	else if (len < 0x100)	196	else if (ecb_expect_true (len <= 0xff))
140	{	197	{
141	*enc->cur++ = major \| 24;	198	*enc->cur++ = major \| 24;
142	*enc->cur++ = len;	199	*enc->cur++ = len;
143	}	200	}
144	else if (len < 0x10000)	201	else if (len <= 0xffff)
145	{	202	{
146	*enc->cur++ = major \| 25;	203	*enc->cur++ = major \| 25;
147	*enc->cur++ = len >> 8;	204	*enc->cur++ = len >> 8;
148	*enc->cur++ = len;	205	*enc->cur++ = len;
149	}	206	}
150	else if (len < 0x100000000)	207	else if (len <= 0xffffffff)
151	{	208	{
152	*enc->cur++ = major \| 26;	209	*enc->cur++ = major \| 26;
153	*enc->cur++ = len >> 24;	210	*enc->cur++ = len >> 24;
154	*enc->cur++ = len >> 16;	211	*enc->cur++ = len >> 16;
155	*enc->cur++ = len >> 8;	212	*enc->cur++ = len >> 8;
156	*enc->cur++ = len;	213	*enc->cur++ = len;
157	}	214	}
158	else if (len)	215	else
159	{	216	{
160	*enc->cur++ = major \| 27;	217	*enc->cur++ = major \| 27;
161	*enc->cur++ = len >> 56;	218	*enc->cur++ = len >> 56;
162	*enc->cur++ = len >> 48;	219	*enc->cur++ = len >> 48;
163	*enc->cur++ = len >> 40;	220	*enc->cur++ = len >> 40;
…		…
167	*enc->cur++ = len >> 8;	224	*enc->cur++ = len >> 8;
168	*enc->cur++ = len;	225	*enc->cur++ = len;
169	}	226	}
170	}	227	}
171		228
172	static void	229	ecb_inline void
		230	encode_tag (enc_t *enc, UV tag)
		231	{
		232	encode_uint (enc, 0xc0, tag);
		233	}
		234
		235	ecb_inline void
173	encode_str (enc_t enc, int utf8, char str, STRLEN len)	236	encode_str (enc_t enc, int utf8, char str, STRLEN len)
174	{	237	{
175	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
176	need (enc, len);	239	need (enc, len);
177	memcpy (enc->cur, str, len);	240	memcpy (enc->cur, str, len);
178	enc->cur += len;	241	enc->cur += len;
179	}	242	}
180		243
		244	static void
		245	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
		246	{
		247	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		248	{
		249	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		250
		251	if (SvOK (*svp))
		252	{
		253	// already registered, use stringref
		254	encode_tag (enc, CBOR_TAG_STRINGREF);
		255	encode_uint (enc, 0x00, SvUV (*svp));
		256	return;
		257	}
		258	else if (len >= minimum_string_length (enc->stringref_idx))
		259	{
		260	// register only
		261	sv_setuv (*svp, enc->stringref_idx);
		262	++enc->stringref_idx;
		263	}
		264	}
		265
		266	encode_str (enc, utf8, str, len);
		267	}
		268
181	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
182		270
183	static void	271	static void
184	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
185	{	273	{
…		…
222	while ((he = hv_iternext (hv)))	310	while ((he = hv_iternext (hv)))
223	{	311	{
224	if (HeKLEN (he) == HEf_SVKEY)	312	if (HeKLEN (he) == HEf_SVKEY)
225	encode_sv (enc, HeSVKEY (he));	313	encode_sv (enc, HeSVKEY (he));
226	else	314	else
227	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	315	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
228		316
229	encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
230	}	318	}
231		319
232	if (mg)	320	if (mg)
233	encode_ch (enc, 0xe0 \| 31);	321	encode_ch (enc, 0xe0 \| 31);
234		322
…		…
237		325
238	// encode objects, arrays and special \0=false and \1=true values.	326	// encode objects, arrays and special \0=false and \1=true values.
239	static void	327	static void
240	encode_rv (enc_t enc, SV sv)	328	encode_rv (enc_t enc, SV sv)
241	{	329	{
242	svtype svt;
243
244	SvGETMAGIC (sv);	330	SvGETMAGIC (sv);
		331
		332	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		333	&& ecb_expect_false (SvREFCNT (sv) > 1))
		334	{
		335	if (!enc->shareable)
		336	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		337
		338	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		339
		340	if (SvOK (*svp))
		341	{
		342	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		343	encode_uint (enc, 0x00, SvUV (*svp));
		344	return;
		345	}
		346	else
		347	{
		348	sv_setuv (*svp, enc->shareable_idx);
		349	++enc->shareable_idx;
		350	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		351	}
		352	}
		353
245	svt = SvTYPE (sv);	354	svtype svt = SvTYPE (sv);
246		355
247	if (expect_false (SvOBJECT (sv)))	356	if (ecb_expect_false (SvOBJECT (sv)))
248	{	357	{
249	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	358	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
250	? cbor_boolean_stash	359	? types_boolean_stash
		360	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		361	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		362	? types_error_stash
		363	: gv_stashpv ("Types::Serialiser::Error", 1);
		364	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		365	? cbor_tagged_stash
251	: gv_stashpv ("CBOR::XS::Boolean", 1);	366	: gv_stashpv ("CBOR::XS::Tagged" , 1);
252		367
253	if (SvSTASH (sv) == stash)	368	HV *stash = SvSTASH (sv);
		369	GV *method;
		370
		371	if (stash == boolean_stash)
254	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	372	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		373	else if (stash == error_stash)
		374	encode_ch (enc, 0xe0 \| 23);
		375	else if (stash == tagged_stash)
		376	{
		377	if (svt != SVt_PVAV)
		378	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		379
		380	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		381	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		382	}
		383	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		384	{
		385	dSP;
		386
		387	ENTER; SAVETMPS; PUSHMARK (SP);
		388	// we re-bless the reference to get overload and other niceties right
		389	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		390
		391	PUTBACK;
		392	// G_SCALAR ensures that return value is 1
		393	call_sv ((SV *)GvCV (method), G_SCALAR);
		394	SPAGAIN;
		395
		396	// catch this surprisingly common error
		397	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		398	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		399
		400	encode_sv (enc, POPs);
		401
		402	PUTBACK;
		403
		404	FREETMPS; LEAVE;
		405	}
		406	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		407	{
		408	dSP;
		409
		410	ENTER; SAVETMPS; PUSHMARK (SP);
		411	EXTEND (SP, 2);
		412	// we re-bless the reference to get overload and other niceties right
		413	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		414	PUSHs (sv_cbor);
		415
		416	PUTBACK;
		417	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		418	SPAGAIN;
		419
		420	// catch this surprisingly common error
		421	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		422	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		423
		424	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		425	encode_uint (enc, 0x80, count + 1);
		426	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		427
		428	while (count)
		429	encode_sv (enc, SP[1 - count--]);
		430
		431	PUTBACK;
		432
		433	FREETMPS; LEAVE;
		434	}
255	else	435	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",	436	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))));	437	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
297	#endif
298	}
299	}	438	}
300	else if (svt == SVt_PVHV)	439	else if (svt == SVt_PVHV)
301	encode_hv (enc, (HV *)sv);	440	encode_hv (enc, (HV *)sv);
302	else if (svt == SVt_PVAV)	441	else if (svt == SVt_PVAV)
303	encode_av (enc, (AV *)sv);	442	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	443	else
322	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	444	{
323	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	445	encode_tag (enc, CBOR_TAG_INDIRECTION);
		446	encode_sv (enc, sv);
		447	}
324	}	448	}
325		449
326	static void	450	static void
327	encode_nv (enc_t enc, SV sv)	451	encode_nv (enc_t enc, SV sv)
328	{	452	{
329	double nv = SvNVX (sv);	453	double nv = SvNVX (sv);
330		454
331	need (enc, 9);	455	need (enc, 9);
332		456
333	if (expect_false (nv == (U32)nv))	457	if (ecb_expect_false (nv == (U32)nv))
334	encode_uint (enc, 0x00, (U32)nv);	458	encode_uint (enc, 0x00, (U32)nv);
335	//TODO: maybe I32?	459	//TODO: maybe I32?
336	else if (expect_false (nv == (float)nv))	460	else if (ecb_expect_false (nv == (float)nv))
337	{	461	{
338	uint32_t fp = ecb_float_to_binary32 (nv);	462	uint32_t fp = ecb_float_to_binary32 (nv);
339		463
340	*enc->cur++ = 0xe0 \| 26;	464	*enc->cur++ = 0xe0 \| 26;
341		465
…		…
366		490
367	if (SvPOKp (sv))	491	if (SvPOKp (sv))
368	{	492	{
369	STRLEN len;	493	STRLEN len;
370	char *str = SvPV (sv, len);	494	char *str = SvPV (sv, len);
371	encode_str (enc, SvUTF8 (sv), str, len);	495	encode_strref (enc, SvUTF8 (sv), str, len);
372	}	496	}
373	else if (SvNOKp (sv))	497	else if (SvNOKp (sv))
374	encode_nv (enc, sv);	498	encode_nv (enc, sv);
375	else if (SvIOKp (sv))	499	else if (SvIOKp (sv))
376	{	500	{
…		…
393	}	517	}
394		518
395	static SV *	519	static SV *
396	encode_cbor (SV scalar, CBOR cbor)	520	encode_cbor (SV scalar, CBOR cbor)
397	{	521	{
398	enc_t enc;	522	enc_t enc = { };
399		523
400	enc.cbor = *cbor;	524	enc.cbor = *cbor;
401	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	525	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
402	enc.cur = SvPVX (enc.sv);	526	enc.cur = SvPVX (enc.sv);
403	enc.end = SvEND (enc.sv);	527	enc.end = SvEND (enc.sv);
404	enc.depth = 0;
405		528
406	SvPOK_only (enc.sv);	529	SvPOK_only (enc.sv);
		530
		531	if (cbor->flags & F_ALLOW_STRINGREF)
		532	{
		533	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		534	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		535	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		536	}
		537
407	encode_sv (&enc, scalar);	538	encode_sv (&enc, scalar);
408		539
409	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	540	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
410	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	541	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
411		542
…		…
425	U8 *end; // end of input string	556	U8 *end; // end of input string
426	const char *err; // parse error, if != 0	557	const char *err; // parse error, if != 0
427	CBOR cbor;	558	CBOR cbor;
428	U32 depth; // recursion depth	559	U32 depth; // recursion depth
429	U32 maxdepth; // recursion depth limit	560	U32 maxdepth; // recursion depth limit
		561	AV *shareable;
		562	AV *stringref;
		563	SV *decode_tagged;
430	} dec_t;	564	} dec_t;
431		565
432	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	566	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
433		567
434	#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data");	568	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
435		569
436	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)	570	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
437	#define DEC_DEC_DEPTH --dec->depth	571	#define DEC_DEC_DEPTH --dec->depth
438		572
439	static UV	573	static UV
…		…
528	SvREFCNT_dec (av);	662	SvREFCNT_dec (av);
529	DEC_DEC_DEPTH;	663	DEC_DEC_DEPTH;
530	return &PL_sv_undef;	664	return &PL_sv_undef;
531	}	665	}
532		666
		667	static void
		668	decode_he (dec_t dec, HV hv)
		669	{
		670	// for speed reasons, we specialcase single-string
		671	// byte or utf-8 strings as keys, but only when !stringref
		672
		673	if (ecb_expect_true (!dec->stringref))
		674	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		675	{
		676	I32 len = decode_uint (dec);
		677	char key = (char )dec->cur;
		678
		679	dec->cur += len;
		680
		681	if (ecb_expect_false (dec->stringref))
		682	av_push (dec->stringref, newSVpvn (key, len));
		683
		684	hv_store (hv, key, len, decode_sv (dec), 0);
		685
		686	return;
		687	}
		688	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		689	{
		690	I32 len = decode_uint (dec);
		691	char key = (char )dec->cur;
		692
		693	dec->cur += len;
		694
		695	if (ecb_expect_false (dec->stringref))
		696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		697
		698	hv_store (hv, key, -len, decode_sv (dec), 0);
		699
		700	return;
		701	}
		702
		703	SV *k = decode_sv (dec);
		704	SV *v = decode_sv (dec);
		705
		706	hv_store_ent (hv, k, v, 0);
		707	SvREFCNT_dec (k);
		708	}
		709
533	static SV *	710	static SV *
534	decode_hv (dec_t *dec)	711	decode_hv (dec_t *dec)
535	{	712	{
536	HV *hv = newHV ();	713	HV *hv = newHV ();
537		714
…		…
549	{	726	{
550	++dec->cur;	727	++dec->cur;
551	break;	728	break;
552	}	729	}
553		730
554	SV *k = decode_sv (dec);	731	decode_he (dec, hv);
555	SV *v = decode_sv (dec);
556
557	hv_store_ent (hv, k, v, 0);
558	}	732	}
559	}	733	}
560	else	734	else
561	{	735	{
562	int len = decode_uint (dec);	736	int pairs = decode_uint (dec);
563		737
564	while (len--)	738	while (pairs--)
565	{	739	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	}	740	}
572		741
573	DEC_DEC_DEPTH;	742	DEC_DEC_DEPTH;
574	return newRV_noinc ((SV *)hv);	743	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		744
731	fail:	745	fail:
732	SvREFCNT_dec (hv);	746	SvREFCNT_dec (hv);
733	DEC_DEC_DEPTH;	747	DEC_DEC_DEPTH;
734	return &PL_sv_undef;	748	return &PL_sv_undef;
735	}	749	}
736		750
737	static SV *	751	static SV *
738	decode_str (dec_t *dec, int utf8)	752	decode_str (dec_t *dec, int utf8)
739	{	753	{
740	SV *sv;	754	SV *sv = 0;
741		755
742	if ((*dec->cur & 31) == 31)	756	if ((*dec->cur & 31) == 31)
743	{	757	{
744	++dec->cur;	758	++dec->cur;
745		759
…		…
754	{	768	{
755	++dec->cur;	769	++dec->cur;
756	break;	770	break;
757	}	771	}
758		772
759	SV *sv2 = decode_sv (dec);
760	sv_catsv (sv, sv2);	773	sv_catsv (sv, decode_sv (dec));
761	}	774	}
762	}	775	}
763	else	776	else
764	{	777	{
765	STRLEN len = decode_uint (dec);	778	STRLEN len = decode_uint (dec);
766		779
767	WANT (len);	780	WANT (len);
768	sv = newSVpvn (dec->cur, len);	781	sv = newSVpvn (dec->cur, len);
769	dec->cur += len;	782	dec->cur += len;
		783
		784	if (ecb_expect_false (dec->stringref)
		785	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		786	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
770	}	787	}
771		788
772	if (utf8)	789	if (utf8)
773	SvUTF8_on (sv);	790	SvUTF8_on (sv);
774		791
775	return sv;	792	return sv;
776		793
777	fail:	794	fail:
		795	SvREFCNT_dec (sv);
778	return &PL_sv_undef;	796	return &PL_sv_undef;
779	}	797	}
780		798
781	static SV *	799	static SV *
782	decode_tagged (dec_t *dec)	800	decode_tagged (dec_t *dec)
783	{	801	{
		802	SV *sv = 0;
784	UV tag = decode_uint (dec);	803	UV tag = decode_uint (dec);
		804
		805	WANT (1);
		806
		807	switch (tag)
		808	{
		809	case CBOR_TAG_MAGIC:
		810	sv = decode_sv (dec);
		811	break;
		812
		813	case CBOR_TAG_INDIRECTION:
		814	sv = newRV_noinc (decode_sv (dec));
		815	break;
		816
		817	case CBOR_TAG_STRINGREF_NAMESPACE:
		818	{
		819	ENTER; SAVETMPS;
		820
		821	SAVESPTR (dec->stringref);
		822	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		823
		824	sv = decode_sv (dec);
		825
		826	FREETMPS; LEAVE;
		827	}
		828	break;
		829
		830	case CBOR_TAG_STRINGREF:
		831	{
		832	if ((*dec->cur >> 5) != 0)
		833	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		834
		835	UV idx = decode_uint (dec);
		836
		837	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		838	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		839
		840	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		841	}
		842	break;
		843
		844	case CBOR_TAG_VALUE_SHAREABLE:
		845	{
		846	if (ecb_expect_false (!dec->shareable))
		847	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		848
		849	sv = newSV (0);
		850	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		851
785	SV *sv = decode_sv (dec);	852	SV *osv = decode_sv (dec);
		853	sv_setsv (sv, osv);
		854	SvREFCNT_dec_NN (osv);
		855	}
		856	break;
786		857
787	if (tag == 55799) // 2.4.5 Self-Describe CBOR	858	case CBOR_TAG_VALUE_SHAREDREF:
		859	{
		860	if ((*dec->cur >> 5) != 0)
		861	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		862
		863	UV idx = decode_uint (dec);
		864
		865	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		866	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		867
		868	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		869	}
		870	break;
		871
		872	case CBOR_TAG_PERL_OBJECT:
		873	{
		874	sv = decode_sv (dec);
		875
		876	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		877	ERR ("corrupted CBOR data (non-array perl object)");
		878
		879	AV av = (AV )SvRV (sv);
		880	int len = av_len (av) + 1;
		881	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		882
		883	if (!stash)
		884	ERR ("cannot decode perl-object (package does not exist)");
		885
		886	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		887
		888	if (!method)
		889	ERR ("cannot decode perl-object (package does not have a THAW method)");
		890
		891	dSP;
		892
		893	ENTER; SAVETMPS; PUSHMARK (SP);
		894	EXTEND (SP, len + 1);
		895	// we re-bless the reference to get overload and other niceties right
		896	PUSHs (*av_fetch (av, 0, 1));
		897	PUSHs (sv_cbor);
		898
		899	int i;
		900
		901	for (i = 1; i < len; ++i)
		902	PUSHs (*av_fetch (av, i, 1));
		903
		904	PUTBACK;
		905	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		906	SPAGAIN;
		907
		908	if (SvTRUE (ERRSV))
		909	{
		910	FREETMPS; LEAVE;
		911	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		912	}
		913
		914	SvREFCNT_dec (sv);
		915	sv = SvREFCNT_inc (POPs);
		916
		917	PUTBACK;
		918
		919	FREETMPS; LEAVE;
		920	}
		921	break;
		922
		923	default:
		924	{
		925	sv = decode_sv (dec);
		926
		927	dSP;
		928	ENTER; SAVETMPS; PUSHMARK (SP);
		929	EXTEND (SP, 2);
		930	PUSHs (newSVuv (tag));
		931	PUSHs (sv);
		932
		933	PUTBACK;
		934	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		935	SPAGAIN;
		936
		937	if (SvTRUE (ERRSV))
		938	{
		939	FREETMPS; LEAVE;
		940	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		941	}
		942
		943	if (count)
		944	{
		945	SvREFCNT_dec (sv);
		946	sv = SvREFCNT_inc (POPs);
		947	}
		948	else
		949	{
		950	AV *av = newAV ();
		951	av_push (av, newSVuv (tag));
		952	av_push (av, sv);
		953
		954	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		955	? cbor_tagged_stash
		956	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		957	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		958	}
		959
		960	PUTBACK;
		961
		962	FREETMPS; LEAVE;
		963	}
		964	break;
		965	}
		966
788	return sv;	967	return sv;
789		968
790	AV *av = newAV ();	969	fail:
791	av_push (av, newSVuv (tag));	970	SvREFCNT_dec (sv);
792	av_push (av, sv);	971	return &PL_sv_undef;
793	return newRV_noinc ((SV *)av);
794	}	972	}
795		973
796	static SV *	974	static SV *
797	decode_sv (dec_t *dec)	975	decode_sv (dec_t *dec)
798	{	976	{
799	WANT (1);	977	WANT (1);
800		978
801	switch (*dec->cur >> 5)	979	switch (*dec->cur >> 5)
802	{	980	{
803	case 0: // unsigned int	981	case 0: // unsigned int
804	//TODO: 64 bit values on 3 2bit perls
805	return newSVuv (decode_uint (dec));	982	return newSVuv (decode_uint (dec));
806	case 1: // negative int	983	case 1: // negative int
807	return newSViv (-1 - (IV)decode_uint (dec));	984	return newSViv (-1 - (IV)decode_uint (dec));
808	case 2: // octet string	985	case 2: // octet string
809	return decode_str (dec, 0);	986	return decode_str (dec, 0);
…		…
818	case 7: // misc	995	case 7: // misc
819	switch (*dec->cur++ & 31)	996	switch (*dec->cur++ & 31)
820	{	997	{
821	case 20:	998	case 20:
822	#if CBOR_SLOW	999	#if CBOR_SLOW
823	cbor_false = get_bool ("CBOR::XS::false");	1000	types_false = get_bool ("Types::Serialiser::false");
824	#endif	1001	#endif
825	return newSVsv (cbor_false);	1002	return newSVsv (types_false);
826	case 21:	1003	case 21:
827	#if CBOR_SLOW	1004	#if CBOR_SLOW
828	cbor_true = get_bool ("CBOR::XS::true");	1005	types_true = get_bool ("Types::Serialiser::true");
829	#endif	1006	#endif
830	return newSVsv (cbor_true);	1007	return newSVsv (types_true);
831	case 22:	1008	case 22:
832	return newSVsv (&PL_sv_undef);	1009	return newSVsv (&PL_sv_undef);
		1010	case 23:
		1011	#if CBOR_SLOW
		1012	types_error = get_bool ("Types::Serialiser::error");
		1013	#endif
		1014	return newSVsv (types_error);
833		1015
834	case 25:	1016	case 25:
835	{	1017	{
836	WANT (2);	1018	WANT (2);
837		1019
…		…
873	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1055	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
874	}	1056	}
875		1057
876	break;	1058	break;
877	}	1059	}
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		1060
935	fail:	1061	fail:
936	return &PL_sv_undef;	1062	return &PL_sv_undef;
937	}	1063	}
938		1064
939	static SV *	1065	static SV *
940	decode_cbor (SV string, CBOR cbor, char **offset_return)	1066	decode_cbor (SV string, CBOR cbor, char **offset_return)
941	{	1067	{
942	dec_t dec;	1068	dec_t dec = { };
943	SV *sv;	1069	SV *sv;
		1070	STRLEN len;
		1071	char *data = SvPVbyte (string, len);
944		1072
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)	1073	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",	1074	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);	1075	(unsigned long)len, (unsigned long)cbor->max_size);
976	}
977
978	sv_utf8_downgrade (string, 0);
979		1076
980	dec.cbor = *cbor;	1077	dec.cbor = *cbor;
981	dec.cur = (U8 *)SvPVX (string);	1078	dec.cur = (U8 *)data;
982	dec.end = (U8 *)SvEND (string);	1079	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		1080
989	sv = decode_sv (&dec);	1081	sv = decode_sv (&dec);
990		1082
991	if (offset_return)	1083	if (offset_return)
992	*offset_return = dec.cur;	1084	*offset_return = dec.cur;
…		…
996	dec.err = "garbage after CBOR object";	1088	dec.err = "garbage after CBOR object";
997		1089
998	if (dec.err)	1090	if (dec.err)
999	{	1091	{
1000	SvREFCNT_dec (sv);	1092	SvREFCNT_dec (sv);
1001	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1093	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
1002	}	1094	}
1003		1095
1004	sv = sv_2mortal (sv);	1096	sv = sv_2mortal (sv);
1005		1097
1006	return sv;	1098	return sv;
…		…
1012	MODULE = CBOR::XS PACKAGE = CBOR::XS	1104	MODULE = CBOR::XS PACKAGE = CBOR::XS
1013		1105
1014	BOOT:	1106	BOOT:
1015	{	1107	{
1016	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1108	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1017	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	1109	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1018		1110
1019	cbor_true = get_bool ("CBOR::XS::true");	1111	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1020	cbor_false = get_bool ("CBOR::XS::false");	1112	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1113
		1114	types_true = get_bool ("Types::Serialiser::true" );
		1115	types_false = get_bool ("Types::Serialiser::false");
		1116	types_error = get_bool ("Types::Serialiser::error");
		1117
		1118	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1119
		1120	sv_cbor = newSVpv ("CBOR", 0);
		1121	SvREADONLY_on (sv_cbor);
1021	}	1122	}
1022		1123
1023	PROTOTYPES: DISABLE	1124	PROTOTYPES: DISABLE
1024		1125
1025	void CLONE (...)	1126	void CLONE (...)
1026	CODE:	1127	CODE:
1027	cbor_stash = 0;	1128	cbor_stash = 0;
		1129	cbor_tagged_stash = 0;
		1130	types_error_stash = 0;
1028	cbor_boolean_stash = 0;	1131	types_boolean_stash = 0;
1029		1132
1030	void new (char *klass)	1133	void new (char *klass)
1031	PPCODE:	1134	PPCODE:
1032	{	1135	{
1033	SV *pv = NEWSV (0, sizeof (CBOR));	1136	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1041		1144
1042	void shrink (CBOR *self, int enable = 1)	1145	void shrink (CBOR *self, int enable = 1)
1043	ALIAS:	1146	ALIAS:
1044	shrink = F_SHRINK	1147	shrink = F_SHRINK
1045	allow_unknown = F_ALLOW_UNKNOWN	1148	allow_unknown = F_ALLOW_UNKNOWN
		1149	allow_sharing = F_ALLOW_SHARING
		1150	allow_stringref = F_ALLOW_STRINGREF
1046	PPCODE:	1151	PPCODE:
1047	{	1152	{
1048	if (enable)	1153	if (enable)
1049	self->flags \|= ix;	1154	self->flags \|= ix;
1050	else	1155	else
…		…
1055		1160
1056	void get_shrink (CBOR *self)	1161	void get_shrink (CBOR *self)
1057	ALIAS:	1162	ALIAS:
1058	get_shrink = F_SHRINK	1163	get_shrink = F_SHRINK
1059	get_allow_unknown = F_ALLOW_UNKNOWN	1164	get_allow_unknown = F_ALLOW_UNKNOWN
		1165	get_allow_sharing = F_ALLOW_SHARING
		1166	get_allow_stringref = F_ALLOW_STRINGREF
1060	PPCODE:	1167	PPCODE:
1061	XPUSHs (boolSV (self->flags & ix));	1168	XPUSHs (boolSV (self->flags & ix));
1062		1169
1063	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1170	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1064	PPCODE:	1171	PPCODE:
…		…
1080	CODE:	1187	CODE:
1081	RETVAL = self->max_size;	1188	RETVAL = self->max_size;
1082	OUTPUT:	1189	OUTPUT:
1083	RETVAL	1190	RETVAL
1084		1191
1085	#if 0 //TODO	1192	void filter (CBOR self, SV filter = 0)
1086
1087	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1088	PPCODE:	1193	PPCODE:
1089	{
1090	SvREFCNT_dec (self->cb_object);	1194	SvREFCNT_dec (self->filter);
1091	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1195	self->filter = filter ? newSVsv (filter) : filter;
1092
1093	XPUSHs (ST (0));	1196	XPUSHs (ST (0));
1094	}
1095		1197
1096	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1198	SV get_filter (CBOR self)
1097	PPCODE:	1199	CODE:
1098	{	1200	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1099	if (!self->cb_sk_object)	1201	OUTPUT:
1100	self->cb_sk_object = newHV ();	1202	RETVAL
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		1203
1120	void encode (CBOR self, SV scalar)	1204	void encode (CBOR self, SV scalar)
1121	PPCODE:	1205	PPCODE:
1122	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1206	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1123	XPUSHs (scalar);	1207	XPUSHs (scalar);
…		…
1137	PUSHs (sv);	1221	PUSHs (sv);
1138	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1222	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1139	}	1223	}
1140		1224
1141	void DESTROY (CBOR *self)	1225	void DESTROY (CBOR *self)
1142	CODE:	1226	PPCODE:
1143	SvREFCNT_dec (self->cb_sk_object);	1227	cbor_free (self);
1144	SvREFCNT_dec (self->cb_object);
1145		1228
1146	PROTOTYPES: ENABLE	1229	PROTOTYPES: ENABLE
1147		1230
1148	void encode_cbor (SV *scalar)	1231	void encode_cbor (SV *scalar)
1149	PPCODE:	1232	PPCODE:

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs. Revision 1.31 by root, Thu Nov 28 11:43:26 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.31 by root, Thu Nov 28 11:43:26 2013 UTC