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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.37 by root, Sat Nov 30 18:13:53 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_ALLOW_STRINGREF 0x00000008UL //TODO	102	#define F_ALLOW_CYCLES 0x00000008UL
		103	#define F_PACK_STRINGS 0x00000010UL
63		104
64	#define INIT_SIZE 32 // initial scalar size to be allocated	105	#define INIT_SIZE 32 // initial scalar size to be allocated
65		106
66	#define SB do {	107	#define SB do {
67	#define SE } while (0)	108	#define SE } while (0)
…		…
79	# define CBOR_SLOW 0	120	# define CBOR_SLOW 0
80	# define CBOR_STASH cbor_stash	121	# define CBOR_STASH cbor_stash
81	#endif	122	#endif
82		123
83	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::	124	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;	125	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
85		126
86	typedef struct {	127	typedef struct {
87	U32 flags;	128	U32 flags;
88	U32 max_depth;	129	U32 max_depth;
89	STRLEN max_size;	130	STRLEN max_size;
		131	SV *filter;
90	} CBOR;	132	} CBOR;
91		133
92	ecb_inline void	134	ecb_inline void
93	cbor_init (CBOR *cbor)	135	cbor_init (CBOR *cbor)
94	{	136	{
95	Zero (cbor, 1, CBOR);	137	Zero (cbor, 1, CBOR);
96	cbor->max_depth = 512;	138	cbor->max_depth = 512;
		139	}
		140
		141	ecb_inline void
		142	cbor_free (CBOR *cbor)
		143	{
		144	SvREFCNT_dec (cbor->filter);
97	}	145	}
98		146
99	/////////////////////////////////////////////////////////////////////////////	147	/////////////////////////////////////////////////////////////////////////////
100	// utility functions	148	// utility functions
101		149
…		…
131	{	179	{
132	return idx > 23	180	return idx > 23
133	? idx > 0xffU	181	? idx > 0xffU
134	? idx > 0xffffU	182	? idx > 0xffffU
135	? idx > 0xffffffffU	183	? idx > 0xffffffffU
		184	? 11
136	? 7	185	: 7
137	: 6
138	: 5	186	: 5
139	: 4	187	: 4
140	: 3;	188	: 3;
141	}	189	}
142		190
…		…
179	static void	227	static void
180	encode_uint (enc_t *enc, int major, UV len)	228	encode_uint (enc_t *enc, int major, UV len)
181	{	229	{
182	need (enc, 9);	230	need (enc, 9);
183		231
184	if (len < 24)	232	if (ecb_expect_true (len < LENGTH_EXT1))
185	*enc->cur++ = major \| len;	233	*enc->cur++ = major \| len;
186	else if (len <= 0xff)	234	else if (ecb_expect_true (len <= 0xffU))
187	{	235	{
188	*enc->cur++ = major \| 24;	236	*enc->cur++ = major \| LENGTH_EXT1;
189	*enc->cur++ = len;	237	*enc->cur++ = len;
190	}	238	}
191	else if (len <= 0xffff)	239	else if (len <= 0xffffU)
192	{	240	{
193	*enc->cur++ = major \| 25;	241	*enc->cur++ = major \| LENGTH_EXT2;
194	*enc->cur++ = len >> 8;	242	*enc->cur++ = len >> 8;
195	*enc->cur++ = len;	243	*enc->cur++ = len;
196	}	244	}
197	else if (len <= 0xffffffff)	245	else if (len <= 0xffffffffU)
198	{	246	{
199	*enc->cur++ = major \| 26;	247	*enc->cur++ = major \| LENGTH_EXT4;
200	*enc->cur++ = len >> 24;	248	*enc->cur++ = len >> 24;
201	*enc->cur++ = len >> 16;	249	*enc->cur++ = len >> 16;
202	*enc->cur++ = len >> 8;	250	*enc->cur++ = len >> 8;
203	*enc->cur++ = len;	251	*enc->cur++ = len;
204	}	252	}
205	else	253	else
206	{	254	{
207	*enc->cur++ = major \| 27;	255	*enc->cur++ = major \| LENGTH_EXT8;
208	*enc->cur++ = len >> 56;	256	*enc->cur++ = len >> 56;
209	*enc->cur++ = len >> 48;	257	*enc->cur++ = len >> 48;
210	*enc->cur++ = len >> 40;	258	*enc->cur++ = len >> 40;
211	*enc->cur++ = len >> 32;	259	*enc->cur++ = len >> 32;
212	*enc->cur++ = len >> 24;	260	*enc->cur++ = len >> 24;
…		…
217	}	265	}
218		266
219	ecb_inline void	267	ecb_inline void
220	encode_tag (enc_t *enc, UV tag)	268	encode_tag (enc_t *enc, UV tag)
221	{	269	{
222	encode_uint (enc, 0xc0, tag);	270	encode_uint (enc, MAJOR_TAG, tag);
		271	}
		272
		273	ecb_inline void
		274	encode_str (enc_t enc, int utf8, char str, STRLEN len)
		275	{
		276	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
		277	need (enc, len);
		278	memcpy (enc->cur, str, len);
		279	enc->cur += len;
223	}	280	}
224		281
225	static void	282	static void
226	encode_str (enc_t enc, int utf8, char str, STRLEN len)	283	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
227	{	284	{
228	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))	285	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
229	{	286	{
230	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);	287	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231		288
232	if (SvOK (*svp))	289	if (SvOK (*svp))
233	{	290	{
234	// already registered, use stringref	291	// already registered, use stringref
235	encode_tag (enc, CBOR_TAG_STRINGREF);	292	encode_tag (enc, CBOR_TAG_STRINGREF);
236	encode_uint (enc, 0x00, SvUV (*svp));	293	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
237	return;	294	return;
238	}	295	}
239	else if (len >= minimum_string_length (enc->stringref_idx))	296	else if (len >= minimum_string_length (enc->stringref_idx))
240	{	297	{
241	// register only	298	// register only
242	sv_setuv (*svp, enc->stringref_idx);	299	sv_setuv (*svp, enc->stringref_idx);
243	++enc->stringref_idx;	300	++enc->stringref_idx;
244	}	301	}
245	}	302	}
246		303
247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	304	encode_str (enc, utf8, str, len);
248	need (enc, len);
249	memcpy (enc->cur, str, len);
250	enc->cur += len;
251	}	305	}
252		306
253	static void encode_sv (enc_t enc, SV sv);	307	static void encode_sv (enc_t enc, SV sv);
254		308
255	static void	309	static void
…		…
260	if (enc->depth >= enc->cbor.max_depth)	314	if (enc->depth >= enc->cbor.max_depth)
261	croak (ERR_NESTING_EXCEEDED);	315	croak (ERR_NESTING_EXCEEDED);
262		316
263	++enc->depth;	317	++enc->depth;
264		318
265	encode_uint (enc, 0x80, len + 1);	319	encode_uint (enc, MAJOR_ARRAY, len + 1);
266		320
267	for (i = 0; i <= len; ++i)	321	for (i = 0; i <= len; ++i)
268	{	322	{
269	SV **svp = av_fetch (av, i, 0);	323	SV **svp = av_fetch (av, i, 0);
270	encode_sv (enc, svp ? *svp : &PL_sv_undef);	324	encode_sv (enc, svp ? *svp : &PL_sv_undef);
…		…
285		339
286	int pairs = hv_iterinit (hv);	340	int pairs = hv_iterinit (hv);
287	int mg = SvMAGICAL (hv);	341	int mg = SvMAGICAL (hv);
288		342
289	if (mg)	343	if (mg)
290	encode_ch (enc, 0xa0 \| 31);	344	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
291	else	345	else
292	encode_uint (enc, 0xa0, pairs);	346	encode_uint (enc, MAJOR_MAP, pairs);
293		347
294	while ((he = hv_iternext (hv)))	348	while ((he = hv_iternext (hv)))
295	{	349	{
296	if (HeKLEN (he) == HEf_SVKEY)	350	if (HeKLEN (he) == HEf_SVKEY)
297	encode_sv (enc, HeSVKEY (he));	351	encode_sv (enc, HeSVKEY (he));
298	else	352	else
299	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	353	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
300		354
301	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	355	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
302	}	356	}
303		357
304	if (mg)	358	if (mg)
305	encode_ch (enc, 0xe0 \| 31);	359	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
306		360
307	--enc->depth;	361	--enc->depth;
308	}	362	}
309		363
310	// encode objects, arrays and special \0=false and \1=true values.	364	// encode objects, arrays and special \0=false and \1=true values.
311	static void	365	static void
312	encode_rv (enc_t enc, SV sv)	366	encode_rv (enc_t enc, SV sv)
313	{	367	{
314	SvGETMAGIC (sv);	368	SvGETMAGIC (sv);
315
316	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
317	&& ecb_expect_false (SvREFCNT (sv) > 1))
318	{
319	if (!enc->shareable)
320	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
321
322	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
323
324	if (SvOK (*svp))
325	{
326	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
327	encode_uint (enc, 0x00, SvUV (*svp));
328	return;
329	}
330	else
331	{
332	sv_setuv (*svp, enc->shareable_idx);
333	++enc->shareable_idx;
334	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
335	}
336	}
337		369
338	svtype svt = SvTYPE (sv);	370	svtype svt = SvTYPE (sv);
339		371
340	if (ecb_expect_false (SvOBJECT (sv)))	372	if (ecb_expect_false (SvOBJECT (sv)))
341	{	373	{
…		…
348	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	380	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
349	? cbor_tagged_stash	381	? cbor_tagged_stash
350	: gv_stashpv ("CBOR::XS::Tagged" , 1);	382	: gv_stashpv ("CBOR::XS::Tagged" , 1);
351		383
352	HV *stash = SvSTASH (sv);	384	HV *stash = SvSTASH (sv);
353	GV *method;
354		385
355	if (stash == boolean_stash)	386	if (stash == boolean_stash)
356	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	387	{
		388	encode_ch (enc, SvIV (sv) ? MAJOR_MISC \| SIMPLE_TRUE : MAJOR_MISC \| SIMPLE_FALSE);
		389	return;
		390	}
357	else if (stash == error_stash)	391	else if (stash == error_stash)
358	encode_ch (enc, 0xe0 \| 23);	392	{
		393	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		394	return;
		395	}
359	else if (stash == tagged_stash)	396	else if (stash == tagged_stash)
360	{	397	{
361	if (svt != SVt_PVAV)	398	if (svt != SVt_PVAV)
362	croak ("encountered CBOR::XS::Tagged object that isn't an array");	399	croak ("encountered CBOR::XS::Tagged object that isn't an array");
363		400
364	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	401	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
365	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	402	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		403
		404	return;
		405	}
		406	}
		407
		408	if (ecb_expect_false (SvREFCNT (sv) > 1)
		409	&& ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
		410	{
		411	if (!enc->shareable)
		412	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		413
		414	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		415
		416	if (SvOK (*svp))
366	}	417	{
		418	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		419	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		420	return;
		421	}
		422	else
		423	{
		424	sv_setuv (*svp, enc->shareable_idx);
		425	++enc->shareable_idx;
		426	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		427	}
		428	}
		429
		430	if (ecb_expect_false (SvOBJECT (sv)))
		431	{
		432	HV *stash = SvSTASH (sv);
		433	GV *method;
		434
367	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	435	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
368	{	436	{
369	dSP;	437	dSP;
370		438
371	ENTER; SAVETMPS; PUSHMARK (SP);	439	ENTER; SAVETMPS; PUSHMARK (SP);
372	// we re-bless the reference to get overload and other niceties right	440	// we re-bless the reference to get overload and other niceties right
…		…
404	// catch this surprisingly common error	472	// catch this surprisingly common error
405	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	473	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
406	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	474	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
407		475
408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	476	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
409	encode_uint (enc, 0x80, count + 1);	477	encode_uint (enc, MAJOR_ARRAY, count + 1);
410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	478	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
411		479
412	while (count)	480	while (count)
413	encode_sv (enc, SP[1 - count--]);	481	encode_sv (enc, SP[1 - count--]);
414		482
415	PUTBACK;	483	PUTBACK;
…		…
436	{	504	{
437	double nv = SvNVX (sv);	505	double nv = SvNVX (sv);
438		506
439	need (enc, 9);	507	need (enc, 9);
440		508
441	if (ecb_expect_false (nv == (U32)nv))	509	if (ecb_expect_false (nv == (NV)(U32)nv))
442	encode_uint (enc, 0x00, (U32)nv);	510	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
443	//TODO: maybe I32?	511	//TODO: maybe I32?
444	else if (ecb_expect_false (nv == (float)nv))	512	else if (ecb_expect_false (nv == (float)nv))
445	{	513	{
446	uint32_t fp = ecb_float_to_binary32 (nv);	514	uint32_t fp = ecb_float_to_binary32 (nv);
447		515
448	*enc->cur++ = 0xe0 \| 26;	516	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
449		517
450	if (!ecb_big_endian ())	518	if (!ecb_big_endian ())
451	fp = ecb_bswap32 (fp);	519	fp = ecb_bswap32 (fp);
452		520
453	memcpy (enc->cur, &fp, 4);	521	memcpy (enc->cur, &fp, 4);
…		…
455	}	523	}
456	else	524	else
457	{	525	{
458	uint64_t fp = ecb_double_to_binary64 (nv);	526	uint64_t fp = ecb_double_to_binary64 (nv);
459		527
460	*enc->cur++ = 0xe0 \| 27;	528	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
461		529
462	if (!ecb_big_endian ())	530	if (!ecb_big_endian ())
463	fp = ecb_bswap64 (fp);	531	fp = ecb_bswap64 (fp);
464		532
465	memcpy (enc->cur, &fp, 8);	533	memcpy (enc->cur, &fp, 8);
…		…
474		542
475	if (SvPOKp (sv))	543	if (SvPOKp (sv))
476	{	544	{
477	STRLEN len;	545	STRLEN len;
478	char *str = SvPV (sv, len);	546	char *str = SvPV (sv, len);
479	encode_str (enc, SvUTF8 (sv), str, len);	547	encode_strref (enc, SvUTF8 (sv), str, len);
480	}	548	}
481	else if (SvNOKp (sv))	549	else if (SvNOKp (sv))
482	encode_nv (enc, sv);	550	encode_nv (enc, sv);
483	else if (SvIOKp (sv))	551	else if (SvIOKp (sv))
484	{	552	{
485	if (SvIsUV (sv))	553	if (SvIsUV (sv))
486	encode_uint (enc, 0x00, SvUVX (sv));	554	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
487	else if (SvIVX (sv) >= 0)	555	else if (SvIVX (sv) >= 0)
488	encode_uint (enc, 0x00, SvIVX (sv));	556	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
489	else	557	else
490	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	558	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
491	}	559	}
492	else if (SvROK (sv))	560	else if (SvROK (sv))
493	encode_rv (enc, SvRV (sv));	561	encode_rv (enc, SvRV (sv));
494	else if (!SvOK (sv))	562	else if (!SvOK (sv))
495	encode_ch (enc, 0xe0 \| 22);	563	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
496	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	564	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
497	encode_ch (enc, 0xe0 \| 23);	565	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
498	else	566	else
499	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",	567	croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
500	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	568	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
501	}	569	}
502		570
…		…
510	enc.cur = SvPVX (enc.sv);	578	enc.cur = SvPVX (enc.sv);
511	enc.end = SvEND (enc.sv);	579	enc.end = SvEND (enc.sv);
512		580
513	SvPOK_only (enc.sv);	581	SvPOK_only (enc.sv);
514		582
515	if (cbor->flags & F_ALLOW_STRINGREF)	583	if (cbor->flags & F_PACK_STRINGS)
516	{	584	{
517	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);	585	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
518	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());	586	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
519	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());	587	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
520	}	588	}
…		…
542	CBOR cbor;	610	CBOR cbor;
543	U32 depth; // recursion depth	611	U32 depth; // recursion depth
544	U32 maxdepth; // recursion depth limit	612	U32 maxdepth; // recursion depth limit
545	AV *shareable;	613	AV *shareable;
546	AV *stringref;	614	AV *stringref;
		615	SV *decode_tagged;
547	} dec_t;	616	} dec_t;
548		617
549	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	618	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
550		619
551	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	620	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
554	#define DEC_DEC_DEPTH --dec->depth	623	#define DEC_DEC_DEPTH --dec->depth
555		624
556	static UV	625	static UV
557	decode_uint (dec_t *dec)	626	decode_uint (dec_t *dec)
558	{	627	{
559	switch (*dec->cur & 31)	628	U8 m = *dec->cur & MINOR_MASK;
560	{	629	++dec->cur;
561	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
562	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
563	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
564	return *dec->cur++ & 31;
565		630
566	case 24:	631	if (ecb_expect_true (m < LENGTH_EXT1))
		632	return m;
		633	else if (ecb_expect_true (m == LENGTH_EXT1))
		634	{
567	WANT (2);	635	WANT (1);
568	dec->cur += 2;	636	dec->cur += 1;
569	return dec->cur[-1];	637	return dec->cur[-1];
570		638	}
571	case 25:	639	else if (ecb_expect_true (m == LENGTH_EXT2))
		640	{
572	WANT (3);	641	WANT (2);
573	dec->cur += 3;	642	dec->cur += 2;
574	return (((UV)dec->cur[-2]) << 8)	643	return (((UV)dec->cur[-2]) << 8)
575	\| ((UV)dec->cur[-1]);	644	\| ((UV)dec->cur[-1]);
576		645	}
577	case 26:	646	else if (ecb_expect_true (m == LENGTH_EXT4))
		647	{
578	WANT (5);	648	WANT (4);
579	dec->cur += 5;	649	dec->cur += 4;
580	return (((UV)dec->cur[-4]) << 24)	650	return (((UV)dec->cur[-4]) << 24)
581	\| (((UV)dec->cur[-3]) << 16)	651	\| (((UV)dec->cur[-3]) << 16)
582	\| (((UV)dec->cur[-2]) << 8)	652	\| (((UV)dec->cur[-2]) << 8)
583	\| ((UV)dec->cur[-1]);	653	\| ((UV)dec->cur[-1]);
584		654	}
585	case 27:	655	else if (ecb_expect_true (m == LENGTH_EXT8))
		656	{
586	WANT (9);	657	WANT (8);
587	dec->cur += 9;	658	dec->cur += 8;
		659
		660	return
		661	#if UVSIZE < 8
		662	0
		663	#else
588	return (((UV)dec->cur[-8]) << 56)	664	(((UV)dec->cur[-8]) << 56)
589	\| (((UV)dec->cur[-7]) << 48)	665	\| (((UV)dec->cur[-7]) << 48)
590	\| (((UV)dec->cur[-6]) << 40)	666	\| (((UV)dec->cur[-6]) << 40)
591	\| (((UV)dec->cur[-5]) << 32)	667	\| (((UV)dec->cur[-5]) << 32)
		668	#endif
592	\| (((UV)dec->cur[-4]) << 24)	669	\| (((UV)dec->cur[-4]) << 24)
593	\| (((UV)dec->cur[-3]) << 16)	670	\| (((UV)dec->cur[-3]) << 16)
594	\| (((UV)dec->cur[-2]) << 8)	671	\| (((UV)dec->cur[-2]) << 8)
595	\| ((UV)dec->cur[-1]);	672	\| ((UV)dec->cur[-1]);
596		673	}
597	default:	674	else
598	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	675	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
599	}
600		676
601	fail:	677	fail:
602	return 0;	678	return 0;
603	}	679	}
604		680
…		…
609	{	685	{
610	AV *av = newAV ();	686	AV *av = newAV ();
611		687
612	DEC_INC_DEPTH;	688	DEC_INC_DEPTH;
613		689
614	if ((*dec->cur & 31) == 31)	690	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
615	{	691	{
616	++dec->cur;	692	++dec->cur;
617		693
618	for (;;)	694	for (;;)
619	{	695	{
620	WANT (1);	696	WANT (1);
621		697
622	if (*dec->cur == (0xe0 \| 31))	698	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
623	{	699	{
624	++dec->cur;	700	++dec->cur;
625	break;	701	break;
626	}	702	}
627		703
…		…
630	}	706	}
631	else	707	else
632	{	708	{
633	int i, len = decode_uint (dec);	709	int i, len = decode_uint (dec);
634		710
		711	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
635	av_fill (av, len - 1);	712	av_fill (av, len - 1);
636		713
637	for (i = 0; i < len; ++i)	714	for (i = 0; i < len; ++i)
638	AvARRAY (av)[i] = decode_sv (dec);	715	AvARRAY (av)[i] = decode_sv (dec);
639	}	716	}
…		…
652	{	729	{
653	// for speed reasons, we specialcase single-string	730	// for speed reasons, we specialcase single-string
654	// byte or utf-8 strings as keys, but only when !stringref	731	// byte or utf-8 strings as keys, but only when !stringref
655		732
656	if (ecb_expect_true (!dec->stringref))	733	if (ecb_expect_true (!dec->stringref))
657	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	734	if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
658	{	735	{
659	I32 len = decode_uint (dec);	736	I32 len = decode_uint (dec);
660	char key = (char )dec->cur;	737	char key = (char )dec->cur;
661		738
662	dec->cur += len;	739	dec->cur += len;
…		…
666		743
667	hv_store (hv, key, len, decode_sv (dec), 0);	744	hv_store (hv, key, len, decode_sv (dec), 0);
668		745
669	return;	746	return;
670	}	747	}
671	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	748	else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
672	{	749	{
673	I32 len = decode_uint (dec);	750	I32 len = decode_uint (dec);
674	char key = (char )dec->cur;	751	char key = (char )dec->cur;
675		752
676	dec->cur += len;	753	dec->cur += len;
…		…
695	{	772	{
696	HV *hv = newHV ();	773	HV *hv = newHV ();
697		774
698	DEC_INC_DEPTH;	775	DEC_INC_DEPTH;
699		776
700	if ((*dec->cur & 31) == 31)	777	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
701	{	778	{
702	++dec->cur;	779	++dec->cur;
703		780
704	for (;;)	781	for (;;)
705	{	782	{
706	WANT (1);	783	WANT (1);
707		784
708	if (*dec->cur == (0xe0 \| 31))	785	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
709	{	786	{
710	++dec->cur;	787	++dec->cur;
711	break;	788	break;
712	}	789	}
713		790
…		…
734	static SV *	811	static SV *
735	decode_str (dec_t *dec, int utf8)	812	decode_str (dec_t *dec, int utf8)
736	{	813	{
737	SV *sv = 0;	814	SV *sv = 0;
738		815
739	if ((*dec->cur & 31) == 31)	816	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
740	{	817	{
		818	// indefinite length strings
741	++dec->cur;	819	++dec->cur;
742		820
		821	U8 major = *dec->cur & MAJOR_MISC;
		822
743	sv = newSVpvn ("", 0);	823	sv = newSVpvn ("", 0);
744		824
745	// not very fast, and certainly not robust against illegal input
746	for (;;)	825	for (;;)
747	{	826	{
748	WANT (1);	827	WANT (1);
749		828
750	if (*dec->cur == (0xe0 \| 31))	829	if ((*dec->cur - major) > LENGTH_EXT8)
		830	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
751	{	831	{
752	++dec->cur;	832	++dec->cur;
753	break;	833	break;
754	}	834	}
		835	else
		836	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
755		837
756	sv_catsv (sv, decode_sv (dec));	838	STRLEN len = decode_uint (dec);
		839
		840	WANT (len);
		841	sv_catpvn (sv, dec->cur, len);
		842	dec->cur += len;
757	}	843	}
758	}	844	}
759	else	845	else
760	{	846	{
761	STRLEN len = decode_uint (dec);	847	STRLEN len = decode_uint (dec);
…		…
810	}	896	}
811	break;	897	break;
812		898
813	case CBOR_TAG_STRINGREF:	899	case CBOR_TAG_STRINGREF:
814	{	900	{
815	if ((*dec->cur >> 5) != 0)	901	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
816	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");	902	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
817		903
818	UV idx = decode_uint (dec);	904	UV idx = decode_uint (dec);
819		905
820	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))	906	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
…		…
827	case CBOR_TAG_VALUE_SHAREABLE:	913	case CBOR_TAG_VALUE_SHAREABLE:
828	{	914	{
829	if (ecb_expect_false (!dec->shareable))	915	if (ecb_expect_false (!dec->shareable))
830	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	916	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
831		917
		918	if (dec->cbor.flags & F_ALLOW_CYCLES)
		919	{
832	sv = newSV (0);	920	sv = newSV (0);
833	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	921	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
834		922
835	SV *osv = decode_sv (dec);	923	SV *osv = decode_sv (dec);
836	sv_setsv (sv, osv);	924	sv_setsv (sv, osv);
837	SvREFCNT_dec_NN (osv);	925	SvREFCNT_dec_NN (osv);
		926	}
		927	else
		928	{
		929	av_push (dec->shareable, &PL_sv_undef);
		930	int idx = AvFILLp (dec->shareable);
		931	sv = decode_sv (dec);
		932	av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
		933	}
838	}	934	}
839	break;	935	break;
840		936
841	case CBOR_TAG_VALUE_SHAREDREF:	937	case CBOR_TAG_VALUE_SHAREDREF:
842	{	938	{
843	if ((*dec->cur >> 5) != 0)	939	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	940	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
845		941
846	UV idx = decode_uint (dec);	942	UV idx = decode_uint (dec);
847		943
848	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))	944	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
849	ERR ("corrupted CBOR data (sharedref index out of bounds)");	945	ERR ("corrupted CBOR data (sharedref index out of bounds)");
850		946
851	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);	947	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		948
		949	if (sv == &PL_sv_undef)
		950	ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
852	}	951	}
853	break;	952	break;
854		953
855	case CBOR_TAG_PERL_OBJECT:	954	case CBOR_TAG_PERL_OBJECT:
856	{	955	{
…		…
905		1004
906	default:	1005	default:
907	{	1006	{
908	sv = decode_sv (dec);	1007	sv = decode_sv (dec);
909		1008
		1009	dSP;
		1010	ENTER; SAVETMPS; PUSHMARK (SP);
		1011	EXTEND (SP, 2);
		1012	PUSHs (newSVuv (tag));
		1013	PUSHs (sv);
		1014
		1015	PUTBACK;
		1016	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		1017	SPAGAIN;
		1018
		1019	if (SvTRUE (ERRSV))
		1020	{
		1021	FREETMPS; LEAVE;
		1022	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		1023	}
		1024
		1025	if (count)
		1026	{
		1027	SvREFCNT_dec (sv);
		1028	sv = SvREFCNT_inc (POPs);
		1029	}
		1030	else
		1031	{
910	AV *av = newAV ();	1032	AV *av = newAV ();
911	av_push (av, newSVuv (tag));	1033	av_push (av, newSVuv (tag));
912	av_push (av, sv);	1034	av_push (av, sv);
913		1035
914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1036	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
915	? cbor_tagged_stash	1037	? cbor_tagged_stash
916	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1038	: gv_stashpv ("CBOR::XS::Tagged" , 1);
917
918	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1039	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		1040	}
		1041
		1042	PUTBACK;
		1043
		1044	FREETMPS; LEAVE;
919	}	1045	}
920	break;	1046	break;
921	}	1047	}
922		1048
923	return sv;	1049	return sv;
…		…
930	static SV *	1056	static SV *
931	decode_sv (dec_t *dec)	1057	decode_sv (dec_t *dec)
932	{	1058	{
933	WANT (1);	1059	WANT (1);
934		1060
935	switch (*dec->cur >> 5)	1061	switch (*dec->cur >> MAJOR_SHIFT)
936	{	1062	{
937	case 0: // unsigned int	1063	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
938	return newSVuv (decode_uint (dec));	1064	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
939	case 1: // negative int	1065	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
940	return newSViv (-1 - (IV)decode_uint (dec));	1066	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
941	case 2: // octet string	1067	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
942	return decode_str (dec, 0);	1068	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
943	case 3: // utf-8 string	1069	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
944	return decode_str (dec, 1);	1070
945	case 4: // array	1071	case MAJOR_MISC >> MAJOR_SHIFT:
946	return decode_av (dec);
947	case 5: // map
948	return decode_hv (dec);
949	case 6: // tag
950	return decode_tagged (dec);
951	case 7: // misc
952	switch (*dec->cur++ & 31)	1072	switch (*dec->cur++ & MINOR_MASK)
953	{	1073	{
954	case 20:	1074	case SIMPLE_FALSE:
955	#if CBOR_SLOW	1075	#if CBOR_SLOW
956	types_false = get_bool ("Types::Serialiser::false");	1076	types_false = get_bool ("Types::Serialiser::false");
957	#endif	1077	#endif
958	return newSVsv (types_false);	1078	return newSVsv (types_false);
959	case 21:	1079	case SIMPLE_TRUE:
960	#if CBOR_SLOW	1080	#if CBOR_SLOW
961	types_true = get_bool ("Types::Serialiser::true");	1081	types_true = get_bool ("Types::Serialiser::true");
962	#endif	1082	#endif
963	return newSVsv (types_true);	1083	return newSVsv (types_true);
964	case 22:	1084	case SIMPLE_NULL:
965	return newSVsv (&PL_sv_undef);	1085	return newSVsv (&PL_sv_undef);
966	case 23:	1086	case SIMPLE_UNDEF:
967	#if CBOR_SLOW	1087	#if CBOR_SLOW
968	types_error = get_bool ("Types::Serialiser::error");	1088	types_error = get_bool ("Types::Serialiser::error");
969	#endif	1089	#endif
970	return newSVsv (types_error);	1090	return newSVsv (types_error);
971		1091
972	case 25:	1092	case MISC_FLOAT16:
973	{	1093	{
974	WANT (2);	1094	WANT (2);
975		1095
976	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1096	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
977	dec->cur += 2;	1097	dec->cur += 2;
978		1098
979	return newSVnv (ecb_binary16_to_float (fp));	1099	return newSVnv (ecb_binary16_to_float (fp));
980	}	1100	}
981		1101
982	case 26:	1102	case MISC_FLOAT32:
983	{	1103	{
984	uint32_t fp;	1104	uint32_t fp;
985	WANT (4);	1105	WANT (4);
986	memcpy (&fp, dec->cur, 4);	1106	memcpy (&fp, dec->cur, 4);
987	dec->cur += 4;	1107	dec->cur += 4;
…		…
990	fp = ecb_bswap32 (fp);	1110	fp = ecb_bswap32 (fp);
991		1111
992	return newSVnv (ecb_binary32_to_float (fp));	1112	return newSVnv (ecb_binary32_to_float (fp));
993	}	1113	}
994		1114
995	case 27:	1115	case MISC_FLOAT64:
996	{	1116	{
997	uint64_t fp;	1117	uint64_t fp;
998	WANT (8);	1118	WANT (8);
999	memcpy (&fp, dec->cur, 8);	1119	memcpy (&fp, dec->cur, 8);
1000	dec->cur += 8;	1120	dec->cur += 8;
…		…
1003	fp = ecb_bswap64 (fp);	1123	fp = ecb_bswap64 (fp);
1004		1124
1005	return newSVnv (ecb_binary64_to_double (fp));	1125	return newSVnv (ecb_binary64_to_double (fp));
1006	}	1126	}
1007		1127
1008	// 0..19 unassigned	1128	// 0..19 unassigned simple
1009	// 24 reserved + unassigned (reserved values are not encodable)	1129	// 24 reserved + unassigned (reserved values are not encodable)
1010	default:	1130	default:
1011	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1131	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
1012	}	1132	}
1013		1133
…		…
1068	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1188	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1069		1189
1070	types_true = get_bool ("Types::Serialiser::true" );	1190	types_true = get_bool ("Types::Serialiser::true" );
1071	types_false = get_bool ("Types::Serialiser::false");	1191	types_false = get_bool ("Types::Serialiser::false");
1072	types_error = get_bool ("Types::Serialiser::error");	1192	types_error = get_bool ("Types::Serialiser::error");
		1193
		1194	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1073		1195
1074	sv_cbor = newSVpv ("CBOR", 0);	1196	sv_cbor = newSVpv ("CBOR", 0);
1075	SvREADONLY_on (sv_cbor);	1197	SvREADONLY_on (sv_cbor);
1076	}	1198	}
1077		1199
…		…
1099	void shrink (CBOR *self, int enable = 1)	1221	void shrink (CBOR *self, int enable = 1)
1100	ALIAS:	1222	ALIAS:
1101	shrink = F_SHRINK	1223	shrink = F_SHRINK
1102	allow_unknown = F_ALLOW_UNKNOWN	1224	allow_unknown = F_ALLOW_UNKNOWN
1103	allow_sharing = F_ALLOW_SHARING	1225	allow_sharing = F_ALLOW_SHARING
1104	allow_stringref = F_ALLOW_STRINGREF	1226	allow_cycles = F_ALLOW_CYCLES
		1227	pack_strings = F_PACK_STRINGS
1105	PPCODE:	1228	PPCODE:
1106	{	1229	{
1107	if (enable)	1230	if (enable)
1108	self->flags \|= ix;	1231	self->flags \|= ix;
1109	else	1232	else
…		…
1115	void get_shrink (CBOR *self)	1238	void get_shrink (CBOR *self)
1116	ALIAS:	1239	ALIAS:
1117	get_shrink = F_SHRINK	1240	get_shrink = F_SHRINK
1118	get_allow_unknown = F_ALLOW_UNKNOWN	1241	get_allow_unknown = F_ALLOW_UNKNOWN
1119	get_allow_sharing = F_ALLOW_SHARING	1242	get_allow_sharing = F_ALLOW_SHARING
1120	get_allow_stringref = F_ALLOW_STRINGREF	1243	get_allow_cycles = F_ALLOW_CYCLES
		1244	get_pack_strings = F_PACK_STRINGS
1121	PPCODE:	1245	PPCODE:
1122	XPUSHs (boolSV (self->flags & ix));	1246	XPUSHs (boolSV (self->flags & ix));
1123		1247
1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1248	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1125	PPCODE:	1249	PPCODE:
…		…
1138	XPUSHs (ST (0));	1262	XPUSHs (ST (0));
1139		1263
1140	int get_max_size (CBOR *self)	1264	int get_max_size (CBOR *self)
1141	CODE:	1265	CODE:
1142	RETVAL = self->max_size;	1266	RETVAL = self->max_size;
		1267	OUTPUT:
		1268	RETVAL
		1269
		1270	void filter (CBOR self, SV filter = 0)
		1271	PPCODE:
		1272	SvREFCNT_dec (self->filter);
		1273	self->filter = filter ? newSVsv (filter) : filter;
		1274	XPUSHs (ST (0));
		1275
		1276	SV get_filter (CBOR self)
		1277	CODE:
		1278	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1143	OUTPUT:	1279	OUTPUT:
1144	RETVAL	1280	RETVAL
1145		1281
1146	void encode (CBOR self, SV scalar)	1282	void encode (CBOR self, SV scalar)
1147	PPCODE:	1283	PPCODE:
…		…
1162	EXTEND (SP, 2);	1298	EXTEND (SP, 2);
1163	PUSHs (sv);	1299	PUSHs (sv);
1164	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1300	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1165	}	1301	}
1166		1302
		1303	void DESTROY (CBOR *self)
		1304	PPCODE:
		1305	cbor_free (self);
		1306
1167	PROTOTYPES: ENABLE	1307	PROTOTYPES: ENABLE
1168		1308
1169	void encode_cbor (SV *scalar)	1309	void encode_cbor (SV *scalar)
		1310	ALIAS:
		1311	encode_cbor = 0
		1312	encode_cbor_sharing = F_ALLOW_SHARING
1170	PPCODE:	1313	PPCODE:
1171	{	1314	{
1172	CBOR cbor;	1315	CBOR cbor;
1173	cbor_init (&cbor);	1316	cbor_init (&cbor);
		1317	cbor.flags \|= ix;
1174	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1318	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1175	XPUSHs (scalar);	1319	XPUSHs (scalar);
1176	}	1320	}
1177		1321
1178	void decode_cbor (SV *cborstr)	1322	void decode_cbor (SV *cborstr)

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs. Revision 1.37 by root, Sat Nov 30 18:13:53 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.37 by root, Sat Nov 30 18:13:53 2013 UTC