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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.19 by root, Wed Nov 20 02:03:09 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
		102	#define F_ALLOW_CYCLES 0x00000008UL
62	#define F_DEDUP_STRINGS 0x00000008UL //TODO	103	#define F_PACK_STRINGS 0x00000010UL
63	#define F_DEDUP_KEYS 0x00000010UL //TODO
64		104
65	#define INIT_SIZE 32 // initial scalar size to be allocated	105	#define INIT_SIZE 32 // initial scalar size to be allocated
66		106
67	#define SB do {	107	#define SB do {
68	#define SE } while (0)	108	#define SE } while (0)
…		…
80	# define CBOR_SLOW 0	120	# define CBOR_SLOW 0
81	# define CBOR_STASH cbor_stash	121	# define CBOR_STASH cbor_stash
82	#endif	122	#endif
83		123
84	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::
85	static SV types_true, types_false, types_error, sv_cbor;	125	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
86		126
87	typedef struct {	127	typedef struct {
88	U32 flags;	128	U32 flags;
89	U32 max_depth;	129	U32 max_depth;
90	STRLEN max_size;	130	STRLEN max_size;
		131	SV *filter;
91	} CBOR;	132	} CBOR;
92		133
93	ecb_inline void	134	ecb_inline void
94	cbor_init (CBOR *cbor)	135	cbor_init (CBOR *cbor)
95	{	136	{
96	Zero (cbor, 1, CBOR);	137	Zero (cbor, 1, CBOR);
97	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);
98	}	145	}
99		146
100	/////////////////////////////////////////////////////////////////////////////	147	/////////////////////////////////////////////////////////////////////////////
101	// utility functions	148	// utility functions
102		149
…		…
124	SvPV_renew (sv, SvCUR (sv) + 1);	171	SvPV_renew (sv, SvCUR (sv) + 1);
125	#endif	172	#endif
126	}	173	}
127	}	174	}
128		175
		176	// minimum length of a string to be registered for stringref
		177	ecb_inline int
		178	minimum_string_length (UV idx)
		179	{
		180	return idx > 23
		181	? idx > 0xffU
		182	? idx > 0xffffU
		183	? idx > 0xffffffffU
		184	? 11
		185	: 7
		186	: 5
		187	: 4
		188	: 3;
		189	}
		190
129	/////////////////////////////////////////////////////////////////////////////	191	/////////////////////////////////////////////////////////////////////////////
130	// encoder	192	// encoder
131		193
132	// structure used for encoding CBOR	194	// structure used for encoding CBOR
133	typedef struct	195	typedef struct
…		…
135	char *cur; // SvPVX (sv) + current output position	197	char *cur; // SvPVX (sv) + current output position
136	char *end; // SvEND (sv)	198	char *end; // SvEND (sv)
137	SV *sv; // result scalar	199	SV *sv; // result scalar
138	CBOR cbor;	200	CBOR cbor;
139	U32 depth; // recursion level	201	U32 depth; // recursion level
140	HV *stringref; // string => index, or 0	202	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		203	UV stringref_idx;
141	HV *shareable; // ptr => index, or 0	204	HV *shareable; // ptr => index, or 0
142	UV shareable_idx;	205	UV shareable_idx;
143	} enc_t;	206	} enc_t;
144		207
145	ecb_inline void	208	ecb_inline void
…		…
164	static void	227	static void
165	encode_uint (enc_t *enc, int major, UV len)	228	encode_uint (enc_t *enc, int major, UV len)
166	{	229	{
167	need (enc, 9);	230	need (enc, 9);
168		231
169	if (len < 24)	232	if (ecb_expect_true (len < LENGTH_EXT1))
170	*enc->cur++ = major \| len;	233	*enc->cur++ = major \| len;
171	else if (len <= 0xff)	234	else if (ecb_expect_true (len <= 0xffU))
172	{	235	{
173	*enc->cur++ = major \| 24;	236	*enc->cur++ = major \| LENGTH_EXT1;
174	*enc->cur++ = len;	237	*enc->cur++ = len;
175	}	238	}
176	else if (len <= 0xffff)	239	else if (len <= 0xffffU)
177	{	240	{
178	*enc->cur++ = major \| 25;	241	*enc->cur++ = major \| LENGTH_EXT2;
179	*enc->cur++ = len >> 8;	242	*enc->cur++ = len >> 8;
180	*enc->cur++ = len;	243	*enc->cur++ = len;
181	}	244	}
182	else if (len <= 0xffffffff)	245	else if (len <= 0xffffffffU)
183	{	246	{
184	*enc->cur++ = major \| 26;	247	*enc->cur++ = major \| LENGTH_EXT4;
185	*enc->cur++ = len >> 24;	248	*enc->cur++ = len >> 24;
186	*enc->cur++ = len >> 16;	249	*enc->cur++ = len >> 16;
187	*enc->cur++ = len >> 8;	250	*enc->cur++ = len >> 8;
188	*enc->cur++ = len;	251	*enc->cur++ = len;
189	}	252	}
190	else	253	else
191	{	254	{
192	*enc->cur++ = major \| 27;	255	*enc->cur++ = major \| LENGTH_EXT8;
193	*enc->cur++ = len >> 56;	256	*enc->cur++ = len >> 56;
194	*enc->cur++ = len >> 48;	257	*enc->cur++ = len >> 48;
195	*enc->cur++ = len >> 40;	258	*enc->cur++ = len >> 40;
196	*enc->cur++ = len >> 32;	259	*enc->cur++ = len >> 32;
197	*enc->cur++ = len >> 24;	260	*enc->cur++ = len >> 24;
…		…
199	*enc->cur++ = len >> 8;	262	*enc->cur++ = len >> 8;
200	*enc->cur++ = len;	263	*enc->cur++ = len;
201	}	264	}
202	}	265	}
203		266
204	static void	267	ecb_inline void
		268	encode_tag (enc_t *enc, UV tag)
		269	{
		270	encode_uint (enc, MAJOR_TAG, tag);
		271	}
		272
		273	ecb_inline void
205	encode_str (enc_t enc, int utf8, char str, STRLEN len)	274	encode_str (enc_t enc, int utf8, char str, STRLEN len)
206	{	275	{
207	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	276	encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
208	need (enc, len);	277	need (enc, len);
209	memcpy (enc->cur, str, len);	278	memcpy (enc->cur, str, len);
210	enc->cur += len;	279	enc->cur += len;
211	}	280	}
212		281
213	ecb_inline void	282	static void
214	encode_tag (enc_t *enc, UV tag)	283	encode_strref (enc_t enc, int utf8, char str, STRLEN len)
215	{	284	{
216	encode_uint (enc, 0xc0, tag);	285	if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
		286	{
		287	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		288
		289	if (SvOK (*svp))
		290	{
		291	// already registered, use stringref
		292	encode_tag (enc, CBOR_TAG_STRINGREF);
		293	encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
		294	return;
		295	}
		296	else if (len >= minimum_string_length (enc->stringref_idx))
		297	{
		298	// register only
		299	sv_setuv (*svp, enc->stringref_idx);
		300	++enc->stringref_idx;
		301	}
		302	}
		303
		304	encode_str (enc, utf8, str, len);
217	}	305	}
218		306
219	static void encode_sv (enc_t enc, SV sv);	307	static void encode_sv (enc_t enc, SV sv);
220		308
221	static void	309	static void
…		…
226	if (enc->depth >= enc->cbor.max_depth)	314	if (enc->depth >= enc->cbor.max_depth)
227	croak (ERR_NESTING_EXCEEDED);	315	croak (ERR_NESTING_EXCEEDED);
228		316
229	++enc->depth;	317	++enc->depth;
230		318
231	encode_uint (enc, 0x80, len + 1);	319	encode_uint (enc, MAJOR_ARRAY, len + 1);
232		320
233	for (i = 0; i <= len; ++i)	321	for (i = 0; i <= len; ++i)
234	{	322	{
235	SV **svp = av_fetch (av, i, 0);	323	SV **svp = av_fetch (av, i, 0);
236	encode_sv (enc, svp ? *svp : &PL_sv_undef);	324	encode_sv (enc, svp ? *svp : &PL_sv_undef);
…		…
251		339
252	int pairs = hv_iterinit (hv);	340	int pairs = hv_iterinit (hv);
253	int mg = SvMAGICAL (hv);	341	int mg = SvMAGICAL (hv);
254		342
255	if (mg)	343	if (mg)
256	encode_ch (enc, 0xa0 \| 31);	344	encode_ch (enc, MAJOR_MAP \| MINOR_INDEF);
257	else	345	else
258	encode_uint (enc, 0xa0, pairs);	346	encode_uint (enc, MAJOR_MAP, pairs);
259		347
260	while ((he = hv_iternext (hv)))	348	while ((he = hv_iternext (hv)))
261	{	349	{
262	if (HeKLEN (he) == HEf_SVKEY)	350	if (HeKLEN (he) == HEf_SVKEY)
263	encode_sv (enc, HeSVKEY (he));	351	encode_sv (enc, HeSVKEY (he));
264	else	352	else
265	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	353	encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
266		354
267	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));
268	}	356	}
269		357
270	if (mg)	358	if (mg)
271	encode_ch (enc, 0xe0 \| 31);	359	encode_ch (enc, MAJOR_MISC \| MINOR_INDEF);
272		360
273	--enc->depth;	361	--enc->depth;
274	}	362	}
275		363
276	// encode objects, arrays and special \0=false and \1=true values.	364	// encode objects, arrays and special \0=false and \1=true values.
277	static void	365	static void
278	encode_rv (enc_t enc, SV sv)	366	encode_rv (enc_t enc, SV sv)
279	{	367	{
280	SvGETMAGIC (sv);	368	SvGETMAGIC (sv);
281
282	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
283	&& ecb_expect_false (SvREFCNT (sv) > 1))
284	{
285	if (!enc->shareable)
286	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
287
288	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
289
290	if (SvOK (*svp))
291	{
292	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
293	encode_uint (enc, 0x00, SvUV (*svp));
294	return;
295	}
296	else
297	{
298	sv_setuv (*svp, enc->shareable_idx);
299	++enc->shareable_idx;
300	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
301	}
302	}
303		369
304	svtype svt = SvTYPE (sv);	370	svtype svt = SvTYPE (sv);
305		371
306	if (ecb_expect_false (SvOBJECT (sv)))	372	if (ecb_expect_false (SvOBJECT (sv)))
307	{	373	{
…		…
314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	380	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
315	? cbor_tagged_stash	381	? cbor_tagged_stash
316	: gv_stashpv ("CBOR::XS::Tagged" , 1);	382	: gv_stashpv ("CBOR::XS::Tagged" , 1);
317		383
318	HV *stash = SvSTASH (sv);	384	HV *stash = SvSTASH (sv);
319	GV *method;
320		385
321	if (stash == boolean_stash)	386	if (stash == boolean_stash)
322	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	}
323	else if (stash == error_stash)	391	else if (stash == error_stash)
324	encode_ch (enc, 0xe0 \| 23);	392	{
		393	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
		394	return;
		395	}
325	else if (stash == tagged_stash)	396	else if (stash == tagged_stash)
326	{	397	{
327	if (svt != SVt_PVAV)	398	if (svt != SVt_PVAV)
328	croak ("encountered CBOR::XS::Tagged object that isn't an array");	399	croak ("encountered CBOR::XS::Tagged object that isn't an array");
329		400
330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	401	encode_uint (enc, MAJOR_TAG, SvUV (av_fetch ((AV )sv, 0, 1)));
331	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))
332	}	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
333	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))	435	if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
334	{	436	{
335	dSP;	437	dSP;
336		438
337	ENTER; SAVETMPS; PUSHMARK (SP);	439	ENTER; SAVETMPS; PUSHMARK (SP);
338	// 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
…		…
370	// catch this surprisingly common error	472	// catch this surprisingly common error
371	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	473	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
372	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));
373		475
374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);	476	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
375	encode_uint (enc, 0x80, count + 1);	477	encode_uint (enc, MAJOR_ARRAY, count + 1);
376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	478	encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
377		479
378	while (count)	480	while (count)
379	encode_sv (enc, SP[1 - count--]);	481	encode_sv (enc, SP[1 - count--]);
380		482
381	PUTBACK;	483	PUTBACK;
…		…
402	{	504	{
403	double nv = SvNVX (sv);	505	double nv = SvNVX (sv);
404		506
405	need (enc, 9);	507	need (enc, 9);
406		508
407	if (ecb_expect_false (nv == (U32)nv))	509	if (ecb_expect_false (nv == (NV)(U32)nv))
408	encode_uint (enc, 0x00, (U32)nv);	510	encode_uint (enc, MAJOR_POS_INT, (U32)nv);
409	//TODO: maybe I32?	511	//TODO: maybe I32?
410	else if (ecb_expect_false (nv == (float)nv))	512	else if (ecb_expect_false (nv == (float)nv))
411	{	513	{
412	uint32_t fp = ecb_float_to_binary32 (nv);	514	uint32_t fp = ecb_float_to_binary32 (nv);
413		515
414	*enc->cur++ = 0xe0 \| 26;	516	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT32;
415		517
416	if (!ecb_big_endian ())	518	if (!ecb_big_endian ())
417	fp = ecb_bswap32 (fp);	519	fp = ecb_bswap32 (fp);
418		520
419	memcpy (enc->cur, &fp, 4);	521	memcpy (enc->cur, &fp, 4);
…		…
421	}	523	}
422	else	524	else
423	{	525	{
424	uint64_t fp = ecb_double_to_binary64 (nv);	526	uint64_t fp = ecb_double_to_binary64 (nv);
425		527
426	*enc->cur++ = 0xe0 \| 27;	528	*enc->cur++ = MAJOR_MISC \| MISC_FLOAT64;
427		529
428	if (!ecb_big_endian ())	530	if (!ecb_big_endian ())
429	fp = ecb_bswap64 (fp);	531	fp = ecb_bswap64 (fp);
430		532
431	memcpy (enc->cur, &fp, 8);	533	memcpy (enc->cur, &fp, 8);
…		…
440		542
441	if (SvPOKp (sv))	543	if (SvPOKp (sv))
442	{	544	{
443	STRLEN len;	545	STRLEN len;
444	char *str = SvPV (sv, len);	546	char *str = SvPV (sv, len);
445	encode_str (enc, SvUTF8 (sv), str, len);	547	encode_strref (enc, SvUTF8 (sv), str, len);
446	}	548	}
447	else if (SvNOKp (sv))	549	else if (SvNOKp (sv))
448	encode_nv (enc, sv);	550	encode_nv (enc, sv);
449	else if (SvIOKp (sv))	551	else if (SvIOKp (sv))
450	{	552	{
451	if (SvIsUV (sv))	553	if (SvIsUV (sv))
452	encode_uint (enc, 0x00, SvUVX (sv));	554	encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
453	else if (SvIVX (sv) >= 0)	555	else if (SvIVX (sv) >= 0)
454	encode_uint (enc, 0x00, SvIVX (sv));	556	encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
455	else	557	else
456	encode_uint (enc, 0x20, -(SvIVX (sv) + 1));	558	encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
457	}	559	}
458	else if (SvROK (sv))	560	else if (SvROK (sv))
459	encode_rv (enc, SvRV (sv));	561	encode_rv (enc, SvRV (sv));
460	else if (!SvOK (sv))	562	else if (!SvOK (sv))
461	encode_ch (enc, 0xe0 \| 22);	563	encode_ch (enc, MAJOR_MISC \| SIMPLE_NULL);
462	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)	564	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
463	encode_ch (enc, 0xe0 \| 23);	565	encode_ch (enc, MAJOR_MISC \| SIMPLE_UNDEF);
464	else	566	else
465	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",
466	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));	568	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
467	}	569	}
468		570
…		…
475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	577	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
476	enc.cur = SvPVX (enc.sv);	578	enc.cur = SvPVX (enc.sv);
477	enc.end = SvEND (enc.sv);	579	enc.end = SvEND (enc.sv);
478		580
479	SvPOK_only (enc.sv);	581	SvPOK_only (enc.sv);
		582
		583	if (cbor->flags & F_PACK_STRINGS)
		584	{
		585	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		586	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		587	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		588	}
		589
480	encode_sv (&enc, scalar);	590	encode_sv (&enc, scalar);
481		591
482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	592	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
483	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	593	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
484		594
…		…
499	const char *err; // parse error, if != 0	609	const char *err; // parse error, if != 0
500	CBOR cbor;	610	CBOR cbor;
501	U32 depth; // recursion depth	611	U32 depth; // recursion depth
502	U32 maxdepth; // recursion depth limit	612	U32 maxdepth; // recursion depth limit
503	AV *shareable;	613	AV *shareable;
		614	AV *stringref;
		615	SV *decode_tagged;
504	} dec_t;	616	} dec_t;
505		617
506	#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
507		619
508	#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")
…		…
511	#define DEC_DEC_DEPTH --dec->depth	623	#define DEC_DEC_DEPTH --dec->depth
512		624
513	static UV	625	static UV
514	decode_uint (dec_t *dec)	626	decode_uint (dec_t *dec)
515	{	627	{
516	switch (*dec->cur & 31)	628	U8 m = *dec->cur & MINOR_MASK;
517	{	629	++dec->cur;
518	case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
519	case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
520	case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
521	return *dec->cur++ & 31;
522		630
523	case 24:	631	if (ecb_expect_true (m < LENGTH_EXT1))
		632	return m;
		633	else if (ecb_expect_true (m == LENGTH_EXT1))
		634	{
524	WANT (2);	635	WANT (1);
525	dec->cur += 2;	636	dec->cur += 1;
526	return dec->cur[-1];	637	return dec->cur[-1];
527		638	}
528	case 25:	639	else if (ecb_expect_true (m == LENGTH_EXT2))
		640	{
529	WANT (3);	641	WANT (2);
530	dec->cur += 3;	642	dec->cur += 2;
531	return (((UV)dec->cur[-2]) << 8)	643	return (((UV)dec->cur[-2]) << 8)
532	\| ((UV)dec->cur[-1]);	644	\| ((UV)dec->cur[-1]);
533		645	}
534	case 26:	646	else if (ecb_expect_true (m == LENGTH_EXT4))
		647	{
535	WANT (5);	648	WANT (4);
536	dec->cur += 5;	649	dec->cur += 4;
537	return (((UV)dec->cur[-4]) << 24)	650	return (((UV)dec->cur[-4]) << 24)
538	\| (((UV)dec->cur[-3]) << 16)	651	\| (((UV)dec->cur[-3]) << 16)
539	\| (((UV)dec->cur[-2]) << 8)	652	\| (((UV)dec->cur[-2]) << 8)
540	\| ((UV)dec->cur[-1]);	653	\| ((UV)dec->cur[-1]);
541		654	}
542	case 27:	655	else if (ecb_expect_true (m == LENGTH_EXT8))
		656	{
543	WANT (9);	657	WANT (8);
544	dec->cur += 9;	658	dec->cur += 8;
		659
		660	return
		661	#if UVSIZE < 8
		662	0
		663	#else
545	return (((UV)dec->cur[-8]) << 56)	664	(((UV)dec->cur[-8]) << 56)
546	\| (((UV)dec->cur[-7]) << 48)	665	\| (((UV)dec->cur[-7]) << 48)
547	\| (((UV)dec->cur[-6]) << 40)	666	\| (((UV)dec->cur[-6]) << 40)
548	\| (((UV)dec->cur[-5]) << 32)	667	\| (((UV)dec->cur[-5]) << 32)
		668	#endif
549	\| (((UV)dec->cur[-4]) << 24)	669	\| (((UV)dec->cur[-4]) << 24)
550	\| (((UV)dec->cur[-3]) << 16)	670	\| (((UV)dec->cur[-3]) << 16)
551	\| (((UV)dec->cur[-2]) << 8)	671	\| (((UV)dec->cur[-2]) << 8)
552	\| ((UV)dec->cur[-1]);	672	\| ((UV)dec->cur[-1]);
553		673	}
554	default:	674	else
555	ERR ("corrupted CBOR data (unsupported integer minor encoding)");	675	ERR ("corrupted CBOR data (unsupported integer minor encoding)");
556	}
557		676
558	fail:	677	fail:
559	return 0;	678	return 0;
560	}	679	}
561		680
…		…
566	{	685	{
567	AV *av = newAV ();	686	AV *av = newAV ();
568		687
569	DEC_INC_DEPTH;	688	DEC_INC_DEPTH;
570		689
571	if ((*dec->cur & 31) == 31)	690	if (*dec->cur == (MAJOR_ARRAY \| MINOR_INDEF))
572	{	691	{
573	++dec->cur;	692	++dec->cur;
574		693
575	for (;;)	694	for (;;)
576	{	695	{
577	WANT (1);	696	WANT (1);
578		697
579	if (*dec->cur == (0xe0 \| 31))	698	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
580	{	699	{
581	++dec->cur;	700	++dec->cur;
582	break;	701	break;
583	}	702	}
584		703
…		…
587	}	706	}
588	else	707	else
589	{	708	{
590	int i, len = decode_uint (dec);	709	int i, len = decode_uint (dec);
591		710
		711	WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
592	av_fill (av, len - 1);	712	av_fill (av, len - 1);
593		713
594	for (i = 0; i < len; ++i)	714	for (i = 0; i < len; ++i)
595	AvARRAY (av)[i] = decode_sv (dec);	715	AvARRAY (av)[i] = decode_sv (dec);
596	}	716	}
…		…
606		726
607	static void	727	static void
608	decode_he (dec_t dec, HV hv)	728	decode_he (dec_t dec, HV hv)
609	{	729	{
610	// for speed reasons, we specialcase single-string	730	// for speed reasons, we specialcase single-string
611	// byte or utf-8 strings as keys.	731	// byte or utf-8 strings as keys, but only when !stringref
612		732
613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	733	if (ecb_expect_true (!dec->stringref))
		734	if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
614	{	735	{
615	I32 len = decode_uint (dec);	736	I32 len = decode_uint (dec);
616	char key = (char )dec->cur;	737	char key = (char )dec->cur;
617		738
618	dec->cur += len;	739	dec->cur += len;
619		740
		741	if (ecb_expect_false (dec->stringref))
		742	av_push (dec->stringref, newSVpvn (key, len));
		743
620	hv_store (hv, key, len, decode_sv (dec), 0);	744	hv_store (hv, key, len, decode_sv (dec), 0);
		745
		746	return;
621	}	747	}
622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	748	else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
623	{	749	{
624	I32 len = decode_uint (dec);	750	I32 len = decode_uint (dec);
625	char key = (char )dec->cur;	751	char key = (char )dec->cur;
626		752
627	dec->cur += len;	753	dec->cur += len;
628		754
		755	if (ecb_expect_false (dec->stringref))
		756	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		757
629	hv_store (hv, key, -len, decode_sv (dec), 0);	758	hv_store (hv, key, -len, decode_sv (dec), 0);
		759
		760	return;
630	}	761	}
631	else	762
632	{
633	SV *k = decode_sv (dec);	763	SV *k = decode_sv (dec);
634	SV *v = decode_sv (dec);	764	SV *v = decode_sv (dec);
635		765
636	hv_store_ent (hv, k, v, 0);	766	hv_store_ent (hv, k, v, 0);
637	SvREFCNT_dec (k);	767	SvREFCNT_dec (k);
638	}
639	}	768	}
640		769
641	static SV *	770	static SV *
642	decode_hv (dec_t *dec)	771	decode_hv (dec_t *dec)
643	{	772	{
644	HV *hv = newHV ();	773	HV *hv = newHV ();
645		774
646	DEC_INC_DEPTH;	775	DEC_INC_DEPTH;
647		776
648	if ((*dec->cur & 31) == 31)	777	if (*dec->cur == (MAJOR_MAP \| MINOR_INDEF))
649	{	778	{
650	++dec->cur;	779	++dec->cur;
651		780
652	for (;;)	781	for (;;)
653	{	782	{
654	WANT (1);	783	WANT (1);
655		784
656	if (*dec->cur == (0xe0 \| 31))	785	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
657	{	786	{
658	++dec->cur;	787	++dec->cur;
659	break;	788	break;
660	}	789	}
661		790
…		…
682	static SV *	811	static SV *
683	decode_str (dec_t *dec, int utf8)	812	decode_str (dec_t *dec, int utf8)
684	{	813	{
685	SV *sv = 0;	814	SV *sv = 0;
686		815
687	if ((*dec->cur & 31) == 31)	816	if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
688	{	817	{
		818	// indefinite length strings
689	++dec->cur;	819	++dec->cur;
690		820
		821	U8 major = *dec->cur & MAJOR_MISC;
		822
691	sv = newSVpvn ("", 0);	823	sv = newSVpvn ("", 0);
692		824
693	// not very fast, and certainly not robust against illegal input
694	for (;;)	825	for (;;)
695	{	826	{
696	WANT (1);	827	WANT (1);
697		828
698	if (*dec->cur == (0xe0 \| 31))	829	if ((*dec->cur - major) > LENGTH_EXT8)
		830	if (*dec->cur == (MAJOR_MISC \| MINOR_INDEF))
699	{	831	{
700	++dec->cur;	832	++dec->cur;
701	break;	833	break;
702	}	834	}
		835	else
		836	ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
703		837
704	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;
705	}	843	}
706	}	844	}
707	else	845	else
708	{	846	{
709	STRLEN len = decode_uint (dec);	847	STRLEN len = decode_uint (dec);
710		848
711	WANT (len);	849	WANT (len);
712	sv = newSVpvn (dec->cur, len);	850	sv = newSVpvn (dec->cur, len);
713	dec->cur += len;	851	dec->cur += len;
		852
		853	if (ecb_expect_false (dec->stringref)
		854	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		855	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
714	}	856	}
715		857
716	if (utf8)	858	if (utf8)
717	SvUTF8_on (sv);	859	SvUTF8_on (sv);
718		860
…		…
732	WANT (1);	874	WANT (1);
733		875
734	switch (tag)	876	switch (tag)
735	{	877	{
736	case CBOR_TAG_MAGIC:	878	case CBOR_TAG_MAGIC:
737	return decode_sv (dec);	879	sv = decode_sv (dec);
		880	break;
738		881
739	case CBOR_TAG_INDIRECTION:	882	case CBOR_TAG_INDIRECTION:
740	return newRV_noinc (decode_sv (dec));	883	sv = newRV_noinc (decode_sv (dec));
		884	break;
		885
		886	case CBOR_TAG_STRINGREF_NAMESPACE:
		887	{
		888	ENTER; SAVETMPS;
		889
		890	SAVESPTR (dec->stringref);
		891	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		892
		893	sv = decode_sv (dec);
		894
		895	FREETMPS; LEAVE;
		896	}
		897	break;
		898
		899	case CBOR_TAG_STRINGREF:
		900	{
		901	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
		902	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		903
		904	UV idx = decode_uint (dec);
		905
		906	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		907	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		908
		909	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		910	}
		911	break;
741		912
742	case CBOR_TAG_VALUE_SHAREABLE:	913	case CBOR_TAG_VALUE_SHAREABLE:
743	{	914	{
744	if (ecb_expect_false (!dec->shareable))	915	if (ecb_expect_false (!dec->shareable))
745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());	916	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
746		917
		918	if (dec->cbor.flags & F_ALLOW_CYCLES)
		919	{
747	sv = newSV (0);	920	sv = newSV (0);
748	av_push (dec->shareable, SvREFCNT_inc_NN (sv));	921	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
749		922
750	SV *osv = decode_sv (dec);	923	SV *osv = decode_sv (dec);
751	sv_setsv (sv, osv);	924	sv_setsv (sv, osv);
752	SvREFCNT_dec_NN (osv);	925	SvREFCNT_dec_NN (osv);
753	}	926	}
754		927	else
755	return sv;	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	}
		934	}
		935	break;
756		936
757	case CBOR_TAG_VALUE_SHAREDREF:	937	case CBOR_TAG_VALUE_SHAREDREF:
758	{	938	{
759	if ((*dec->cur >> 5) != 0)	939	if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");	940	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
761		941
762	UV idx = decode_uint (dec);	942	UV idx = decode_uint (dec);
763		943
764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))	944	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
765	ERR ("corrupted CBOR data (sharedref index out of bounds)");	945	ERR ("corrupted CBOR data (sharedref index out of bounds)");
766		946
767	return 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");
768	}	951	}
		952	break;
769		953
770	case CBOR_TAG_PERL_OBJECT:	954	case CBOR_TAG_PERL_OBJECT:
771	{	955	{
772	sv = decode_sv (dec);	956	sv = decode_sv (dec);
773		957
…		…
813	sv = SvREFCNT_inc (POPs);	997	sv = SvREFCNT_inc (POPs);
814		998
815	PUTBACK;	999	PUTBACK;
816		1000
817	FREETMPS; LEAVE;	1001	FREETMPS; LEAVE;
818
819	return sv;
820	}	1002	}
		1003	break;
821		1004
822	default:	1005	default:
823	{	1006	{
824	sv = decode_sv (dec);	1007	sv = decode_sv (dec);
825		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	{
826	AV *av = newAV ();	1032	AV *av = newAV ();
827	av_push (av, newSVuv (tag));	1033	av_push (av, newSVuv (tag));
828	av_push (av, sv);	1034	av_push (av, sv);
829		1035
830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	1036	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
831	? cbor_tagged_stash	1037	? cbor_tagged_stash
832	: gv_stashpv ("CBOR::XS::Tagged" , 1);	1038	: gv_stashpv ("CBOR::XS::Tagged" , 1);
833
834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	1039	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
835	}	1040	}
		1041
		1042	PUTBACK;
		1043
		1044	FREETMPS; LEAVE;
		1045	}
		1046	break;
836	}	1047	}
		1048
		1049	return sv;
837		1050
838	fail:	1051	fail:
839	SvREFCNT_dec (sv);	1052	SvREFCNT_dec (sv);
840	return &PL_sv_undef;	1053	return &PL_sv_undef;
841	}	1054	}
…		…
843	static SV *	1056	static SV *
844	decode_sv (dec_t *dec)	1057	decode_sv (dec_t *dec)
845	{	1058	{
846	WANT (1);	1059	WANT (1);
847		1060
848	switch (*dec->cur >> 5)	1061	switch (*dec->cur >> MAJOR_SHIFT)
849	{	1062	{
850	case 0: // unsigned int	1063	case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
851	return newSVuv (decode_uint (dec));	1064	case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
852	case 1: // negative int	1065	case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
853	return newSViv (-1 - (IV)decode_uint (dec));	1066	case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
854	case 2: // octet string	1067	case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
855	return decode_str (dec, 0);	1068	case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
856	case 3: // utf-8 string	1069	case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
857	return decode_str (dec, 1);	1070
858	case 4: // array	1071	case MAJOR_MISC >> MAJOR_SHIFT:
859	return decode_av (dec);
860	case 5: // map
861	return decode_hv (dec);
862	case 6: // tag
863	return decode_tagged (dec);
864	case 7: // misc
865	switch (*dec->cur++ & 31)	1072	switch (*dec->cur++ & MINOR_MASK)
866	{	1073	{
867	case 20:	1074	case SIMPLE_FALSE:
868	#if CBOR_SLOW	1075	#if CBOR_SLOW
869	types_false = get_bool ("Types::Serialiser::false");	1076	types_false = get_bool ("Types::Serialiser::false");
870	#endif	1077	#endif
871	return newSVsv (types_false);	1078	return newSVsv (types_false);
872	case 21:	1079	case SIMPLE_TRUE:
873	#if CBOR_SLOW	1080	#if CBOR_SLOW
874	types_true = get_bool ("Types::Serialiser::true");	1081	types_true = get_bool ("Types::Serialiser::true");
875	#endif	1082	#endif
876	return newSVsv (types_true);	1083	return newSVsv (types_true);
877	case 22:	1084	case SIMPLE_NULL:
878	return newSVsv (&PL_sv_undef);	1085	return newSVsv (&PL_sv_undef);
879	case 23:	1086	case SIMPLE_UNDEF:
880	#if CBOR_SLOW	1087	#if CBOR_SLOW
881	types_error = get_bool ("Types::Serialiser::error");	1088	types_error = get_bool ("Types::Serialiser::error");
882	#endif	1089	#endif
883	return newSVsv (types_error);	1090	return newSVsv (types_error);
884		1091
885	case 25:	1092	case MISC_FLOAT16:
886	{	1093	{
887	WANT (2);	1094	WANT (2);
888		1095
889	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];	1096	uint16_t fp = (dec->cur[0] << 8) \| dec->cur[1];
890	dec->cur += 2;	1097	dec->cur += 2;
891		1098
892	return newSVnv (ecb_binary16_to_float (fp));	1099	return newSVnv (ecb_binary16_to_float (fp));
893	}	1100	}
894		1101
895	case 26:	1102	case MISC_FLOAT32:
896	{	1103	{
897	uint32_t fp;	1104	uint32_t fp;
898	WANT (4);	1105	WANT (4);
899	memcpy (&fp, dec->cur, 4);	1106	memcpy (&fp, dec->cur, 4);
900	dec->cur += 4;	1107	dec->cur += 4;
…		…
903	fp = ecb_bswap32 (fp);	1110	fp = ecb_bswap32 (fp);
904		1111
905	return newSVnv (ecb_binary32_to_float (fp));	1112	return newSVnv (ecb_binary32_to_float (fp));
906	}	1113	}
907		1114
908	case 27:	1115	case MISC_FLOAT64:
909	{	1116	{
910	uint64_t fp;	1117	uint64_t fp;
911	WANT (8);	1118	WANT (8);
912	memcpy (&fp, dec->cur, 8);	1119	memcpy (&fp, dec->cur, 8);
913	dec->cur += 8;	1120	dec->cur += 8;
…		…
916	fp = ecb_bswap64 (fp);	1123	fp = ecb_bswap64 (fp);
917		1124
918	return newSVnv (ecb_binary64_to_double (fp));	1125	return newSVnv (ecb_binary64_to_double (fp));
919	}	1126	}
920		1127
921	// 0..19 unassigned	1128	// 0..19 unassigned simple
922	// 24 reserved + unassigned (reserved values are not encodable)	1129	// 24 reserved + unassigned (reserved values are not encodable)
923	default:	1130	default:
924	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1131	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
925	}	1132	}
926		1133
…		…
981	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);	1188	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
982		1189
983	types_true = get_bool ("Types::Serialiser::true" );	1190	types_true = get_bool ("Types::Serialiser::true" );
984	types_false = get_bool ("Types::Serialiser::false");	1191	types_false = get_bool ("Types::Serialiser::false");
985	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);
986		1195
987	sv_cbor = newSVpv ("CBOR", 0);	1196	sv_cbor = newSVpv ("CBOR", 0);
988	SvREADONLY_on (sv_cbor);	1197	SvREADONLY_on (sv_cbor);
989	}	1198	}
990		1199
…		…
1012	void shrink (CBOR *self, int enable = 1)	1221	void shrink (CBOR *self, int enable = 1)
1013	ALIAS:	1222	ALIAS:
1014	shrink = F_SHRINK	1223	shrink = F_SHRINK
1015	allow_unknown = F_ALLOW_UNKNOWN	1224	allow_unknown = F_ALLOW_UNKNOWN
1016	allow_sharing = F_ALLOW_SHARING	1225	allow_sharing = F_ALLOW_SHARING
1017	dedup_keys = F_DEDUP_KEYS	1226	allow_cycles = F_ALLOW_CYCLES
1018	dedup_strings = F_DEDUP_STRINGS	1227	pack_strings = F_PACK_STRINGS
1019	PPCODE:	1228	PPCODE:
1020	{	1229	{
1021	if (enable)	1230	if (enable)
1022	self->flags \|= ix;	1231	self->flags \|= ix;
1023	else	1232	else
…		…
1029	void get_shrink (CBOR *self)	1238	void get_shrink (CBOR *self)
1030	ALIAS:	1239	ALIAS:
1031	get_shrink = F_SHRINK	1240	get_shrink = F_SHRINK
1032	get_allow_unknown = F_ALLOW_UNKNOWN	1241	get_allow_unknown = F_ALLOW_UNKNOWN
1033	get_allow_sharing = F_ALLOW_SHARING	1242	get_allow_sharing = F_ALLOW_SHARING
1034	get_dedup_keys = F_DEDUP_KEYS	1243	get_allow_cycles = F_ALLOW_CYCLES
1035	get_dedup_strings = F_DEDUP_STRINGS	1244	get_pack_strings = F_PACK_STRINGS
1036	PPCODE:	1245	PPCODE:
1037	XPUSHs (boolSV (self->flags & ix));	1246	XPUSHs (boolSV (self->flags & ix));
1038		1247
1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1248	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1040	PPCODE:	1249	PPCODE:
…		…
1053	XPUSHs (ST (0));	1262	XPUSHs (ST (0));
1054		1263
1055	int get_max_size (CBOR *self)	1264	int get_max_size (CBOR *self)
1056	CODE:	1265	CODE:
1057	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);
1058	OUTPUT:	1279	OUTPUT:
1059	RETVAL	1280	RETVAL
1060		1281
1061	void encode (CBOR self, SV scalar)	1282	void encode (CBOR self, SV scalar)
1062	PPCODE:	1283	PPCODE:
…		…
1077	EXTEND (SP, 2);	1298	EXTEND (SP, 2);
1078	PUSHs (sv);	1299	PUSHs (sv);
1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1300	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1080	}	1301	}
1081		1302
		1303	void DESTROY (CBOR *self)
		1304	PPCODE:
		1305	cbor_free (self);
		1306
1082	PROTOTYPES: ENABLE	1307	PROTOTYPES: ENABLE
1083		1308
1084	void encode_cbor (SV *scalar)	1309	void encode_cbor (SV *scalar)
		1310	ALIAS:
		1311	encode_cbor = 0
		1312	encode_cbor_sharing = F_ALLOW_SHARING
1085	PPCODE:	1313	PPCODE:
1086	{	1314	{
1087	CBOR cbor;	1315	CBOR cbor;
1088	cbor_init (&cbor);	1316	cbor_init (&cbor);
		1317	cbor.flags \|= ix;
1089	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;	1318	PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1090	XPUSHs (scalar);	1319	XPUSHs (scalar);
1091	}	1320	}
1092		1321
1093	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.19 by root, Wed Nov 20 02:03:09 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.19 by root, Wed Nov 20 02:03:09 2013 UTC vs.
Revision 1.37 by root, Sat Nov 30 18:13:53 2013 UTC