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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs.
Revision 1.41 by root, Tue Dec 10 14:01:52 2013 UTC

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

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs. Revision 1.41 by root, Tue Dec 10 14:01:52 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs.
Revision 1.41 by root, Tue Dec 10 14:01:52 2013 UTC