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

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

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs. Revision 1.38 by root, Sun Dec 1 14:30:52 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC vs.
Revision 1.38 by root, Sun Dec 1 14:30:52 2013 UTC