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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.21 by root, Wed Nov 20 14:59:06 2013 UTC vs.
Revision 1.36 by root, Sat Nov 30 17:37:45 2013 UTC

…		…
19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)	19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20	#endif	20	#endif
21	#ifndef HvNAMEUTF8	21	#ifndef HvNAMEUTF8
22	# define HvNAMEUTF8(hv) 0	22	# define HvNAMEUTF8(hv) 0
23	#endif	23	#endif
		24	#ifndef SvREFCNT_dec_NN
		25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
		26	#endif
		27
		28	// known major and minor types
		29	enum cbor_type
		30	{
		31	MAJOR_SHIFT = 5,
		32	MINOR_MASK = 0x1f,
		33
		34	MAJOR_POS_INT = 0 << MAJOR_SHIFT,
		35	MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
		36	MAJOR_BYTES = 2 << MAJOR_SHIFT,
		37	MAJOR_TEXT = 3 << MAJOR_SHIFT,
		38	MAJOR_ARRAY = 4 << MAJOR_SHIFT,
		39	MAJOR_MAP = 5 << MAJOR_SHIFT,
		40	MAJOR_TAG = 6 << MAJOR_SHIFT,
		41	MAJOR_MISC = 7 << MAJOR_SHIFT,
		42
		43	// INT/STRING/ARRAY/MAP subtypes
		44	LENGTH_EXT1 = 24,
		45	LENGTH_EXT2 = 25,
		46	LENGTH_EXT4 = 26,
		47	LENGTH_EXT8 = 27,
		48
		49	// SIMPLE types (effectively MISC subtypes)
		50	SIMPLE_FALSE = 20,
		51	SIMPLE_TRUE = 21,
		52	SIMPLE_NULL = 22,
		53	SIMPLE_UNDEF = 23,
		54
		55	// MISC subtype (unused)
		56	MISC_EXT1 = 24,
		57	MISC_FLOAT16 = 25,
		58	MISC_FLOAT32 = 26,
		59	MISC_FLOAT64 = 27,
		60
		61	// BYTES/TEXT/ARRAY/MAP
		62	MINOR_INDEF = 31,
		63	};
24		64
25	// known tags	65	// known tags
26	enum cbor_tag	66	enum cbor_tag
27	{	67	{
28	// inofficial extensions (pending iana registration)	68	// extensions
		69	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object	70	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object	71	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing	72	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing	73	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref	74	CBOR_TAG_STRINGREF_NAMESPACE = 256, // 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	75	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36		76
37	// rfc7049	77	// rfc7049
38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	78	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	79	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40	CBOR_TAG_POS_BIGNUM = 2, // byte string	80	CBOR_TAG_POS_BIGNUM = 2, // byte string
41	CBOR_TAG_NEG_BIGNUM = 3, // byte string	81	CBOR_TAG_NEG_BIGNUM = 3, // byte string
42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	82	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43	CBOR_TAG_BIGFLOAT = 5, // array	83	CBOR_TAG_BIGFLOAT = 5, // array
44		84
45	CBOR_TAG_CONV_B64U = 21, // base64url, any	85	CBOR_TAG_CONV_B64U = 21, // base64url, any
46	CBOR_TAG_CONV_B64 = 22, // base64, any	86	CBOR_TAG_CONV_B64 = 22, // base64, any
47	CBOR_TAG_CONV_HEX = 23, // base16, any	87	CBOR_TAG_CONV_HEX = 23, // base16, any
48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	88	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49		89
50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	90	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	91	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	92	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	93	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	94	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55		95
56	CBOR_TAG_MAGIC = 55799 // self-describe cbor	96	CBOR_TAG_MAGIC = 55799, // self-describe cbor
57	};	97	};
58		98
59	#define F_SHRINK 0x00000001UL	99	#define F_SHRINK 0x00000001UL
60	#define F_ALLOW_UNKNOWN 0x00000002UL	100	#define F_ALLOW_UNKNOWN 0x00000002UL
61	#define F_ALLOW_SHARING 0x00000004UL //TODO	101	#define F_ALLOW_SHARING 0x00000004UL
62	#define F_DEDUP_STRINGS 0x00000008UL //TODO	102	#define F_PACK_STRINGS 0x00000008UL
63		103
64	#define INIT_SIZE 32 // initial scalar size to be allocated	104	#define INIT_SIZE 32 // initial scalar size to be allocated
65		105
66	#define SB do {	106	#define SB do {
67	#define SE } while (0)	107	#define SE } while (0)
…		…
79	# define CBOR_SLOW 0	119	# define CBOR_SLOW 0
80	# define CBOR_STASH cbor_stash	120	# define CBOR_STASH cbor_stash
81	#endif	121	#endif
82		122
83	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	123	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
84	static SV types_true, types_false, types_error, sv_cbor;	124	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
85		125
86	typedef struct {	126	typedef struct {
87	U32 flags;	127	U32 flags;
88	U32 max_depth;	128	U32 max_depth;
89	STRLEN max_size;	129	STRLEN max_size;
		130	SV *filter;
90	} CBOR;	131	} CBOR;
91		132
92	ecb_inline void	133	ecb_inline void
93	cbor_init (CBOR *cbor)	134	cbor_init (CBOR *cbor)
94	{	135	{
95	Zero (cbor, 1, CBOR);	136	Zero (cbor, 1, CBOR);
96	cbor->max_depth = 512;	137	cbor->max_depth = 512;
		138	}
		139
		140	ecb_inline void
		141	cbor_free (CBOR *cbor)
		142	{
		143	SvREFCNT_dec (cbor->filter);
97	}	144	}
98		145
99	/////////////////////////////////////////////////////////////////////////////	146	/////////////////////////////////////////////////////////////////////////////
100	// utility functions	147	// utility functions
101		148
…		…
131	{	178	{
132	return idx > 23	179	return idx > 23
133	? idx > 0xffU	180	? idx > 0xffU
134	? idx > 0xffffU	181	? idx > 0xffffU
135	? idx > 0xffffffffU	182	? idx > 0xffffffffU
		183	? 11
136	? 7	184	: 7
137	: 6
138	: 5	185	: 5
139	: 4	186	: 4
140	: 3;	187	: 3;
141	}	188	}
142		189
…		…
179	static void	226	static void
180	encode_uint (enc_t *enc, int major, UV len)	227	encode_uint (enc_t *enc, int major, UV len)
181	{	228	{
182	need (enc, 9);	229	need (enc, 9);
183		230
184	if (len < 24)	231	if (ecb_expect_true (len < LENGTH_EXT1))
185	*enc->cur++ = major \| len;	232	*enc->cur++ = major \| len;
186	else if (len <= 0xff)	233	else if (ecb_expect_true (len <= 0xffU))
187	{	234	{
188	*enc->cur++ = major \| 24;	235	*enc->cur++ = major \| LENGTH_EXT1;
189	*enc->cur++ = len;	236	*enc->cur++ = len;
190	}	237	}
191	else if (len <= 0xffff)	238	else if (len <= 0xffffU)
192	{	239	{
193	*enc->cur++ = major \| 25;	240	*enc->cur++ = major \| LENGTH_EXT2;
194	*enc->cur++ = len >> 8;	241	*enc->cur++ = len >> 8;
195	*enc->cur++ = len;	242	*enc->cur++ = len;
196	}	243	}
197	else if (len <= 0xffffffff)	244	else if (len <= 0xffffffffU)
198	{	245	{
199	*enc->cur++ = major \| 26;	246	*enc->cur++ = major \| LENGTH_EXT4;
200	*enc->cur++ = len >> 24;	247	*enc->cur++ = len >> 24;
201	*enc->cur++ = len >> 16;	248	*enc->cur++ = len >> 16;
202	*enc->cur++ = len >> 8;	249	*enc->cur++ = len >> 8;
203	*enc->cur++ = len;	250	*enc->cur++ = len;
204	}	251	}
205	else	252	else
206	{	253	{
207	*enc->cur++ = major \| 27;	254	*enc->cur++ = major \| LENGTH_EXT8;
208	*enc->cur++ = len >> 56;	255	*enc->cur++ = len >> 56;
209	*enc->cur++ = len >> 48;	256	*enc->cur++ = len >> 48;
210	*enc->cur++ = len >> 40;	257	*enc->cur++ = len >> 40;
211	*enc->cur++ = len >> 32;	258	*enc->cur++ = len >> 32;
212	*enc->cur++ = len >> 24;	259	*enc->cur++ = len >> 24;
…		…
217	}	264	}
218		265
219	ecb_inline void	266	ecb_inline void
220	encode_tag (enc_t *enc, UV tag)	267	encode_tag (enc_t *enc, UV tag)
221	{	268	{
222	encode_uint (enc, 0xc0, tag);	269	encode_uint (enc, MAJOR_TAG, tag);
		270	}
		271
		272	ecb_inline void
		273	encode_str (enc_t enc, int utf8, char str, STRLEN len)
		274	{
		275	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
		276	need (enc, len);
		277	memcpy (enc->cur, str, len);
		278	enc->cur += len;
223	}	279	}
224		280
225	static void	281	static void
226	encode_str (enc_t enc, int utf8, char str, STRLEN len)	282	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
227	{	283	{
228	if (ecb_expect_false (enc->cbor.flags & F_DEDUP_STRINGS))	284	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
229	{	285	{
230	SV **svp = hv_fetch (enc->stringref[utf8], str, len, 1);	286	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231		287
232	if (SvOK (*svp))	288	if (SvOK (*svp))
233	{	289	{
234	// already registered, use stringref	290	// already registered, use stringref
235	encode_tag (enc, CBOR_TAG_STRINGREF);	291	encode_tag (enc, CBOR_TAG_STRINGREF);
236	encode_uint (enc, 0x00, SvUV (*svp));	292	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
237	return;	293	return;
238	}	294	}
239	else if (len >= minimum_string_length (enc->stringref_idx))	295	else if (len >= minimum_string_length (enc->stringref_idx))
240	{	296	{
241	// register only	297	// register only
242	sv_setuv (*svp, enc->stringref_idx);	298	sv_setuv (*svp, enc->stringref_idx);
243	++enc->stringref_idx;	299	++enc->stringref_idx;
244	}	300	}
245	}	301	}
246		302
247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	303	encode_str (enc, utf8, str, len);
248	need (enc, len);
249	memcpy (enc->cur, str, len);
250	enc->cur += len;
251	}	304	}
252		305
253	static void encode_sv (enc_t enc, SV sv);	306	static void encode_sv (enc_t enc, SV sv);
254		307
255	static void	308	static void
…		…
260	if (enc->depth >= enc->cbor.max_depth)	313	if (enc->depth >= enc->cbor.max_depth)
261	croak (ERR_NESTING_EXCEEDED);	314	croak (ERR_NESTING_EXCEEDED);
262		315
263	++enc->depth;	316	++enc->depth;
264		317
265	encode_uint (enc, 0x80, len + 1);	318	encode_uint (enc, MAJOR_ARRAY, len + 1);
266		319
267	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
268	{	321	{
269	SV **svp = av_fetch (av, i, 0);	322	SV **svp = av_fetch (av, i, 0);
270	encode_sv (enc, svp ? *svp : &PL_sv_undef);	323	encode_sv (enc, svp ? *svp : &PL_sv_undef);
271	}	324	}
272		325
273	--enc->depth;	326	--enc->depth;
274	}	327	}
275		328
276	ecb_inline void
277	encode_he (enc_t enc, HE he)
278	{
279	}
280
281	static void	329	static void
282	encode_hv (enc_t enc, HV hv)	330	encode_hv (enc_t enc, HV hv)
283	{	331	{
284	HE *he;	332	HE *he;
285		333
…		…
290		338
291	int pairs = hv_iterinit (hv);	339	int pairs = hv_iterinit (hv);
292	int mg = SvMAGICAL (hv);	340	int mg = SvMAGICAL (hv);
293		341
294	if (mg)	342	if (mg)
295	encode_ch (enc, 0xa0 \| 31);	343	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
296	else	344	else
297	encode_uint (enc, 0xa0, pairs);	345	encode_uint (enc, MAJOR_MAP, pairs);
298		346
299	while ((he = hv_iternext (hv)))	347	while ((he = hv_iternext (hv)))
300	{	348	{
301	if (HeKLEN (he) == HEf_SVKEY)	349	if (HeKLEN (he) == HEf_SVKEY)
302	encode_sv (enc, HeSVKEY (he));	350	encode_sv (enc, HeSVKEY (he));
303	else	351	else
304	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	352	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
305		353
306	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	354	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
307	}	355	}
308		356
309	if (mg)	357	if (mg)
310	encode_ch (enc, 0xe0 \| 31);	358	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
311		359
312	--enc->depth;	360	--enc->depth;
313	}	361	}
314		362
315	// encode objects, arrays and special \0=false and \1=true values.	363	// encode objects, arrays and special \0=false and \1=true values.
316	static void	364	static void
317	encode_rv (enc_t enc, SV sv)	365	encode_rv (enc_t enc, SV sv)
318	{	366	{
319	SvGETMAGIC (sv);	367	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		368
343	svtype svt = SvTYPE (sv);	369	svtype svt = SvTYPE (sv);
344		370
345	if (ecb_expect_false (SvOBJECT (sv)))	371	if (ecb_expect_false (SvOBJECT (sv)))
346	{	372	{
…		…
353	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	379	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
354	? cbor_tagged_stash	380	? cbor_tagged_stash
355	: gv_stashpv ("CBOR::XS::Tagged" , 1);	381	: gv_stashpv ("CBOR::XS::Tagged" , 1);
356		382
357	HV *stash = SvSTASH (sv);	383	HV *stash = SvSTASH (sv);
358	GV *method;
359		384
360	if (stash == boolean_stash)	385	if (stash == boolean_stash)
361	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	386	{
		387	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		388	return;
		389	}
362	else if (stash == error_stash)	390	else if (stash == error_stash)
363	encode_ch (enc, 0xe0 \| 23);	391	{
		392	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		393	return;
		394	}
364	else if (stash == tagged_stash)	395	else if (stash == tagged_stash)
365	{	396	{
366	if (svt != SVt_PVAV)	397	if (svt != SVt_PVAV)
367	croak ("encountered CBOR::XS::Tagged object that isn't an array");	398	croak ("encountered CBOR::XS::Tagged object that isn't an array");
368		399
369	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	400	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
370	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	401	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		402
		403	return;
		404	}
		405	}
		406
		407	if (ecb_expect_false (SvREFCNT (sv) > 1)
		408	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		409	{
		410	if (!enc->shareable)
		411	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		412
		413	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		414
		415	if (SvOK (*svp))
371	}	416	{
		417	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		418	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		419	return;
		420	}
		421	else
		422	{
		423	sv_setuv (*svp, enc->shareable_idx);
		424	++enc->shareable_idx;
		425	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		426	}
		427	}
		428
		429	if (ecb_expect_false (SvOBJECT (sv)))
		430	{
		431	HV *stash = SvSTASH (sv);
		432	GV *method;
		433
372	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	434	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
373	{	435	{
374	dSP;	436	dSP;
375		437
376	ENTER; SAVETMPS; PUSHMARK (SP);	438	ENTER; SAVETMPS; PUSHMARK (SP);
377	// we re-bless the reference to get overload and other niceties right	439	// we re-bless the reference to get overload and other niceties right
…		…
409	// catch this surprisingly common error	471	// catch this surprisingly common error
410	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	472	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));	473	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
412		474
413	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	475	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
414	encode_uint (enc, 0x80, count + 1);	476	encode_uint (enc, MAJOR_ARRAY, count + 1);
415	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	477	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
416		478
417	while (count)	479	while (count)
418	encode_sv (enc, SP[1 - count--]);	480	encode_sv (enc, SP[1 - count--]);
419		481
420	PUTBACK;	482	PUTBACK;
…		…
441	{	503	{
442	double nv = SvNVX (sv);	504	double nv = SvNVX (sv);
443		505
444	need (enc, 9);	506	need (enc, 9);
445		507
446	if (ecb_expect_false (nv == (U32)nv))	508	if (ecb_expect_false (nv == (NV)(U32)nv))
447	encode_uint (enc, 0x00, (U32)nv);	509	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
448	//TODO: maybe I32?	510	//TODO: maybe I32?
449	else if (ecb_expect_false (nv == (float)nv))	511	else if (ecb_expect_false (nv == (float)nv))
450	{	512	{
451	uint32_t fp = ecb_float_to_binary32 (nv);	513	uint32_t fp = ecb_float_to_binary32 (nv);
452		514
453	*enc->cur++ = 0xe0 \| 26;	515	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
454		516
455	if (!ecb_big_endian ())	517	if (!ecb_big_endian ())
456	fp = ecb_bswap32 (fp);	518	fp = ecb_bswap32 (fp);
457		519
458	memcpy (enc->cur, &fp, 4);	520	memcpy (enc->cur, &fp, 4);
…		…
460	}	522	}
461	else	523	else
462	{	524	{
463	uint64_t fp = ecb_double_to_binary64 (nv);	525	uint64_t fp = ecb_double_to_binary64 (nv);
464		526
465	*enc->cur++ = 0xe0 \| 27;	527	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
466		528
467	if (!ecb_big_endian ())	529	if (!ecb_big_endian ())
468	fp = ecb_bswap64 (fp);	530	fp = ecb_bswap64 (fp);
469		531
470	memcpy (enc->cur, &fp, 8);	532	memcpy (enc->cur, &fp, 8);
…		…
479		541
480	if (SvPOKp (sv))	542	if (SvPOKp (sv))
481	{	543	{
482	STRLEN len;	544	STRLEN len;
483	char *str = SvPV (sv, len);	545	char *str = SvPV (sv, len);
484	encode_str (enc, SvUTF8 (sv), str, len);	546	encode_strref (enc, SvUTF8 (sv), str, len);
485	}	547	}
486	else if (SvNOKp (sv))	548	else if (SvNOKp (sv))
487	encode_nv (enc, sv);	549	encode_nv (enc, sv);
488	else if (SvIOKp (sv))	550	else if (SvIOKp (sv))
489	{	551	{
490	if (SvIsUV (sv))	552	if (SvIsUV (sv))
491	encode_uint (enc, 0x00, SvUVX (sv));	553	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
492	else if (SvIVX (sv) >= 0)	554	else if (SvIVX (sv) >= 0)
493	encode_uint (enc, 0x00, SvIVX (sv));	555	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
494	else	556	else
495	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	557	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
496	}	558	}
497	else if (SvROK (sv))	559	else if (SvROK (sv))
498	encode_rv (enc, SvRV (sv));	560	encode_rv (enc, SvRV (sv));
499	else if (!SvOK (sv))	561	else if (!SvOK (sv))
500	encode_ch (enc, 0xe0 \| 22);	562	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
501	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	563	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
502	encode_ch (enc, 0xe0 \| 23);	564	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
503	else	565	else
504	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	566	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
505	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	567	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
506	}	568	}
507		569
…		…
515	enc.cur = SvPVX (enc.sv);	577	enc.cur = SvPVX (enc.sv);
516	enc.end = SvEND (enc.sv);	578	enc.end = SvEND (enc.sv);
517		579
518	SvPOK_only (enc.sv);	580	SvPOK_only (enc.sv);
519		581
520	if (cbor->flags & F_DEDUP_STRINGS)	582	if (cbor->flags & F_PACK_STRINGS)
521	{	583	{
522	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	584	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
523	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());	585	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
524	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());	586	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
525	}	587	}
…		…
547	CBOR cbor;	609	CBOR cbor;
548	U32 depth; // recursion depth	610	U32 depth; // recursion depth
549	U32 maxdepth; // recursion depth limit	611	U32 maxdepth; // recursion depth limit
550	AV *shareable;	612	AV *shareable;
551	AV *stringref;	613	AV *stringref;
		614	SV *decode_tagged;
552	} dec_t;	615	} dec_t;
553		616
554	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	617	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
555		618
556	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	619	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
559	#define DEC_DEC_DEPTH --dec->depth	622	#define DEC_DEC_DEPTH --dec->depth
560		623
561	static UV	624	static UV
562	decode_uint (dec_t *dec)	625	decode_uint (dec_t *dec)
563	{	626	{
564	switch (*dec->cur & 31)	627	U8 m = *dec->cur & MINOR_MASK;
565	{	628	++dec->cur;
566	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
567	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
568	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
569	return *dec->cur++ & 31;
570		629
571	case 24:	630	if (ecb_expect_true (m < LENGTH_EXT1))
		631	return m;
		632	else if (ecb_expect_true (m == LENGTH_EXT1))
		633	{
572	WANT (2);	634	WANT (1);
573	dec->cur += 2;	635	dec->cur += 1;
574	return dec->cur[-1];	636	return dec->cur[-1];
575		637	}
576	case 25:	638	else if (ecb_expect_true (m == LENGTH_EXT2))
		639	{
577	WANT (3);	640	WANT (2);
578	dec->cur += 3;	641	dec->cur += 2;
579	return (((UV)dec->cur[-2]) << 8)	642	return (((UV)dec->cur[-2]) << 8)
580	\| ((UV)dec->cur[-1]);	643	\| ((UV)dec->cur[-1]);
581		644	}
582	case 26:	645	else if (ecb_expect_true (m == LENGTH_EXT4))
		646	{
583	WANT (5);	647	WANT (4);
584	dec->cur += 5;	648	dec->cur += 4;
585	return (((UV)dec->cur[-4]) << 24)	649	return (((UV)dec->cur[-4]) << 24)
586	\| (((UV)dec->cur[-3]) << 16)	650	\| (((UV)dec->cur[-3]) << 16)
587	\| (((UV)dec->cur[-2]) << 8)	651	\| (((UV)dec->cur[-2]) << 8)
588	\| ((UV)dec->cur[-1]);	652	\| ((UV)dec->cur[-1]);
589		653	}
590	case 27:	654	else if (ecb_expect_true (m == LENGTH_EXT8))
		655	{
591	WANT (9);	656	WANT (8);
592	dec->cur += 9;	657	dec->cur += 8;
		658
		659	return
		660	#if UVSIZE < 8
		661	0
		662	#else
593	return (((UV)dec->cur[-8]) << 56)	663	(((UV)dec->cur[-8]) << 56)
594	\| (((UV)dec->cur[-7]) << 48)	664	\| (((UV)dec->cur[-7]) << 48)
595	\| (((UV)dec->cur[-6]) << 40)	665	\| (((UV)dec->cur[-6]) << 40)
596	\| (((UV)dec->cur[-5]) << 32)	666	\| (((UV)dec->cur[-5]) << 32)
		667	#endif
597	\| (((UV)dec->cur[-4]) << 24)	668	\| (((UV)dec->cur[-4]) << 24)
598	\| (((UV)dec->cur[-3]) << 16)	669	\| (((UV)dec->cur[-3]) << 16)
599	\| (((UV)dec->cur[-2]) << 8)	670	\| (((UV)dec->cur[-2]) << 8)
600	\| ((UV)dec->cur[-1]);	671	\| ((UV)dec->cur[-1]);
601		672	}
602	default:	673	else
603	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	674	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
604	}
605		675
606	fail:	676	fail:
607	return 0;	677	return 0;
608	}	678	}
609		679
…		…
614	{	684	{
615	AV *av = newAV ();	685	AV *av = newAV ();
616		686
617	DEC_INC_DEPTH;	687	DEC_INC_DEPTH;
618		688
619	if ((*dec->cur & 31) == 31)	689	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
620	{	690	{
621	++dec->cur;	691	++dec->cur;
622		692
623	for (;;)	693	for (;;)
624	{	694	{
625	WANT (1);	695	WANT (1);
626		696
627	if (*dec->cur == (0xe0 \| 31))	697	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
628	{	698	{
629	++dec->cur;	699	++dec->cur;
630	break;	700	break;
631	}	701	}
632		702
…		…
635	}	705	}
636	else	706	else
637	{	707	{
638	int i, len = decode_uint (dec);	708	int i, len = decode_uint (dec);
639		709
		710	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
640	av_fill (av, len - 1);	711	av_fill (av, len - 1);
641		712
642	for (i = 0; i < len; ++i)	713	for (i = 0; i < len; ++i)
643	AvARRAY (av)[i] = decode_sv (dec);	714	AvARRAY (av)[i] = decode_sv (dec);
644	}	715	}
…		…
656	decode_he (dec_t dec, HV hv)	727	decode_he (dec_t dec, HV hv)
657	{	728	{
658	// for speed reasons, we specialcase single-string	729	// for speed reasons, we specialcase single-string
659	// byte or utf-8 strings as keys, but only when !stringref	730	// byte or utf-8 strings as keys, but only when !stringref
660		731
661	if (expect_true (!dec->stringref))	732	if (ecb_expect_true (!dec->stringref))
662	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	733	if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
663	{	734	{
664	I32 len = decode_uint (dec);	735	I32 len = decode_uint (dec);
665	char key = (char )dec->cur;	736	char key = (char )dec->cur;
666		737
667	dec->cur += len;	738	dec->cur += len;
…		…
671		742
672	hv_store (hv, key, len, decode_sv (dec), 0);	743	hv_store (hv, key, len, decode_sv (dec), 0);
673		744
674	return;	745	return;
675	}	746	}
676	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	747	else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
677	{	748	{
678	I32 len = decode_uint (dec);	749	I32 len = decode_uint (dec);
679	char key = (char )dec->cur;	750	char key = (char )dec->cur;
680		751
681	dec->cur += len;	752	dec->cur += len;
…		…
700	{	771	{
701	HV *hv = newHV ();	772	HV *hv = newHV ();
702		773
703	DEC_INC_DEPTH;	774	DEC_INC_DEPTH;
704		775
705	if ((*dec->cur & 31) == 31)	776	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
706	{	777	{
707	++dec->cur;	778	++dec->cur;
708		779
709	for (;;)	780	for (;;)
710	{	781	{
711	WANT (1);	782	WANT (1);
712		783
713	if (*dec->cur == (0xe0 \| 31))	784	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
714	{	785	{
715	++dec->cur;	786	++dec->cur;
716	break;	787	break;
717	}	788	}
718		789
…		…
739	static SV *	810	static SV *
740	decode_str (dec_t *dec, int utf8)	811	decode_str (dec_t *dec, int utf8)
741	{	812	{
742	SV *sv = 0;	813	SV *sv = 0;
743		814
744	if ((*dec->cur & 31) == 31)	815	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
745	{	816	{
		817	// indefinite length strings
746	++dec->cur;	818	++dec->cur;
747		819
		820	U8 major = *dec->cur & MAJOR_MISC;
		821
748	sv = newSVpvn ("", 0);	822	sv = newSVpvn ("", 0);
749		823
750	// not very fast, and certainly not robust against illegal input
751	for (;;)	824	for (;;)
752	{	825	{
753	WANT (1);	826	WANT (1);
754		827
755	if (*dec->cur == (0xe0 \| 31))	828	if ((*dec->cur - major) > LENGTH_EXT8)
		829	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
756	{	830	{
757	++dec->cur;	831	++dec->cur;
758	break;	832	break;
759	}	833	}
		834	else
		835	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
760		836
761	sv_catsv (sv, decode_sv (dec));	837	STRLEN len = decode_uint (dec);
		838
		839	WANT (len);
		840	sv_catpvn (sv, dec->cur, len);
		841	dec->cur += len;
762	}	842	}
763	}	843	}
764	else	844	else
765	{	845	{
766	STRLEN len = decode_uint (dec);	846	STRLEN len = decode_uint (dec);
767		847
768	WANT (len);	848	WANT (len);
769	sv = newSVpvn (dec->cur, len);	849	sv = newSVpvn (dec->cur, len);
770	dec->cur += len;	850	dec->cur += len;
		851
		852	if (ecb_expect_false (dec->stringref)
		853	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		854	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
771	}	855	}
772		856
773	if (utf8)	857	if (utf8)
774	SvUTF8_on (sv);	858	SvUTF8_on (sv);
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		859
780	return sv;	860	return sv;
781		861
782	fail:	862	fail:
783	SvREFCNT_dec (sv);	863	SvREFCNT_dec (sv);
…		…
815	}	895	}
816	break;	896	break;
817		897
818	case CBOR_TAG_STRINGREF:	898	case CBOR_TAG_STRINGREF:
819	{	899	{
820	if ((*dec->cur >> 5) != 0)	900	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
821	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	901	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
822		902
823	UV idx = decode_uint (dec);	903	UV idx = decode_uint (dec);
824		904
825	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))	905	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
…		…
843	}	923	}
844	break;	924	break;
845		925
846	case CBOR_TAG_VALUE_SHAREDREF:	926	case CBOR_TAG_VALUE_SHAREDREF:
847	{	927	{
848	if ((*dec->cur >> 5) != 0)	928	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
849	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	929	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
850		930
851	UV idx = decode_uint (dec);	931	UV idx = decode_uint (dec);
852		932
853	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))	933	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
…		…
910		990
911	default:	991	default:
912	{	992	{
913	sv = decode_sv (dec);	993	sv = decode_sv (dec);
914		994
		995	dSP;
		996	ENTER; SAVETMPS; PUSHMARK (SP);
		997	EXTEND (SP, 2);
		998	PUSHs (newSVuv (tag));
		999	PUSHs (sv);
		1000
		1001	PUTBACK;
		1002	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1003	SPAGAIN;
		1004
		1005	if (SvTRUE (ERRSV))
		1006	{
		1007	FREETMPS; LEAVE;
		1008	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1009	}
		1010
		1011	if (count)
		1012	{
		1013	SvREFCNT_dec (sv);
		1014	sv = SvREFCNT_inc (POPs);
		1015	}
		1016	else
		1017	{
915	AV *av = newAV ();	1018	AV *av = newAV ();
916	av_push (av, newSVuv (tag));	1019	av_push (av, newSVuv (tag));
917	av_push (av, sv);	1020	av_push (av, sv);
918		1021
919	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1022	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
920	? cbor_tagged_stash	1023	? cbor_tagged_stash
921	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1024	: gv_stashpv ("CBOR::XS::Tagged" , 1);
922
923	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1025	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1026	}
		1027
		1028	PUTBACK;
		1029
		1030	FREETMPS; LEAVE;
924	}	1031	}
925	break;	1032	break;
926	}	1033	}
927		1034
928	return sv;	1035	return sv;
…		…
935	static SV *	1042	static SV *
936	decode_sv (dec_t *dec)	1043	decode_sv (dec_t *dec)
937	{	1044	{
938	WANT (1);	1045	WANT (1);
939		1046
940	switch (*dec->cur >> 5)	1047	switch (*dec->cur >> MAJOR_SHIFT)
941	{	1048	{
942	case 0: // unsigned int	1049	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
943	return newSVuv (decode_uint (dec));	1050	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
944	case 1: // negative int	1051	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
945	return newSViv (-1 - (IV)decode_uint (dec));	1052	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
946	case 2: // octet string	1053	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
947	return decode_str (dec, 0);	1054	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
948	case 3: // utf-8 string	1055	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
949	return decode_str (dec, 1);	1056
950	case 4: // array	1057	case MAJOR_MISC >> MAJOR_SHIFT:
951	return decode_av (dec);
952	case 5: // map
953	return decode_hv (dec);
954	case 6: // tag
955	return decode_tagged (dec);
956	case 7: // misc
957	switch (*dec->cur++ & 31)	1058	switch (*dec->cur++ & MINOR_MASK)
958	{	1059	{
959	case 20:	1060	case SIMPLE_FALSE:
960	#if CBOR_SLOW	1061	#if CBOR_SLOW
961	types_false = get_bool ("Types::Serialiser::false");	1062	types_false = get_bool ("Types::Serialiser::false");
962	#endif	1063	#endif
963	return newSVsv (types_false);	1064	return newSVsv (types_false);
964	case 21:	1065	case SIMPLE_TRUE:
965	#if CBOR_SLOW	1066	#if CBOR_SLOW
966	types_true = get_bool ("Types::Serialiser::true");	1067	types_true = get_bool ("Types::Serialiser::true");
967	#endif	1068	#endif
968	return newSVsv (types_true);	1069	return newSVsv (types_true);
969	case 22:	1070	case SIMPLE_NULL:
970	return newSVsv (&PL_sv_undef);	1071	return newSVsv (&PL_sv_undef);
971	case 23:	1072	case SIMPLE_UNDEF:
972	#if CBOR_SLOW	1073	#if CBOR_SLOW
973	types_error = get_bool ("Types::Serialiser::error");	1074	types_error = get_bool ("Types::Serialiser::error");
974	#endif	1075	#endif
975	return newSVsv (types_error);	1076	return newSVsv (types_error);
976		1077
977	case 25:	1078	case MISC_FLOAT16:
978	{	1079	{
979	WANT (2);	1080	WANT (2);
980		1081
981	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1082	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
982	dec->cur += 2;	1083	dec->cur += 2;
983		1084
984	return newSVnv (ecb_binary16_to_float (fp));	1085	return newSVnv (ecb_binary16_to_float (fp));
985	}	1086	}
986		1087
987	case 26:	1088	case MISC_FLOAT32:
988	{	1089	{
989	uint32_t fp;	1090	uint32_t fp;
990	WANT (4);	1091	WANT (4);
991	memcpy (&fp, dec->cur, 4);	1092	memcpy (&fp, dec->cur, 4);
992	dec->cur += 4;	1093	dec->cur += 4;
…		…
995	fp = ecb_bswap32 (fp);	1096	fp = ecb_bswap32 (fp);
996		1097
997	return newSVnv (ecb_binary32_to_float (fp));	1098	return newSVnv (ecb_binary32_to_float (fp));
998	}	1099	}
999		1100
1000	case 27:	1101	case MISC_FLOAT64:
1001	{	1102	{
1002	uint64_t fp;	1103	uint64_t fp;
1003	WANT (8);	1104	WANT (8);
1004	memcpy (&fp, dec->cur, 8);	1105	memcpy (&fp, dec->cur, 8);
1005	dec->cur += 8;	1106	dec->cur += 8;
…		…
1008	fp = ecb_bswap64 (fp);	1109	fp = ecb_bswap64 (fp);
1009		1110
1010	return newSVnv (ecb_binary64_to_double (fp));	1111	return newSVnv (ecb_binary64_to_double (fp));
1011	}	1112	}
1012		1113
1013	// 0..19 unassigned	1114	// 0..19 unassigned simple
1014	// 24 reserved + unassigned (reserved values are not encodable)	1115	// 24 reserved + unassigned (reserved values are not encodable)
1015	default:	1116	default:
1016	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1117	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
1017	}	1118	}
1018		1119
…		…
1073	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1174	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1074		1175
1075	types_true = get_bool ("Types::Serialiser::true" );	1176	types_true = get_bool ("Types::Serialiser::true" );
1076	types_false = get_bool ("Types::Serialiser::false");	1177	types_false = get_bool ("Types::Serialiser::false");
1077	types_error = get_bool ("Types::Serialiser::error");	1178	types_error = get_bool ("Types::Serialiser::error");
		1179
		1180	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1078		1181
1079	sv_cbor = newSVpv ("CBOR", 0);	1182	sv_cbor = newSVpv ("CBOR", 0);
1080	SvREADONLY_on (sv_cbor);	1183	SvREADONLY_on (sv_cbor);
1081	}	1184	}
1082		1185
…		…
1104	void shrink (CBOR *self, int enable = 1)	1207	void shrink (CBOR *self, int enable = 1)
1105	ALIAS:	1208	ALIAS:
1106	shrink = F_SHRINK	1209	shrink = F_SHRINK
1107	allow_unknown = F_ALLOW_UNKNOWN	1210	allow_unknown = F_ALLOW_UNKNOWN
1108	allow_sharing = F_ALLOW_SHARING	1211	allow_sharing = F_ALLOW_SHARING
1109	dedup_strings = F_DEDUP_STRINGS	1212	pack_strings = F_PACK_STRINGS
1110	PPCODE:	1213	PPCODE:
1111	{	1214	{
1112	if (enable)	1215	if (enable)
1113	self->flags \|= ix;	1216	self->flags \|= ix;
1114	else	1217	else
…		…
1120	void get_shrink (CBOR *self)	1223	void get_shrink (CBOR *self)
1121	ALIAS:	1224	ALIAS:
1122	get_shrink = F_SHRINK	1225	get_shrink = F_SHRINK
1123	get_allow_unknown = F_ALLOW_UNKNOWN	1226	get_allow_unknown = F_ALLOW_UNKNOWN
1124	get_allow_sharing = F_ALLOW_SHARING	1227	get_allow_sharing = F_ALLOW_SHARING
1125	get_dedup_strings = F_DEDUP_STRINGS	1228	get_pack_strings = F_PACK_STRINGS
1126	PPCODE:	1229	PPCODE:
1127	XPUSHs (boolSV (self->flags & ix));	1230	XPUSHs (boolSV (self->flags & ix));
1128		1231
1129	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1232	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1130	PPCODE:	1233	PPCODE:
…		…
1143	XPUSHs (ST (0));	1246	XPUSHs (ST (0));
1144		1247
1145	int get_max_size (CBOR *self)	1248	int get_max_size (CBOR *self)
1146	CODE:	1249	CODE:
1147	RETVAL = self->max_size;	1250	RETVAL = self->max_size;
		1251	OUTPUT:
		1252	RETVAL
		1253
		1254	void filter (CBOR self, SV filter = 0)
		1255	PPCODE:
		1256	SvREFCNT_dec (self->filter);
		1257	self->filter = filter ? newSVsv (filter) : filter;
		1258	XPUSHs (ST (0));
		1259
		1260	SV get_filter (CBOR self)
		1261	CODE:
		1262	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1148	OUTPUT:	1263	OUTPUT:
1149	RETVAL	1264	RETVAL
1150		1265
1151	void encode (CBOR self, SV scalar)	1266	void encode (CBOR self, SV scalar)
1152	PPCODE:	1267	PPCODE:
…		…
1167	EXTEND (SP, 2);	1282	EXTEND (SP, 2);
1168	PUSHs (sv);	1283	PUSHs (sv);
1169	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1284	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1170	}	1285	}
1171		1286
		1287	void DESTROY (CBOR *self)
		1288	PPCODE:
		1289	cbor_free (self);
		1290
1172	PROTOTYPES: ENABLE	1291	PROTOTYPES: ENABLE
1173		1292
1174	void encode_cbor (SV *scalar)	1293	void encode_cbor (SV *scalar)
		1294	ALIAS:
		1295	encode_cbor = 0
		1296	encode_cbor_sharing = F_ALLOW_SHARING
1175	PPCODE:	1297	PPCODE:
1176	{	1298	{
1177	CBOR cbor;	1299	CBOR cbor;
1178	cbor_init (&cbor);	1300	cbor_init (&cbor);
		1301	cbor.flags \|= ix;
1179	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1302	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1180	XPUSHs (scalar);	1303	XPUSHs (scalar);
1181	}	1304	}
1182		1305
1183	void decode_cbor (SV *cborstr)	1306	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.21 by root, Wed Nov 20 14:59:06 2013 UTC vs. Revision 1.36 by root, Sat Nov 30 17:37:45 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.21 by root, Wed Nov 20 14:59:06 2013 UTC vs.
Revision 1.36 by root, Sat Nov 30 17:37:45 2013 UTC