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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.32 by root, Thu Nov 28 12:08:07 2013 UTC vs.
Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC

…		…
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
		12	#define ECB_NO_THREADS 1
12	#include "ecb.h"	13	#include "ecb.h"
13		14
14	// compatibility with perl <5.18	15	// compatibility with perl <5.18
15	#ifndef HvNAMELEN_get	16	#ifndef HvNAMELEN_get
16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))	17	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
…		…
23	#endif	24	#endif
24	#ifndef SvREFCNT_dec_NN	25	#ifndef SvREFCNT_dec_NN
25	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)	26	# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26	#endif	27	#endif
27		28
		29	// known major and minor types
		30	enum cbor_type
		31	{
		32	MAJOR_SHIFT = 5,
		33	MINOR_MASK = 0x1f,
		34
		35	MAJOR_POS_INT = 0 << MAJOR_SHIFT,
		36	MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
		37	MAJOR_BYTES = 2 << MAJOR_SHIFT,
		38	MAJOR_TEXT = 3 << MAJOR_SHIFT,
		39	MAJOR_ARRAY = 4 << MAJOR_SHIFT,
		40	MAJOR_MAP = 5 << MAJOR_SHIFT,
		41	MAJOR_TAG = 6 << MAJOR_SHIFT,
		42	MAJOR_MISC = 7 << MAJOR_SHIFT,
		43
		44	// INT/STRING/ARRAY/MAP subtypes
		45	LENGTH_EXT1 = 24,
		46	LENGTH_EXT2 = 25,
		47	LENGTH_EXT4 = 26,
		48	LENGTH_EXT8 = 27,
		49
		50	// SIMPLE types (effectively MISC subtypes)
		51	SIMPLE_FALSE = 20,
		52	SIMPLE_TRUE = 21,
		53	SIMPLE_NULL = 22,
		54	SIMPLE_UNDEF = 23,
		55
		56	// MISC subtype (unused)
		57	MISC_EXT1 = 24,
		58	MISC_FLOAT16 = 25,
		59	MISC_FLOAT32 = 26,
		60	MISC_FLOAT64 = 27,
		61
		62	// BYTES/TEXT/ARRAY/MAP
		63	MINOR_INDEF = 31,
		64	};
		65
28	// known tags	66	// known tags
29	enum cbor_tag	67	enum cbor_tag
30	{	68	{
31	// extensions	69	// extensions
32	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref	70	CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
33	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object	71	CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
34	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object	72	CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
35	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing	73	CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
36	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing	74	CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
37	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref	75	CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
38	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection	76	CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
39		77
40	// rfc7049	78	// rfc7049
41	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	79	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
42	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	80	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
43	CBOR_TAG_POS_BIGNUM = 2, // byte string	81	CBOR_TAG_POS_BIGNUM = 2, // byte string
44	CBOR_TAG_NEG_BIGNUM = 3, // byte string	82	CBOR_TAG_NEG_BIGNUM = 3, // byte string
45	CBOR_TAG_DECIMAL = 4, // decimal fraction, array	83	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
46	CBOR_TAG_BIGFLOAT = 5, // array	84	CBOR_TAG_BIGFLOAT = 5, // array
47		85
48	CBOR_TAG_CONV_B64U = 21, // base64url, any	86	CBOR_TAG_CONV_B64U = 21, // base64url, any
49	CBOR_TAG_CONV_B64 = 22, // base64, any	87	CBOR_TAG_CONV_B64 = 22, // base64, any
50	CBOR_TAG_CONV_HEX = 23, // base16, any	88	CBOR_TAG_CONV_HEX = 23, // base16, any
51	CBOR_TAG_CBOR = 24, // embedded cbor, byte string	89	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
52		90
53	CBOR_TAG_URI = 32, // URI rfc3986, utf-8	91	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
54	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8	92	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
55	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8	93	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
56	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8	94	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
57	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	95	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
58		96
59	CBOR_TAG_MAGIC = 55799 // self-describe cbor	97	CBOR_TAG_MAGIC = 55799, // self-describe cbor
60	};	98	};
61		99
62	#define F_SHRINK 0x00000001UL	100	#define F_SHRINK 0x00000001UL
63	#define F_ALLOW_UNKNOWN 0x00000002UL	101	#define F_ALLOW_UNKNOWN 0x00000002UL
64	#define F_ALLOW_SHARING 0x00000004UL	102	#define F_ALLOW_SHARING 0x00000004UL
		103	#define F_ALLOW_CYCLES 0x00000008UL
65	#define F_PACK_STRINGS 0x00000008UL	104	#define F_PACK_STRINGS 0x00000010UL
		105	#define F_VALIDATE_UTF8 0x00000020UL
66		106
67	#define INIT_SIZE 32 // initial scalar size to be allocated	107	#define INIT_SIZE 32 // initial scalar size to be allocated
68		108
69	#define SB do {	109	#define SB do {
70	#define SE } while (0)	110	#define SE } while (0)
…		…
89	typedef struct {	129	typedef struct {
90	U32 flags;	130	U32 flags;
91	U32 max_depth;	131	U32 max_depth;
92	STRLEN max_size;	132	STRLEN max_size;
93	SV *filter;	133	SV *filter;
		134
		135	// for the incremental parser
		136	STRLEN incr_pos; // the current offset into the text
		137	STRLEN incr_need; // minimum bytes needed to decode
		138	AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
94	} CBOR;	139	} CBOR;
95		140
96	ecb_inline void	141	ecb_inline void
97	cbor_init (CBOR *cbor)	142	cbor_init (CBOR *cbor)
98	{	143	{
…		…
102		147
103	ecb_inline void	148	ecb_inline void
104	cbor_free (CBOR *cbor)	149	cbor_free (CBOR *cbor)
105	{	150	{
106	SvREFCNT_dec (cbor->filter);	151	SvREFCNT_dec (cbor->filter);
		152	SvREFCNT_dec (cbor->incr_count);
107	}	153	}
108		154
109	/////////////////////////////////////////////////////////////////////////////	155	/////////////////////////////////////////////////////////////////////////////
110	// utility functions	156	// utility functions
111		157
…		…
189	static void	235	static void
190	encode_uint (enc_t *enc, int major, UV len)	236	encode_uint (enc_t *enc, int major, UV len)
191	{	237	{
192	need (enc, 9);	238	need (enc, 9);
193		239
194	if (ecb_expect_true (len < 24))	240	if (ecb_expect_true (len < LENGTH_EXT1))
195	*enc->cur++ = major \| len;	241	*enc->cur++ = major \| len;
196	else if (ecb_expect_true (len <= 0xff))	242	else if (ecb_expect_true (len <= 0xffU))
197	{	243	{
198	*enc->cur++ = major \| 24;	244	*enc->cur++ = major \| LENGTH_EXT1;
199	*enc->cur++ = len;	245	*enc->cur++ = len;
200	}	246	}
201	else if (len <= 0xffff)	247	else if (len <= 0xffffU)
202	{	248	{
203	*enc->cur++ = major \| 25;	249	*enc->cur++ = major \| LENGTH_EXT2;
204	*enc->cur++ = len >> 8;	250	*enc->cur++ = len >> 8;
205	*enc->cur++ = len;	251	*enc->cur++ = len;
206	}	252	}
207	else if (len <= 0xffffffff)	253	else if (len <= 0xffffffffU)
208	{	254	{
209	*enc->cur++ = major \| 26;	255	*enc->cur++ = major \| LENGTH_EXT4;
210	*enc->cur++ = len >> 24;	256	*enc->cur++ = len >> 24;
211	*enc->cur++ = len >> 16;	257	*enc->cur++ = len >> 16;
212	*enc->cur++ = len >> 8;	258	*enc->cur++ = len >> 8;
213	*enc->cur++ = len;	259	*enc->cur++ = len;
214	}	260	}
215	else	261	else
216	{	262	{
217	*enc->cur++ = major \| 27;	263	*enc->cur++ = major \| LENGTH_EXT8;
218	*enc->cur++ = len >> 56;	264	*enc->cur++ = len >> 56;
219	*enc->cur++ = len >> 48;	265	*enc->cur++ = len >> 48;
220	*enc->cur++ = len >> 40;	266	*enc->cur++ = len >> 40;
221	*enc->cur++ = len >> 32;	267	*enc->cur++ = len >> 32;
222	*enc->cur++ = len >> 24;	268	*enc->cur++ = len >> 24;
…		…
227	}	273	}
228		274
229	ecb_inline void	275	ecb_inline void
230	encode_tag (enc_t *enc, UV tag)	276	encode_tag (enc_t *enc, UV tag)
231	{	277	{
232	encode_uint (enc, 0xc0, tag);	278	encode_uint (enc, MAJOR_TAG, tag);
233	}	279	}
234		280
235	ecb_inline void	281	ecb_inline void
236	encode_str (enc_t enc, int utf8, char str, STRLEN len)	282	encode_str (enc_t enc, int utf8, char str, STRLEN len)
237	{	283	{
238	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	284	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
239	need (enc, len);	285	need (enc, len);
240	memcpy (enc->cur, str, len);	286	memcpy (enc->cur, str, len);
241	enc->cur += len;	287	enc->cur += len;
242	}	288	}
243		289
…		…
250		296
251	if (SvOK (*svp))	297	if (SvOK (*svp))
252	{	298	{
253	// already registered, use stringref	299	// already registered, use stringref
254	encode_tag (enc, CBOR_TAG_STRINGREF);	300	encode_tag (enc, CBOR_TAG_STRINGREF);
255	encode_uint (enc, 0x00, SvUV (*svp));	301	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
256	return;	302	return;
257	}	303	}
258	else if (len >= minimum_string_length (enc->stringref_idx))	304	else if (len >= minimum_string_length (enc->stringref_idx))
259	{	305	{
260	// register only	306	// register only
…		…
276	if (enc->depth >= enc->cbor.max_depth)	322	if (enc->depth >= enc->cbor.max_depth)
277	croak (ERR_NESTING_EXCEEDED);	323	croak (ERR_NESTING_EXCEEDED);
278		324
279	++enc->depth;	325	++enc->depth;
280		326
281	encode_uint (enc, 0x80, len + 1);	327	encode_uint (enc, MAJOR_ARRAY, len + 1);
282		328
		329	if (SvMAGICAL (av))
283	for (i = 0; i <= len; ++i)	330	for (i = 0; i <= len; ++i)
284	{	331	{
285	SV **svp = av_fetch (av, i, 0);	332	SV **svp = av_fetch (av, i, 0);
286	encode_sv (enc, svp ? *svp : &PL_sv_undef);	333	encode_sv (enc, svp ? *svp : &PL_sv_undef);
287	}	334	}
		335	else
		336	for (i = 0; i <= len; ++i)
		337	encode_sv (enc, AvARRAY (av)[i]);
288		338
289	--enc->depth;	339	--enc->depth;
290	}	340	}
291		341
292	static void	342	static void
…		…
301		351
302	int pairs = hv_iterinit (hv);	352	int pairs = hv_iterinit (hv);
303	int mg = SvMAGICAL (hv);	353	int mg = SvMAGICAL (hv);
304		354
305	if (mg)	355	if (mg)
306	encode_ch (enc, 0xa0 \| 31);	356	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
307	else	357	else
308	encode_uint (enc, 0xa0, pairs);	358	encode_uint (enc, MAJOR_MAP, pairs);
309		359
310	while ((he = hv_iternext (hv)))	360	while ((he = hv_iternext (hv)))
311	{	361	{
312	if (HeKLEN (he) == HEf_SVKEY)	362	if (HeKLEN (he) == HEf_SVKEY)
313	encode_sv (enc, HeSVKEY (he));	363	encode_sv (enc, HeSVKEY (he));
…		…
316		366
317	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	367	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
318	}	368	}
319		369
320	if (mg)	370	if (mg)
321	encode_ch (enc, 0xe0 \| 31);	371	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
322		372
323	--enc->depth;	373	--enc->depth;
324	}	374	}
325		375
326	// encode objects, arrays and special \0=false and \1=true values.	376	// encode objects, arrays and special \0=false and \1=true values.
327	static void	377	static void
328	encode_rv (enc_t enc, SV sv)	378	encode_rv (enc_t enc, SV sv)
329	{	379	{
330	SvGETMAGIC (sv);	380	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		381
354	svtype svt = SvTYPE (sv);	382	svtype svt = SvTYPE (sv);
355		383
356	if (ecb_expect_false (SvOBJECT (sv)))	384	if (ecb_expect_false (SvOBJECT (sv)))
357	{	385	{
…		…
364	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	392	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
365	? cbor_tagged_stash	393	? cbor_tagged_stash
366	: gv_stashpv ("CBOR::XS::Tagged" , 1);	394	: gv_stashpv ("CBOR::XS::Tagged" , 1);
367		395
368	HV *stash = SvSTASH (sv);	396	HV *stash = SvSTASH (sv);
369	GV *method;
370		397
371	if (stash == boolean_stash)	398	if (stash == boolean_stash)
372	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	399	{
		400	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		401	return;
		402	}
373	else if (stash == error_stash)	403	else if (stash == error_stash)
374	encode_ch (enc, 0xe0 \| 23);	404	{
		405	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		406	return;
		407	}
375	else if (stash == tagged_stash)	408	else if (stash == tagged_stash)
376	{	409	{
377	if (svt != SVt_PVAV)	410	if (svt != SVt_PVAV)
378	croak ("encountered CBOR::XS::Tagged object that isn't an array");	411	croak ("encountered CBOR::XS::Tagged object that isn't an array");
379		412
380	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	413	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
381	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	414	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		415
		416	return;
		417	}
		418	}
		419
		420	if (ecb_expect_false (SvREFCNT (sv) > 1)
		421	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		422	{
		423	if (!enc->shareable)
		424	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		425
		426	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		427
		428	if (SvOK (*svp))
382	}	429	{
		430	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		431	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		432	return;
		433	}
		434	else
		435	{
		436	sv_setuv (*svp, enc->shareable_idx);
		437	++enc->shareable_idx;
		438	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		439	}
		440	}
		441
		442	if (ecb_expect_false (SvOBJECT (sv)))
		443	{
		444	HV *stash = SvSTASH (sv);
		445	GV *method;
		446
383	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	447	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
384	{	448	{
385	dSP;	449	dSP;
386		450
387	ENTER; SAVETMPS; PUSHMARK (SP);	451	ENTER; SAVETMPS; PUSHMARK (SP);
388	// we re-bless the reference to get overload and other niceties right	452	// we re-bless the reference to get overload and other niceties right
…		…
420	// catch this surprisingly common error	484	// catch this surprisingly common error
421	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	485	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));	486	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
423		487
424	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	488	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
425	encode_uint (enc, 0x80, count + 1);	489	encode_uint (enc, MAJOR_ARRAY, count + 1);
426	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	490	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
427		491
428	while (count)	492	while (count)
429	encode_sv (enc, SP[1 - count--]);	493	encode_sv (enc, SP[1 - count--]);
430		494
…		…
452	{	516	{
453	double nv = SvNVX (sv);	517	double nv = SvNVX (sv);
454		518
455	need (enc, 9);	519	need (enc, 9);
456		520
457	if (ecb_expect_false (nv == (U32)nv))	521	if (ecb_expect_false (nv == (NV)(U32)nv))
458	encode_uint (enc, 0x00, (U32)nv);	522	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
459	//TODO: maybe I32?	523	//TODO: maybe I32?
460	else if (ecb_expect_false (nv == (float)nv))	524	else if (ecb_expect_false (nv == (float)nv))
461	{	525	{
462	uint32_t fp = ecb_float_to_binary32 (nv);	526	uint32_t fp = ecb_float_to_binary32 (nv);
463		527
464	*enc->cur++ = 0xe0 \| 26;	528	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
465		529
466	if (!ecb_big_endian ())	530	if (!ecb_big_endian ())
467	fp = ecb_bswap32 (fp);	531	fp = ecb_bswap32 (fp);
468		532
469	memcpy (enc->cur, &fp, 4);	533	memcpy (enc->cur, &fp, 4);
…		…
471	}	535	}
472	else	536	else
473	{	537	{
474	uint64_t fp = ecb_double_to_binary64 (nv);	538	uint64_t fp = ecb_double_to_binary64 (nv);
475		539
476	*enc->cur++ = 0xe0 \| 27;	540	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
477		541
478	if (!ecb_big_endian ())	542	if (!ecb_big_endian ())
479	fp = ecb_bswap64 (fp);	543	fp = ecb_bswap64 (fp);
480		544
481	memcpy (enc->cur, &fp, 8);	545	memcpy (enc->cur, &fp, 8);
…		…
497	else if (SvNOKp (sv))	561	else if (SvNOKp (sv))
498	encode_nv (enc, sv);	562	encode_nv (enc, sv);
499	else if (SvIOKp (sv))	563	else if (SvIOKp (sv))
500	{	564	{
501	if (SvIsUV (sv))	565	if (SvIsUV (sv))
502	encode_uint (enc, 0x00, SvUVX (sv));	566	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
503	else if (SvIVX (sv) >= 0)	567	else if (SvIVX (sv) >= 0)
504	encode_uint (enc, 0x00, SvIVX (sv));	568	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
505	else	569	else
506	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	570	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
507	}	571	}
508	else if (SvROK (sv))	572	else if (SvROK (sv))
509	encode_rv (enc, SvRV (sv));	573	encode_rv (enc, SvRV (sv));
510	else if (!SvOK (sv))	574	else if (!SvOK (sv))
511	encode_ch (enc, 0xe0 \| 22);	575	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
512	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	576	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
513	encode_ch (enc, 0xe0 \| 23);	577	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
514	else	578	else
515	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	579	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
516	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	580	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
517	}	581	}
518		582
…		…
571	#define DEC_DEC_DEPTH --dec->depth	635	#define DEC_DEC_DEPTH --dec->depth
572		636
573	static UV	637	static UV
574	decode_uint (dec_t *dec)	638	decode_uint (dec_t *dec)
575	{	639	{
576	switch (*dec->cur & 31)	640	U8 m = *dec->cur & MINOR_MASK;
577	{	641	++dec->cur;
578	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
579	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
580	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
581	return *dec->cur++ & 31;
582		642
583	case 24:	643	if (ecb_expect_true (m < LENGTH_EXT1))
		644	return m;
		645	else if (ecb_expect_true (m == LENGTH_EXT1))
		646	{
584	WANT (2);	647	WANT (1);
585	dec->cur += 2;	648	dec->cur += 1;
586	return dec->cur[-1];	649	return dec->cur[-1];
587		650	}
588	case 25:	651	else if (ecb_expect_true (m == LENGTH_EXT2))
		652	{
589	WANT (3);	653	WANT (2);
590	dec->cur += 3;	654	dec->cur += 2;
591	return (((UV)dec->cur[-2]) << 8)	655	return (((UV)dec->cur[-2]) << 8)
592	\| ((UV)dec->cur[-1]);	656	\| ((UV)dec->cur[-1]);
593		657	}
594	case 26:	658	else if (ecb_expect_true (m == LENGTH_EXT4))
		659	{
595	WANT (5);	660	WANT (4);
596	dec->cur += 5;	661	dec->cur += 4;
597	return (((UV)dec->cur[-4]) << 24)	662	return (((UV)dec->cur[-4]) << 24)
598	\| (((UV)dec->cur[-3]) << 16)	663	\| (((UV)dec->cur[-3]) << 16)
599	\| (((UV)dec->cur[-2]) << 8)	664	\| (((UV)dec->cur[-2]) << 8)
600	\| ((UV)dec->cur[-1]);	665	\| ((UV)dec->cur[-1]);
601		666	}
602	case 27:	667	else if (ecb_expect_true (m == LENGTH_EXT8))
		668	{
603	WANT (9);	669	WANT (8);
604	dec->cur += 9;	670	dec->cur += 8;
		671
		672	return
		673	#if UVSIZE < 8
		674	0
		675	#else
605	return (((UV)dec->cur[-8]) << 56)	676	(((UV)dec->cur[-8]) << 56)
606	\| (((UV)dec->cur[-7]) << 48)	677	\| (((UV)dec->cur[-7]) << 48)
607	\| (((UV)dec->cur[-6]) << 40)	678	\| (((UV)dec->cur[-6]) << 40)
608	\| (((UV)dec->cur[-5]) << 32)	679	\| (((UV)dec->cur[-5]) << 32)
		680	#endif
609	\| (((UV)dec->cur[-4]) << 24)	681	\| (((UV)dec->cur[-4]) << 24)
610	\| (((UV)dec->cur[-3]) << 16)	682	\| (((UV)dec->cur[-3]) << 16)
611	\| (((UV)dec->cur[-2]) << 8)	683	\| (((UV)dec->cur[-2]) << 8)
612	\| ((UV)dec->cur[-1]);	684	\| ((UV)dec->cur[-1]);
613		685	}
614	default:	686	else
615	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	687	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
616	}
617		688
618	fail:	689	fail:
619	return 0;	690	return 0;
620	}	691	}
621		692
…		…
626	{	697	{
627	AV *av = newAV ();	698	AV *av = newAV ();
628		699
629	DEC_INC_DEPTH;	700	DEC_INC_DEPTH;
630		701
631	if ((*dec->cur & 31) == 31)	702	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
632	{	703	{
633	++dec->cur;	704	++dec->cur;
634		705
635	for (;;)	706	for (;;)
636	{	707	{
637	WANT (1);	708	WANT (1);
638		709
639	if (*dec->cur == (0xe0 \| 31))	710	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
640	{	711	{
641	++dec->cur;	712	++dec->cur;
642	break;	713	break;
643	}	714	}
644		715
…		…
647	}	718	}
648	else	719	else
649	{	720	{
650	int i, len = decode_uint (dec);	721	int i, len = decode_uint (dec);
651		722
		723	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
652	av_fill (av, len - 1);	724	av_fill (av, len - 1);
653		725
654	for (i = 0; i < len; ++i)	726	for (i = 0; i < len; ++i)
655	AvARRAY (av)[i] = decode_sv (dec);	727	AvARRAY (av)[i] = decode_sv (dec);
656	}	728	}
…		…
669	{	741	{
670	// for speed reasons, we specialcase single-string	742	// for speed reasons, we specialcase single-string
671	// byte or utf-8 strings as keys, but only when !stringref	743	// byte or utf-8 strings as keys, but only when !stringref
672		744
673	if (ecb_expect_true (!dec->stringref))	745	if (ecb_expect_true (!dec->stringref))
674	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	746	if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
675	{	747	{
676	I32 len = decode_uint (dec);	748	I32 len = decode_uint (dec);
677	char key = (char )dec->cur;	749	char key = (char )dec->cur;
678		750
679	dec->cur += len;	751	dec->cur += len;
680		752
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);	753	hv_store (hv, key, len, decode_sv (dec), 0);
685		754
686	return;	755	return;
687	}	756	}
688	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	757	else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
689	{	758	{
690	I32 len = decode_uint (dec);	759	I32 len = decode_uint (dec);
691	char key = (char )dec->cur;	760	char key = (char )dec->cur;
692		761
693	dec->cur += len;	762	dec->cur += len;
694		763
695	if (ecb_expect_false (dec->stringref))	764	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
696	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));	765	if (!is_utf8_string (key, len))
		766	ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
697		767
698	hv_store (hv, key, -len, decode_sv (dec), 0);	768	hv_store (hv, key, -len, decode_sv (dec), 0);
699		769
700	return;	770	return;
701	}	771	}
…		…
703	SV *k = decode_sv (dec);	773	SV *k = decode_sv (dec);
704	SV *v = decode_sv (dec);	774	SV *v = decode_sv (dec);
705		775
706	hv_store_ent (hv, k, v, 0);	776	hv_store_ent (hv, k, v, 0);
707	SvREFCNT_dec (k);	777	SvREFCNT_dec (k);
		778
		779	fail:
		780	;
708	}	781	}
709		782
710	static SV *	783	static SV *
711	decode_hv (dec_t *dec)	784	decode_hv (dec_t *dec)
712	{	785	{
713	HV *hv = newHV ();	786	HV *hv = newHV ();
714		787
715	DEC_INC_DEPTH;	788	DEC_INC_DEPTH;
716		789
717	if ((*dec->cur & 31) == 31)	790	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
718	{	791	{
719	++dec->cur;	792	++dec->cur;
720		793
721	for (;;)	794	for (;;)
722	{	795	{
723	WANT (1);	796	WANT (1);
724		797
725	if (*dec->cur == (0xe0 \| 31))	798	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
726	{	799	{
727	++dec->cur;	800	++dec->cur;
728	break;	801	break;
729	}	802	}
730		803
…		…
751	static SV *	824	static SV *
752	decode_str (dec_t *dec, int utf8)	825	decode_str (dec_t *dec, int utf8)
753	{	826	{
754	SV *sv = 0;	827	SV *sv = 0;
755		828
756	if ((*dec->cur & 31) == 31)	829	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
757	{	830	{
		831	// indefinite length strings
758	++dec->cur;	832	++dec->cur;
759		833
		834	U8 major = *dec->cur & MAJOR_MISC;
		835
760	sv = newSVpvn ("", 0);	836	sv = newSVpvn ("", 0);
761		837
762	// not very fast, and certainly not robust against illegal input
763	for (;;)	838	for (;;)
764	{	839	{
765	WANT (1);	840	WANT (1);
766		841
767	if (*dec->cur == (0xe0 \| 31))	842	if ((*dec->cur - major) > LENGTH_EXT8)
		843	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
768	{	844	{
769	++dec->cur;	845	++dec->cur;
770	break;	846	break;
771	}	847	}
		848	else
		849	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
772		850
773	sv_catsv (sv, decode_sv (dec));	851	STRLEN len = decode_uint (dec);
		852
		853	WANT (len);
		854	sv_catpvn (sv, dec->cur, len);
		855	dec->cur += len;
774	}	856	}
775	}	857	}
776	else	858	else
777	{	859	{
778	STRLEN len = decode_uint (dec);	860	STRLEN len = decode_uint (dec);
…		…
785	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))	867	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
786	av_push (dec->stringref, SvREFCNT_inc_NN (sv));	868	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
787	}	869	}
788		870
789	if (utf8)	871	if (utf8)
		872	{
		873	if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
		874	if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
		875	ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
		876
790	SvUTF8_on (sv);	877	SvUTF8_on (sv);
		878	}
791		879
792	return sv;	880	return sv;
793		881
794	fail:	882	fail:
795	SvREFCNT_dec (sv);	883	SvREFCNT_dec (sv);
…		…
827	}	915	}
828	break;	916	break;
829		917
830	case CBOR_TAG_STRINGREF:	918	case CBOR_TAG_STRINGREF:
831	{	919	{
832	if ((*dec->cur >> 5) != 0)	920	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
833	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	921	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
834		922
835	UV idx = decode_uint (dec);	923	UV idx = decode_uint (dec);
836		924
837	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))	925	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
…		…
844	case CBOR_TAG_VALUE_SHAREABLE:	932	case CBOR_TAG_VALUE_SHAREABLE:
845	{	933	{
846	if (ecb_expect_false (!dec->shareable))	934	if (ecb_expect_false (!dec->shareable))
847	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	935	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
848		936
		937	if (dec->cbor.flags & F_ALLOW_CYCLES)
		938	{
849	sv = newSV (0);	939	sv = newSV (0);
850	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	940	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
851		941
852	SV *osv = decode_sv (dec);	942	SV *osv = decode_sv (dec);
853	sv_setsv (sv, osv);	943	sv_setsv (sv, osv);
854	SvREFCNT_dec_NN (osv);	944	SvREFCNT_dec_NN (osv);
		945	}
		946	else
		947	{
		948	av_push (dec->shareable, &PL_sv_undef);
		949	int idx = AvFILLp (dec->shareable);
		950	sv = decode_sv (dec);
		951	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		952	}
855	}	953	}
856	break;	954	break;
857		955
858	case CBOR_TAG_VALUE_SHAREDREF:	956	case CBOR_TAG_VALUE_SHAREDREF:
859	{	957	{
860	if ((*dec->cur >> 5) != 0)	958	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
861	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	959	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
862		960
863	UV idx = decode_uint (dec);	961	UV idx = decode_uint (dec);
864		962
865	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))	963	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
866	ERR ("corrupted CBOR data (sharedref index out of bounds)");	964	ERR ("corrupted CBOR data (sharedref index out of bounds)");
867		965
868	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	966	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		967
		968	if (sv == &PL_sv_undef)
		969	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
869	}	970	}
870	break;	971	break;
871		972
872	case CBOR_TAG_PERL_OBJECT:	973	case CBOR_TAG_PERL_OBJECT:
873	{	974	{
…		…
974	static SV *	1075	static SV *
975	decode_sv (dec_t *dec)	1076	decode_sv (dec_t *dec)
976	{	1077	{
977	WANT (1);	1078	WANT (1);
978		1079
979	switch (*dec->cur >> 5)	1080	switch (*dec->cur >> MAJOR_SHIFT)
980	{	1081	{
981	case 0: // unsigned int	1082	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
982	return newSVuv (decode_uint (dec));	1083	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
983	case 1: // negative int	1084	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
984	return newSViv (-1 - (IV)decode_uint (dec));	1085	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
985	case 2: // octet string	1086	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
986	return decode_str (dec, 0);	1087	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
987	case 3: // utf-8 string	1088	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
988	return decode_str (dec, 1);	1089
989	case 4: // array	1090	case MAJOR_MISC >> MAJOR_SHIFT:
990	return decode_av (dec);
991	case 5: // map
992	return decode_hv (dec);
993	case 6: // tag
994	return decode_tagged (dec);
995	case 7: // misc
996	switch (*dec->cur++ & 31)	1091	switch (*dec->cur++ & MINOR_MASK)
997	{	1092	{
998	case 20:	1093	case SIMPLE_FALSE:
999	#if CBOR_SLOW	1094	#if CBOR_SLOW
1000	types_false = get_bool ("Types::Serialiser::false");	1095	types_false = get_bool ("Types::Serialiser::false");
1001	#endif	1096	#endif
1002	return newSVsv (types_false);	1097	return newSVsv (types_false);
1003	case 21:	1098	case SIMPLE_TRUE:
1004	#if CBOR_SLOW	1099	#if CBOR_SLOW
1005	types_true = get_bool ("Types::Serialiser::true");	1100	types_true = get_bool ("Types::Serialiser::true");
1006	#endif	1101	#endif
1007	return newSVsv (types_true);	1102	return newSVsv (types_true);
1008	case 22:	1103	case SIMPLE_NULL:
1009	return newSVsv (&PL_sv_undef);	1104	return newSVsv (&PL_sv_undef);
1010	case 23:	1105	case SIMPLE_UNDEF:
1011	#if CBOR_SLOW	1106	#if CBOR_SLOW
1012	types_error = get_bool ("Types::Serialiser::error");	1107	types_error = get_bool ("Types::Serialiser::error");
1013	#endif	1108	#endif
1014	return newSVsv (types_error);	1109	return newSVsv (types_error);
1015		1110
1016	case 25:	1111	case MISC_FLOAT16:
1017	{	1112	{
1018	WANT (2);	1113	WANT (2);
1019		1114
1020	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1115	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
1021	dec->cur += 2;	1116	dec->cur += 2;
1022		1117
1023	return newSVnv (ecb_binary16_to_float (fp));	1118	return newSVnv (ecb_binary16_to_float (fp));
1024	}	1119	}
1025		1120
1026	case 26:	1121	case MISC_FLOAT32:
1027	{	1122	{
1028	uint32_t fp;	1123	uint32_t fp;
1029	WANT (4);	1124	WANT (4);
1030	memcpy (&fp, dec->cur, 4);	1125	memcpy (&fp, dec->cur, 4);
1031	dec->cur += 4;	1126	dec->cur += 4;
…		…
1034	fp = ecb_bswap32 (fp);	1129	fp = ecb_bswap32 (fp);
1035		1130
1036	return newSVnv (ecb_binary32_to_float (fp));	1131	return newSVnv (ecb_binary32_to_float (fp));
1037	}	1132	}
1038		1133
1039	case 27:	1134	case MISC_FLOAT64:
1040	{	1135	{
1041	uint64_t fp;	1136	uint64_t fp;
1042	WANT (8);	1137	WANT (8);
1043	memcpy (&fp, dec->cur, 8);	1138	memcpy (&fp, dec->cur, 8);
1044	dec->cur += 8;	1139	dec->cur += 8;
…		…
1047	fp = ecb_bswap64 (fp);	1142	fp = ecb_bswap64 (fp);
1048		1143
1049	return newSVnv (ecb_binary64_to_double (fp));	1144	return newSVnv (ecb_binary64_to_double (fp));
1050	}	1145	}
1051		1146
1052	// 0..19 unassigned	1147	// 0..19 unassigned simple
1053	// 24 reserved + unassigned (reserved values are not encodable)	1148	// 24 reserved + unassigned simple (reserved values are not encodable)
		1149	// 28-30 unassigned misc
		1150	// 31 break code
1054	default:	1151	default:
1055	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1152	ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1056	}	1153	}
1057		1154
1058	break;	1155	break;
1059	}	1156	}
1060		1157
…		…
1087	if (dec.cur != dec.end && !dec.err)	1184	if (dec.cur != dec.end && !dec.err)
1088	dec.err = "garbage after CBOR object";	1185	dec.err = "garbage after CBOR object";
1089		1186
1090	if (dec.err)	1187	if (dec.err)
1091	{	1188	{
		1189	if (dec.shareable)
		1190	{
		1191	// need to break cyclic links, which whould all be in shareable
		1192	int i;
		1193	SV **svp;
		1194
		1195	for (i = av_len (dec.shareable) + 1; i--; )
		1196	if ((svp = av_fetch (dec.shareable, i, 0)))
		1197	sv_setsv (*svp, &PL_sv_undef);
		1198	}
		1199
1092	SvREFCNT_dec (sv);	1200	SvREFCNT_dec (sv);
1093	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);	1201	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
1094	}	1202	}
1095		1203
1096	sv = sv_2mortal (sv);	1204	sv = sv_2mortal (sv);
1097		1205
1098	return sv;	1206	return sv;
1099	}	1207	}
1100		1208
		1209	/////////////////////////////////////////////////////////////////////////////
		1210	// incremental parser
		1211
		1212	#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
		1213
		1214	// returns 0 for notyet, 1 for success or error
		1215	static int
		1216	incr_parse (CBOR self, SV cborstr)
		1217	{
		1218	STRLEN cur;
		1219	SvPV (cborstr, cur);
		1220
		1221	while (ecb_expect_true (self->incr_need <= cur))
		1222	{
		1223	// table of integer count bytes
		1224	static I8 incr_len[MINOR_MASK + 1] = {
		1225	0, 0, 0, 0, 0, 0, 0, 0,
		1226	0, 0, 0, 0, 0, 0, 0, 0,
		1227	0, 0, 0, 0, 0, 0, 0, 0,
		1228	1, 2, 4, 8,-1,-1,-1,-2
		1229	};
		1230
		1231	const U8 *p = SvPVX (cborstr) + self->incr_pos;
		1232	U8 m = *p & MINOR_MASK;
		1233	IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1234	I8 ilen = incr_len[m];
		1235
		1236	self->incr_need = self->incr_pos + 1;
		1237
		1238	if (ecb_expect_false (ilen < 0))
		1239	{
		1240	if (m != MINOR_INDEF)
		1241	return 1; // error
		1242
		1243	if (*p == (MAJOR_MISC \| MINOR_INDEF))
		1244	{
		1245	if (count >= 0)
		1246	return 1; // error
		1247
		1248	count = 1;
		1249	}
		1250	else
		1251	{
		1252	av_push (self->incr_count, newSViv (-1)); //TODO: nest
		1253	count = -1;
		1254	}
		1255	}
		1256	else
		1257	{
		1258	self->incr_need += ilen;
		1259	if (ecb_expect_false (self->incr_need > cur))
		1260	return 0;
		1261
		1262	int major = *p >> MAJOR_SHIFT;
		1263
		1264	switch (major)
		1265	{
		1266	case MAJOR_BYTES >> MAJOR_SHIFT:
		1267	case MAJOR_TEXT >> MAJOR_SHIFT:
		1268	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1269	case MAJOR_MAP >> MAJOR_SHIFT:
		1270	{
		1271	UV len;
		1272
		1273	if (ecb_expect_false (ilen))
		1274	{
		1275	len = 0;
		1276
		1277	do {
		1278	len = (len << 8) \| *++p;
		1279	} while (--ilen);
		1280	}
		1281	else
		1282	len = m;
		1283
		1284	switch (major)
		1285	{
		1286	case MAJOR_BYTES >> MAJOR_SHIFT:
		1287	case MAJOR_TEXT >> MAJOR_SHIFT:
		1288	self->incr_need += len;
		1289	if (ecb_expect_false (self->incr_need > cur))
		1290	return 0;
		1291
		1292	break;
		1293
		1294	case MAJOR_MAP >> MAJOR_SHIFT:
		1295	len <<= 1;
		1296	case MAJOR_ARRAY >> MAJOR_SHIFT:
		1297	if (len)
		1298	{
		1299	av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
		1300	count = len + 1;
		1301	}
		1302	break;
		1303	}
		1304	}
		1305	}
		1306	}
		1307
		1308	self->incr_pos = self->incr_need;
		1309
		1310	if (count > 0)
		1311	{
		1312	while (!--count)
		1313	{
		1314	if (!AvFILLp (self->incr_count))
		1315	return 1; // done
		1316
		1317	SvREFCNT_dec_NN (av_pop (self->incr_count));
		1318	count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
		1319	}
		1320
		1321	SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
		1322	}
		1323	}
		1324
		1325	return 0;
		1326	}
		1327
		1328
1101	/////////////////////////////////////////////////////////////////////////////	1329	/////////////////////////////////////////////////////////////////////////////
1102	// XS interface functions	1330	// XS interface functions
1103		1331
1104	MODULE = CBOR::XS PACKAGE = CBOR::XS	1332	MODULE = CBOR::XS PACKAGE = CBOR::XS
1105		1333
…		…
1145	void shrink (CBOR *self, int enable = 1)	1373	void shrink (CBOR *self, int enable = 1)
1146	ALIAS:	1374	ALIAS:
1147	shrink = F_SHRINK	1375	shrink = F_SHRINK
1148	allow_unknown = F_ALLOW_UNKNOWN	1376	allow_unknown = F_ALLOW_UNKNOWN
1149	allow_sharing = F_ALLOW_SHARING	1377	allow_sharing = F_ALLOW_SHARING
		1378	allow_cycles = F_ALLOW_CYCLES
1150	pack_strings = F_PACK_STRINGS	1379	pack_strings = F_PACK_STRINGS
		1380	validate_utf8 = F_VALIDATE_UTF8
1151	PPCODE:	1381	PPCODE:
1152	{	1382	{
1153	if (enable)	1383	if (enable)
1154	self->flags \|= ix;	1384	self->flags \|= ix;
1155	else	1385	else
…		…
1161	void get_shrink (CBOR *self)	1391	void get_shrink (CBOR *self)
1162	ALIAS:	1392	ALIAS:
1163	get_shrink = F_SHRINK	1393	get_shrink = F_SHRINK
1164	get_allow_unknown = F_ALLOW_UNKNOWN	1394	get_allow_unknown = F_ALLOW_UNKNOWN
1165	get_allow_sharing = F_ALLOW_SHARING	1395	get_allow_sharing = F_ALLOW_SHARING
		1396	get_allow_cycles = F_ALLOW_CYCLES
1166	get_pack_strings = F_PACK_STRINGS	1397	get_pack_strings = F_PACK_STRINGS
		1398	get_validate_utf8 = F_VALIDATE_UTF8
1167	PPCODE:	1399	PPCODE:
1168	XPUSHs (boolSV (self->flags & ix));	1400	XPUSHs (boolSV (self->flags & ix));
1169		1401
1170	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1402	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1171	PPCODE:	1403	PPCODE:
…		…
1220	EXTEND (SP, 2);	1452	EXTEND (SP, 2);
1221	PUSHs (sv);	1453	PUSHs (sv);
1222	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1454	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1223	}	1455	}
1224		1456
		1457	void incr_parse (CBOR self, SV cborstr)
		1458	ALIAS:
		1459	incr_parse_multiple = 1
		1460	PPCODE:
		1461	{
		1462	if (SvUTF8 (cborstr))
		1463	sv_utf8_downgrade (cborstr, 0);
		1464
		1465	if (!self->incr_count)
		1466	{
		1467	self->incr_count = newAV ();
		1468	self->incr_pos = 0;
		1469	self->incr_need = 1;
		1470
		1471	av_push (self->incr_count, newSViv (1));
		1472	}
		1473
		1474	do
		1475	{
		1476	if (!incr_parse (self, cborstr))
		1477	{
		1478	if (self->incr_need > self->max_size && self->max_size)
		1479	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
		1480	(unsigned long)self->incr_need, (unsigned long)self->max_size);
		1481
		1482	break;
		1483	}
		1484
		1485	SV *sv;
		1486	char *offset;
		1487
		1488	PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
		1489	XPUSHs (sv);
		1490
		1491	sv_chop (cborstr, offset);
		1492
		1493	av_clear (self->incr_count);
		1494	av_push (self->incr_count, newSViv (1));
		1495
		1496	self->incr_pos = 0;
		1497	self->incr_need = self->incr_pos + 1;
		1498	}
		1499	while (ix);
		1500	}
		1501
		1502	void incr_reset (CBOR *self)
		1503	CODE:
		1504	{
		1505	SvREFCNT_dec (self->incr_count);
		1506	self->incr_count = 0;
		1507	}
		1508
1225	void DESTROY (CBOR *self)	1509	void DESTROY (CBOR *self)
1226	PPCODE:	1510	PPCODE:
1227	cbor_free (self);	1511	cbor_free (self);
1228		1512
1229	PROTOTYPES: ENABLE	1513	PROTOTYPES: ENABLE
1230		1514
1231	void encode_cbor (SV *scalar)	1515	void encode_cbor (SV *scalar)
		1516	ALIAS:
		1517	encode_cbor = 0
		1518	encode_cbor_sharing = F_ALLOW_SHARING
1232	PPCODE:	1519	PPCODE:
1233	{	1520	{
1234	CBOR cbor;	1521	CBOR cbor;
1235	cbor_init (&cbor);	1522	cbor_init (&cbor);
		1523	cbor.flags \|= ix;
1236	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1524	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1237	XPUSHs (scalar);	1525	XPUSHs (scalar);
1238	}	1526	}
1239		1527
1240	void decode_cbor (SV *cborstr)	1528	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.32 by root, Thu Nov 28 12:08:07 2013 UTC vs. Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.32 by root, Thu Nov 28 12:08:07 2013 UTC vs.
Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC