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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.27 by root, Fri Nov 22 15:28:38 2013 UTC

…		…
9	#include <limits.h>	9	#include <limits.h>
10	#include <float.h>	10	#include <float.h>
11		11
12	#include "ecb.h"	12	#include "ecb.h"
13		13
		14	// compatibility with perl <5.18
		15	#ifndef HvNAMELEN_get
		16	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		17	#endif
		18	#ifndef HvNAMELEN
		19	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		20	#endif
		21	#ifndef HvNAMEUTF8
		22	# define HvNAMEUTF8(hv) 0
		23	#endif
		24
		25	// known tags
		26	enum cbor_tag
		27	{
		28	// inofficial extensions (pending iana registration)
		29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
		30	CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object
		31	CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing
		32	CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing
		33	CBOR_TAG_STRINGREF_NAMESPACE = 65537, // 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
		36
		37	// rfc7049
		38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		40	CBOR_TAG_POS_BIGNUM = 2, // byte string
		41	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		42	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		43	CBOR_TAG_BIGFLOAT = 5, // array
		44
		45	CBOR_TAG_CONV_B64U = 21, // base64url, any
		46	CBOR_TAG_CONV_B64 = 22, // base64, any
		47	CBOR_TAG_CONV_HEX = 23, // base16, any
		48	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		49
		50	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		51	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		52	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		53	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		55
		56	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		57	};
		58
14	#define F_SHRINK 0x00000200UL	59	#define F_SHRINK 0x00000001UL
15	#define F_ALLOW_UNKNOWN 0x00002000UL	60	#define F_ALLOW_UNKNOWN 0x00000002UL
		61	#define F_ALLOW_SHARING 0x00000004UL //TODO
		62	#define F_ALLOW_STRINGREF 0x00000008UL //TODO
16		63
17	#define INIT_SIZE 32 // initial scalar size to be allocated	64	#define INIT_SIZE 32 // initial scalar size to be allocated
18		65
19	#define SB do {	66	#define SB do {
20	#define SE } while (0)	67	#define SE } while (0)
21
22	#if __GNUC__ >= 3
23	# define expect(expr,value) __builtin_expect ((expr), (value))
24	# define INLINE static inline
25	#else
26	# define expect(expr,value) (expr)
27	# define INLINE static
28	#endif
29
30	#define expect_false(expr) expect ((expr) != 0, 0)
31	#define expect_true(expr) expect ((expr) != 0, 1)
32		68
33	#define IN_RANGE_INC(type,val,beg,end) \	69	#define IN_RANGE_INC(type,val,beg,end) \
34	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	70	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
35	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	71	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
36		72
…		…
42	#else	78	#else
43	# define CBOR_SLOW 0	79	# define CBOR_SLOW 0
44	# define CBOR_STASH cbor_stash	80	# define CBOR_STASH cbor_stash
45	#endif	81	#endif
46		82
47	static HV cbor_stash, cbor_boolean_stash; // CBOR::XS::	83	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
48	static SV cbor_true, cbor_false;	84	static SV types_true, types_false, types_error, sv_cbor, *default_filter;
49		85
50	typedef struct {	86	typedef struct {
51	U32 flags;	87	U32 flags;
52	U32 max_depth;	88	U32 max_depth;
53	STRLEN max_size;	89	STRLEN max_size;
54		90	SV *filter;
55	SV *cb_object;
56	HV *cb_sk_object;
57	} CBOR;	91	} CBOR;
58		92
59	INLINE void	93	ecb_inline void
60	cbor_init (CBOR *cbor)	94	cbor_init (CBOR *cbor)
61	{	95	{
62	Zero (cbor, 1, CBOR);	96	Zero (cbor, 1, CBOR);
63	cbor->max_depth = 512;	97	cbor->max_depth = 512;
64	}	98	}
65		99
		100	ecb_inline void
		101	cbor_free (CBOR *cbor)
		102	{
		103	SvREFCNT_dec (cbor->filter);
		104	}
		105
66	/////////////////////////////////////////////////////////////////////////////	106	/////////////////////////////////////////////////////////////////////////////
67	// utility functions	107	// utility functions
68		108
69	INLINE SV *	109	ecb_inline SV *
70	get_bool (const char *name)	110	get_bool (const char *name)
71	{	111	{
72	SV *sv = get_sv (name, 1);	112	SV *sv = get_sv (name, 1);
73		113
74	SvREADONLY_on (sv);	114	SvREADONLY_on (sv);
75	SvREADONLY_on (SvRV (sv));	115	SvREADONLY_on (SvRV (sv));
76		116
77	return sv;	117	return sv;
78	}	118	}
79		119
80	INLINE void	120	ecb_inline void
81	shrink (SV *sv)	121	shrink (SV *sv)
82	{	122	{
83	sv_utf8_downgrade (sv, 1);	123	sv_utf8_downgrade (sv, 1);
84		124
85	if (SvLEN (sv) > SvCUR (sv) + 1)	125	if (SvLEN (sv) > SvCUR (sv) + 1)
…		…
90	SvPV_renew (sv, SvCUR (sv) + 1);	130	SvPV_renew (sv, SvCUR (sv) + 1);
91	#endif	131	#endif
92	}	132	}
93	}	133	}
94		134
95	/////////////////////////////////////////////////////////////////////////////	135	// minimum length of a string to be registered for stringref
96	// fp hell	136	ecb_inline int
97		137	minimum_string_length (UV idx)
98	//TODO	138	{
		139	return idx > 23
		140	? idx > 0xffU
		141	? idx > 0xffffU
		142	? idx > 0xffffffffU
		143	? 7
		144	: 6
		145	: 5
		146	: 4
		147	: 3;
		148	}
99		149
100	/////////////////////////////////////////////////////////////////////////////	150	/////////////////////////////////////////////////////////////////////////////
101	// encoder	151	// encoder
102		152
103	// structure used for encoding CBOR	153	// structure used for encoding CBOR
…		…
106	char *cur; // SvPVX (sv) + current output position	156	char *cur; // SvPVX (sv) + current output position
107	char *end; // SvEND (sv)	157	char *end; // SvEND (sv)
108	SV *sv; // result scalar	158	SV *sv; // result scalar
109	CBOR cbor;	159	CBOR cbor;
110	U32 depth; // recursion level	160	U32 depth; // recursion level
		161	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		162	UV stringref_idx;
		163	HV *shareable; // ptr => index, or 0
		164	UV shareable_idx;
111	} enc_t;	165	} enc_t;
112		166
113	INLINE void	167	ecb_inline void
114	need (enc_t *enc, STRLEN len)	168	need (enc_t *enc, STRLEN len)
115	{	169	{
116	if (expect_false (enc->cur + len >= enc->end))	170	if (ecb_expect_false (enc->cur + len >= enc->end))
117	{	171	{
118	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);	172	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
119	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);	173	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
120	enc->cur = SvPVX (enc->sv) + cur;	174	enc->cur = SvPVX (enc->sv) + cur;
121	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	175	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
122	}	176	}
123	}	177	}
124		178
125	INLINE void	179	ecb_inline void
126	encode_ch (enc_t *enc, char ch)	180	encode_ch (enc_t *enc, char ch)
127	{	181	{
128	need (enc, 1);	182	need (enc, 1);
129	*enc->cur++ = ch;	183	*enc->cur++ = ch;
130	}	184	}
…		…
134	{	188	{
135	need (enc, 9);	189	need (enc, 9);
136		190
137	if (len < 24)	191	if (len < 24)
138	*enc->cur++ = major \| len;	192	*enc->cur++ = major \| len;
139	else if (len < 0x100)	193	else if (len <= 0xff)
140	{	194	{
141	*enc->cur++ = major \| 24;	195	*enc->cur++ = major \| 24;
142	*enc->cur++ = len;	196	*enc->cur++ = len;
143	}	197	}
144	else if (len < 0x10000)	198	else if (len <= 0xffff)
145	{	199	{
146	*enc->cur++ = major \| 25;	200	*enc->cur++ = major \| 25;
147	*enc->cur++ = len >> 8;	201	*enc->cur++ = len >> 8;
148	*enc->cur++ = len;	202	*enc->cur++ = len;
149	}	203	}
150	else if (len < 0x100000000)	204	else if (len <= 0xffffffff)
151	{	205	{
152	*enc->cur++ = major \| 26;	206	*enc->cur++ = major \| 26;
153	*enc->cur++ = len >> 24;	207	*enc->cur++ = len >> 24;
154	*enc->cur++ = len >> 16;	208	*enc->cur++ = len >> 16;
155	*enc->cur++ = len >> 8;	209	*enc->cur++ = len >> 8;
156	*enc->cur++ = len;	210	*enc->cur++ = len;
157	}	211	}
158	else if (len)	212	else
159	{	213	{
160	*enc->cur++ = major \| 27;	214	*enc->cur++ = major \| 27;
161	*enc->cur++ = len >> 56;	215	*enc->cur++ = len >> 56;
162	*enc->cur++ = len >> 48;	216	*enc->cur++ = len >> 48;
163	*enc->cur++ = len >> 40;	217	*enc->cur++ = len >> 40;
…		…
167	*enc->cur++ = len >> 8;	221	*enc->cur++ = len >> 8;
168	*enc->cur++ = len;	222	*enc->cur++ = len;
169	}	223	}
170	}	224	}
171		225
		226	ecb_inline void
		227	encode_tag (enc_t *enc, UV tag)
		228	{
		229	encode_uint (enc, 0xc0, tag);
		230	}
		231
172	static void	232	static void
173	encode_str (enc_t enc, int utf8, char str, STRLEN len)	233	encode_str (enc_t enc, int utf8, char str, STRLEN len)
174	{	234	{
		235	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		236	{
		237	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		238
		239	if (SvOK (*svp))
		240	{
		241	// already registered, use stringref
		242	encode_tag (enc, CBOR_TAG_STRINGREF);
		243	encode_uint (enc, 0x00, SvUV (*svp));
		244	return;
		245	}
		246	else if (len >= minimum_string_length (enc->stringref_idx))
		247	{
		248	// register only
		249	sv_setuv (*svp, enc->stringref_idx);
		250	++enc->stringref_idx;
		251	}
		252	}
		253
175	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	254	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
176	need (enc, len);	255	need (enc, len);
177	memcpy (enc->cur, str, len);	256	memcpy (enc->cur, str, len);
178	enc->cur += len;	257	enc->cur += len;
179	}	258	}
…		…
224	if (HeKLEN (he) == HEf_SVKEY)	303	if (HeKLEN (he) == HEf_SVKEY)
225	encode_sv (enc, HeSVKEY (he));	304	encode_sv (enc, HeSVKEY (he));
226	else	305	else
227	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	306	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
228		307
229	encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	308	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
230	}	309	}
231		310
232	if (mg)	311	if (mg)
233	encode_ch (enc, 0xe0 \| 31);	312	encode_ch (enc, 0xe0 \| 31);
234		313
…		…
237		316
238	// encode objects, arrays and special \0=false and \1=true values.	317	// encode objects, arrays and special \0=false and \1=true values.
239	static void	318	static void
240	encode_rv (enc_t enc, SV sv)	319	encode_rv (enc_t enc, SV sv)
241	{	320	{
242	svtype svt;
243
244	SvGETMAGIC (sv);	321	SvGETMAGIC (sv);
		322
		323	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		324	&& ecb_expect_false (SvREFCNT (sv) > 1))
		325	{
		326	if (!enc->shareable)
		327	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		328
		329	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		330
		331	if (SvOK (*svp))
		332	{
		333	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		334	encode_uint (enc, 0x00, SvUV (*svp));
		335	return;
		336	}
		337	else
		338	{
		339	sv_setuv (*svp, enc->shareable_idx);
		340	++enc->shareable_idx;
		341	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		342	}
		343	}
		344
245	svt = SvTYPE (sv);	345	svtype svt = SvTYPE (sv);
246		346
247	if (expect_false (SvOBJECT (sv)))	347	if (ecb_expect_false (SvOBJECT (sv)))
248	{	348	{
249	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	349	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
250	? cbor_boolean_stash	350	? types_boolean_stash
		351	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		352	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		353	? types_error_stash
		354	: gv_stashpv ("Types::Serialiser::Error", 1);
		355	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		356	? cbor_tagged_stash
251	: gv_stashpv ("CBOR::XS::Boolean", 1);	357	: gv_stashpv ("CBOR::XS::Tagged" , 1);
252		358
253	if (SvSTASH (sv) == stash)	359	HV *stash = SvSTASH (sv);
		360	GV *method;
		361
		362	if (stash == boolean_stash)
254	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	363	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		364	else if (stash == error_stash)
		365	encode_ch (enc, 0xe0 \| 23);
		366	else if (stash == tagged_stash)
		367	{
		368	if (svt != SVt_PVAV)
		369	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		370
		371	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		372	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		373	}
		374	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		375	{
		376	dSP;
		377
		378	ENTER; SAVETMPS; PUSHMARK (SP);
		379	// we re-bless the reference to get overload and other niceties right
		380	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		381
		382	PUTBACK;
		383	// G_SCALAR ensures that return value is 1
		384	call_sv ((SV *)GvCV (method), G_SCALAR);
		385	SPAGAIN;
		386
		387	// catch this surprisingly common error
		388	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		389	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		390
		391	encode_sv (enc, POPs);
		392
		393	PUTBACK;
		394
		395	FREETMPS; LEAVE;
		396	}
		397	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		398	{
		399	dSP;
		400
		401	ENTER; SAVETMPS; PUSHMARK (SP);
		402	EXTEND (SP, 2);
		403	// we re-bless the reference to get overload and other niceties right
		404	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		405	PUSHs (sv_cbor);
		406
		407	PUTBACK;
		408	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		409	SPAGAIN;
		410
		411	// catch this surprisingly common error
		412	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
		413	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
		414
		415	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		416	encode_uint (enc, 0x80, count + 1);
		417	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		418
		419	while (count)
		420	encode_sv (enc, SP[1 - count--]);
		421
		422	PUTBACK;
		423
		424	FREETMPS; LEAVE;
		425	}
255	else	426	else
256	{
257	#if 0 //TODO
258	if (enc->cbor.flags & F_CONV_BLESSED)
259	{
260	// we re-bless the reference to get overload and other niceties right
261	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
262
263	if (to_cbor)
264	{
265	dSP;
266
267	ENTER; SAVETMPS; PUSHMARK (SP);
268	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
269
270	// calling with G_SCALAR ensures that we always get a 1 return value
271	PUTBACK;
272	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
273	SPAGAIN;
274
275	// catch this surprisingly common error
276	if (SvROK (TOPs) && SvRV (TOPs) == sv)
277	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
278
279	sv = POPs;
280	PUTBACK;
281
282	encode_sv (enc, sv);
283
284	FREETMPS; LEAVE;
285	}
286	else if (enc->cbor.flags & F_ALLOW_BLESSED)
287	encode_str (enc, "null", 4, 0);
288	else
289	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",	427	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
290	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
291	}
292	else if (enc->cbor.flags & F_ALLOW_BLESSED)
293	encode_str (enc, "null", 4, 0);
294	else
295	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
296	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	428	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
297	#endif
298	}
299	}	429	}
300	else if (svt == SVt_PVHV)	430	else if (svt == SVt_PVHV)
301	encode_hv (enc, (HV *)sv);	431	encode_hv (enc, (HV *)sv);
302	else if (svt == SVt_PVAV)	432	else if (svt == SVt_PVAV)
303	encode_av (enc, (AV *)sv);	433	encode_av (enc, (AV *)sv);
304	else if (svt < SVt_PVAV)
305	{
306	STRLEN len = 0;
307	char *pv = svt ? SvPV (sv, len) : 0;
308
309	if (len == 1 && *pv == '1')
310	encode_ch (enc, 0xe0 \| 21);
311	else if (len == 1 && *pv == '0')
312	encode_ch (enc, 0xe0 \| 20);
313	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
314	encode_ch (enc, 0xe0 \| 23);
315	else
316	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
317	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
318	}
319	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
320	encode_ch (enc, 0xe0 \| 23);
321	else	434	else
322	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	435	{
323	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	436	encode_tag (enc, CBOR_TAG_INDIRECTION);
		437	encode_sv (enc, sv);
		438	}
324	}	439	}
325		440
326	static void	441	static void
327	encode_nv (enc_t enc, SV sv)	442	encode_nv (enc_t enc, SV sv)
328	{	443	{
329	double nv = SvNVX (sv);	444	double nv = SvNVX (sv);
330		445
331	need (enc, 9);	446	need (enc, 9);
332		447
333	if (expect_false (nv == (U32)nv))	448	if (ecb_expect_false (nv == (U32)nv))
334	encode_uint (enc, 0x00, (U32)nv);	449	encode_uint (enc, 0x00, (U32)nv);
335	//TODO: maybe I32?	450	//TODO: maybe I32?
336	else if (expect_false (nv == (float)nv))	451	else if (ecb_expect_false (nv == (float)nv))
337	{	452	{
338	uint32_t fp = ecb_float_to_binary32 (nv);	453	uint32_t fp = ecb_float_to_binary32 (nv);
339		454
340	*enc->cur++ = 0xe0 \| 26;	455	*enc->cur++ = 0xe0 \| 26;
341		456
…		…
393	}	508	}
394		509
395	static SV *	510	static SV *
396	encode_cbor (SV scalar, CBOR cbor)	511	encode_cbor (SV scalar, CBOR cbor)
397	{	512	{
398	enc_t enc;	513	enc_t enc = { };
399		514
400	enc.cbor = *cbor;	515	enc.cbor = *cbor;
401	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	516	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
402	enc.cur = SvPVX (enc.sv);	517	enc.cur = SvPVX (enc.sv);
403	enc.end = SvEND (enc.sv);	518	enc.end = SvEND (enc.sv);
404	enc.depth = 0;
405		519
406	SvPOK_only (enc.sv);	520	SvPOK_only (enc.sv);
		521
		522	if (cbor->flags & F_ALLOW_STRINGREF)
		523	{
		524	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		525	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		526	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		527	}
		528
407	encode_sv (&enc, scalar);	529	encode_sv (&enc, scalar);
408		530
409	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	531	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
410	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	532	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
411		533
…		…
425	U8 *end; // end of input string	547	U8 *end; // end of input string
426	const char *err; // parse error, if != 0	548	const char *err; // parse error, if != 0
427	CBOR cbor;	549	CBOR cbor;
428	U32 depth; // recursion depth	550	U32 depth; // recursion depth
429	U32 maxdepth; // recursion depth limit	551	U32 maxdepth; // recursion depth limit
		552	AV *shareable;
		553	AV *stringref;
		554	SV *decode_tagged;
430	} dec_t;	555	} dec_t;
431		556
432	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	557	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
433		558
434	#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data");	559	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
435		560
436	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)	561	#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
437	#define DEC_DEC_DEPTH --dec->depth	562	#define DEC_DEC_DEPTH --dec->depth
438		563
439	static UV	564	static UV
…		…
528	SvREFCNT_dec (av);	653	SvREFCNT_dec (av);
529	DEC_DEC_DEPTH;	654	DEC_DEC_DEPTH;
530	return &PL_sv_undef;	655	return &PL_sv_undef;
531	}	656	}
532		657
		658	static void
		659	decode_he (dec_t dec, HV hv)
		660	{
		661	// for speed reasons, we specialcase single-string
		662	// byte or utf-8 strings as keys, but only when !stringref
		663
		664	if (ecb_expect_true (!dec->stringref))
		665	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		666	{
		667	I32 len = decode_uint (dec);
		668	char key = (char )dec->cur;
		669
		670	dec->cur += len;
		671
		672	if (ecb_expect_false (dec->stringref))
		673	av_push (dec->stringref, newSVpvn (key, len));
		674
		675	hv_store (hv, key, len, decode_sv (dec), 0);
		676
		677	return;
		678	}
		679	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		680	{
		681	I32 len = decode_uint (dec);
		682	char key = (char )dec->cur;
		683
		684	dec->cur += len;
		685
		686	if (ecb_expect_false (dec->stringref))
		687	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		688
		689	hv_store (hv, key, -len, decode_sv (dec), 0);
		690
		691	return;
		692	}
		693
		694	SV *k = decode_sv (dec);
		695	SV *v = decode_sv (dec);
		696
		697	hv_store_ent (hv, k, v, 0);
		698	SvREFCNT_dec (k);
		699	}
		700
533	static SV *	701	static SV *
534	decode_hv (dec_t *dec)	702	decode_hv (dec_t *dec)
535	{	703	{
536	HV *hv = newHV ();	704	HV *hv = newHV ();
537		705
…		…
549	{	717	{
550	++dec->cur;	718	++dec->cur;
551	break;	719	break;
552	}	720	}
553		721
554	SV *k = decode_sv (dec);	722	decode_he (dec, hv);
555	SV *v = decode_sv (dec);
556
557	hv_store_ent (hv, k, v, 0);
558	}	723	}
559	}	724	}
560	else	725	else
561	{	726	{
562	int len = decode_uint (dec);	727	int pairs = decode_uint (dec);
563		728
564	while (len--)	729	while (pairs--)
565	{	730	decode_he (dec, hv);
566	SV *k = decode_sv (dec);
567	SV *v = decode_sv (dec);
568
569	hv_store_ent (hv, k, v, 0);
570	}
571	}	731	}
572		732
573	DEC_DEC_DEPTH;	733	DEC_DEC_DEPTH;
574	return newRV_noinc ((SV *)hv);	734	return newRV_noinc ((SV *)hv);
575
576	#if 0
577	SV *sv;
578	HV *hv = newHV ();
579
580	DEC_INC_DEPTH;
581	decode_ws (dec);
582
583	for (;;)
584	{
585	// heuristic: assume that
586	// a) decode_str + hv_store_ent are abysmally slow.
587	// b) most hash keys are short, simple ascii text.
588	// => try to "fast-match" such strings to avoid
589	// the overhead of decode_str + hv_store_ent.
590	{
591	SV *value;
592	char *p = dec->cur;
593	char *e = p + 24; // only try up to 24 bytes
594
595	for (;;)
596	{
597	// the >= 0x80 is false on most architectures
598	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
599	{
600	// slow path, back up and use decode_str
601	SV *key = decode_str (dec);
602	if (!key)
603	goto fail;
604
605	decode_ws (dec); EXPECT_CH (':');
606
607	decode_ws (dec);
608	value = decode_sv (dec);
609	if (!value)
610	{
611	SvREFCNT_dec (key);
612	goto fail;
613	}
614
615	hv_store_ent (hv, key, value, 0);
616	SvREFCNT_dec (key);
617
618	break;
619	}
620	else if (*p == '"')
621	{
622	// fast path, got a simple key
623	char *key = dec->cur;
624	int len = p - key;
625	dec->cur = p + 1;
626
627	decode_ws (dec); EXPECT_CH (':');
628
629	decode_ws (dec);
630	value = decode_sv (dec);
631	if (!value)
632	goto fail;
633
634	hv_store (hv, key, len, value, 0);
635
636	break;
637	}
638
639	++p;
640	}
641	}
642
643	decode_ws (dec);
644
645	if (*dec->cur == '}')
646	{
647	++dec->cur;
648	break;
649	}
650
651	if (*dec->cur != ',')
652	ERR (", or } expected while parsing object/hash");
653
654	++dec->cur;
655
656	decode_ws (dec);
657
658	if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
659	{
660	++dec->cur;
661	break;
662	}
663	}
664
665	DEC_DEC_DEPTH;
666	sv = newRV_noinc ((SV *)hv);
667
668	// check filter callbacks
669	if (dec->cbor.flags & F_HOOK)
670	{
671	if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
672	{
673	HE cb, he;
674
675	hv_iterinit (hv);
676	he = hv_iternext (hv);
677	hv_iterinit (hv);
678
679	// the next line creates a mortal sv each time its called.
680	// might want to optimise this for common cases.
681	cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
682
683	if (cb)
684	{
685	dSP;
686	int count;
687
688	ENTER; SAVETMPS; PUSHMARK (SP);
689	XPUSHs (HeVAL (he));
690	sv_2mortal (sv);
691
692	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
693
694	if (count == 1)
695	{
696	sv = newSVsv (POPs);
697	FREETMPS; LEAVE;
698	return sv;
699	}
700
701	SvREFCNT_inc (sv);
702	FREETMPS; LEAVE;
703	}
704	}
705
706	if (dec->cbor.cb_object)
707	{
708	dSP;
709	int count;
710
711	ENTER; SAVETMPS; PUSHMARK (SP);
712	XPUSHs (sv_2mortal (sv));
713
714	PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
715
716	if (count == 1)
717	{
718	sv = newSVsv (POPs);
719	FREETMPS; LEAVE;
720	return sv;
721	}
722
723	SvREFCNT_inc (sv);
724	FREETMPS; LEAVE;
725	}
726	}
727
728	return sv;
729	#endif
730		735
731	fail:	736	fail:
732	SvREFCNT_dec (hv);	737	SvREFCNT_dec (hv);
733	DEC_DEC_DEPTH;	738	DEC_DEC_DEPTH;
734	return &PL_sv_undef;	739	return &PL_sv_undef;
735	}	740	}
736		741
737	static SV *	742	static SV *
738	decode_str (dec_t *dec, int utf8)	743	decode_str (dec_t *dec, int utf8)
739	{	744	{
740	SV *sv;	745	SV *sv = 0;
741		746
742	if ((*dec->cur & 31) == 31)	747	if ((*dec->cur & 31) == 31)
743	{	748	{
744	++dec->cur;	749	++dec->cur;
745		750
…		…
754	{	759	{
755	++dec->cur;	760	++dec->cur;
756	break;	761	break;
757	}	762	}
758		763
759	SV *sv2 = decode_sv (dec);
760	sv_catsv (sv, sv2);	764	sv_catsv (sv, decode_sv (dec));
761	}	765	}
762	}	766	}
763	else	767	else
764	{	768	{
765	STRLEN len = decode_uint (dec);	769	STRLEN len = decode_uint (dec);
766		770
767	WANT (len);	771	WANT (len);
768	sv = newSVpvn (dec->cur, len);	772	sv = newSVpvn (dec->cur, len);
769	dec->cur += len;	773	dec->cur += len;
		774
		775	if (ecb_expect_false (dec->stringref)
		776	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		777	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
770	}	778	}
771		779
772	if (utf8)	780	if (utf8)
773	SvUTF8_on (sv);	781	SvUTF8_on (sv);
774		782
775	return sv;	783	return sv;
776		784
777	fail:	785	fail:
		786	SvREFCNT_dec (sv);
778	return &PL_sv_undef;	787	return &PL_sv_undef;
779	}	788	}
780		789
781	static SV *	790	static SV *
782	decode_tagged (dec_t *dec)	791	decode_tagged (dec_t *dec)
783	{	792	{
		793	SV *sv = 0;
784	UV tag = decode_uint (dec);	794	UV tag = decode_uint (dec);
		795
		796	WANT (1);
		797
		798	switch (tag)
		799	{
		800	case CBOR_TAG_MAGIC:
		801	sv = decode_sv (dec);
		802	break;
		803
		804	case CBOR_TAG_INDIRECTION:
		805	sv = newRV_noinc (decode_sv (dec));
		806	break;
		807
		808	case CBOR_TAG_STRINGREF_NAMESPACE:
		809	{
		810	ENTER; SAVETMPS;
		811
		812	SAVESPTR (dec->stringref);
		813	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		814
		815	sv = decode_sv (dec);
		816
		817	FREETMPS; LEAVE;
		818	}
		819	break;
		820
		821	case CBOR_TAG_STRINGREF:
		822	{
		823	if ((*dec->cur >> 5) != 0)
		824	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		825
		826	UV idx = decode_uint (dec);
		827
		828	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		829	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		830
		831	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		832	}
		833	break;
		834
		835	case CBOR_TAG_VALUE_SHAREABLE:
		836	{
		837	if (ecb_expect_false (!dec->shareable))
		838	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		839
		840	sv = newSV (0);
		841	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		842
785	SV *sv = decode_sv (dec);	843	SV *osv = decode_sv (dec);
		844	sv_setsv (sv, osv);
		845	SvREFCNT_dec_NN (osv);
		846	}
		847	break;
786		848
787	if (tag == 55799) // 2.4.5 Self-Describe CBOR	849	case CBOR_TAG_VALUE_SHAREDREF:
		850	{
		851	if ((*dec->cur >> 5) != 0)
		852	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		853
		854	UV idx = decode_uint (dec);
		855
		856	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		857	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		858
		859	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		860	}
		861	break;
		862
		863	case CBOR_TAG_PERL_OBJECT:
		864	{
		865	sv = decode_sv (dec);
		866
		867	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		868	ERR ("corrupted CBOR data (non-array perl object)");
		869
		870	AV av = (AV )SvRV (sv);
		871	int len = av_len (av) + 1;
		872	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		873
		874	if (!stash)
		875	ERR ("cannot decode perl-object (package does not exist)");
		876
		877	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		878
		879	if (!method)
		880	ERR ("cannot decode perl-object (package does not have a THAW method)");
		881
		882	dSP;
		883
		884	ENTER; SAVETMPS; PUSHMARK (SP);
		885	EXTEND (SP, len + 1);
		886	// we re-bless the reference to get overload and other niceties right
		887	PUSHs (*av_fetch (av, 0, 1));
		888	PUSHs (sv_cbor);
		889
		890	int i;
		891
		892	for (i = 1; i < len; ++i)
		893	PUSHs (*av_fetch (av, i, 1));
		894
		895	PUTBACK;
		896	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		897	SPAGAIN;
		898
		899	if (SvTRUE (ERRSV))
		900	{
		901	FREETMPS; LEAVE;
		902	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		903	}
		904
		905	SvREFCNT_dec (sv);
		906	sv = SvREFCNT_inc (POPs);
		907
		908	PUTBACK;
		909
		910	FREETMPS; LEAVE;
		911	}
		912	break;
		913
		914	default:
		915	{
		916	sv = decode_sv (dec);
		917
		918	dSP;
		919	ENTER; SAVETMPS; PUSHMARK (SP);
		920	EXTEND (SP, 2);
		921	PUSHs (newSVuv (tag));
		922	PUSHs (sv);
		923
		924	PUTBACK;
		925	int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY \| G_EVAL);
		926	SPAGAIN;
		927
		928	if (SvTRUE (ERRSV))
		929	{
		930	FREETMPS; LEAVE;
		931	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		932	}
		933
		934	if (count)
		935	{
		936	SvREFCNT_dec (sv);
		937	sv = SvREFCNT_inc (POPs);
		938	}
		939	else
		940	{
		941	AV *av = newAV ();
		942	av_push (av, newSVuv (tag));
		943	av_push (av, sv);
		944
		945	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		946	? cbor_tagged_stash
		947	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		948	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		949	}
		950
		951	PUTBACK;
		952
		953	FREETMPS; LEAVE;
		954	}
		955	break;
		956	}
		957
788	return sv;	958	return sv;
789		959
790	AV *av = newAV ();	960	fail:
791	av_push (av, newSVuv (tag));	961	SvREFCNT_dec (sv);
792	av_push (av, sv);	962	return &PL_sv_undef;
793	return newRV_noinc ((SV *)av);
794	}	963	}
795		964
796	static SV *	965	static SV *
797	decode_sv (dec_t *dec)	966	decode_sv (dec_t *dec)
798	{	967	{
799	WANT (1);	968	WANT (1);
800		969
801	switch (*dec->cur >> 5)	970	switch (*dec->cur >> 5)
802	{	971	{
803	case 0: // unsigned int	972	case 0: // unsigned int
804	//TODO: 64 bit values on 3 2bit perls
805	return newSVuv (decode_uint (dec));	973	return newSVuv (decode_uint (dec));
806	case 1: // negative int	974	case 1: // negative int
807	return newSViv (-1 - (IV)decode_uint (dec));	975	return newSViv (-1 - (IV)decode_uint (dec));
808	case 2: // octet string	976	case 2: // octet string
809	return decode_str (dec, 0);	977	return decode_str (dec, 0);
…		…
818	case 7: // misc	986	case 7: // misc
819	switch (*dec->cur++ & 31)	987	switch (*dec->cur++ & 31)
820	{	988	{
821	case 20:	989	case 20:
822	#if CBOR_SLOW	990	#if CBOR_SLOW
823	cbor_false = get_bool ("CBOR::XS::false");	991	types_false = get_bool ("Types::Serialiser::false");
824	#endif	992	#endif
825	return newSVsv (cbor_false);	993	return newSVsv (types_false);
826	case 21:	994	case 21:
827	#if CBOR_SLOW	995	#if CBOR_SLOW
828	cbor_true = get_bool ("CBOR::XS::true");	996	types_true = get_bool ("Types::Serialiser::true");
829	#endif	997	#endif
830	return newSVsv (cbor_true);	998	return newSVsv (types_true);
831	case 22:	999	case 22:
832	return newSVsv (&PL_sv_undef);	1000	return newSVsv (&PL_sv_undef);
		1001	case 23:
		1002	#if CBOR_SLOW
		1003	types_error = get_bool ("Types::Serialiser::error");
		1004	#endif
		1005	return newSVsv (types_error);
833		1006
834	case 25:	1007	case 25:
835	{	1008	{
836	WANT (2);	1009	WANT (2);
837		1010
…		…
873	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	1046	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
874	}	1047	}
875		1048
876	break;	1049	break;
877	}	1050	}
878	#if 0
879	switch (*dec->cur)
880	{
881	//case '"': ++dec->cur; return decode_str (dec);
882	case '[': ++dec->cur; return decode_av (dec);
883	case '{': ++dec->cur; return decode_hv (dec);
884
885	case '-':
886	case '0': case '1': case '2': case '3': case '4':
887	case '5': case '6': case '7': case '8': case '9':
888	//TODO return decode_num (dec);
889
890	case 't':
891	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
892	{
893	dec->cur += 4;
894	#if CBOR_SLOW
895	cbor_true = get_bool ("CBOR::XS::true");
896	#endif
897	return newSVsv (cbor_true);
898	}
899	else
900	ERR ("'true' expected");
901
902	break;
903
904	case 'f':
905	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
906	{
907	dec->cur += 5;
908	#if CBOR_SLOW
909	cbor_false = get_bool ("CBOR::XS::false");
910	#endif
911	return newSVsv (cbor_false);
912	}
913	else
914	ERR ("'false' expected");
915
916	break;
917
918	case 'n':
919	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
920	{
921	dec->cur += 4;
922	return newSVsv (&PL_sv_undef);
923	}
924	else
925	ERR ("'null' expected");
926
927	break;
928
929	default:
930	ERR ("malformed CBOR string, neither array, object, number, string or atom");
931	break;
932	}
933	#endif
934		1051
935	fail:	1052	fail:
936	return &PL_sv_undef;	1053	return &PL_sv_undef;
937	}	1054	}
938		1055
939	static SV *	1056	static SV *
940	decode_cbor (SV string, CBOR cbor, char **offset_return)	1057	decode_cbor (SV string, CBOR cbor, char **offset_return)
941	{	1058	{
942	dec_t dec;	1059	dec_t dec = { };
943	SV *sv;	1060	SV *sv;
		1061	STRLEN len;
		1062	char *data = SvPVbyte (string, len);
944		1063
945	/* work around bugs in 5.10 where manipulating magic values
946	* makes perl ignore the magic in subsequent accesses.
947	* also make a copy of non-PV values, to get them into a clean
948	* state (SvPV should do that, but it's buggy, see below).
949	*/
950	/SvGETMAGIC (string);/
951	if (SvMAGICAL (string) \|\| !SvPOK (string))
952	string = sv_2mortal (newSVsv (string));
953
954	SvUPGRADE (string, SVt_PV);
955
956	/* work around a bug in perl 5.10, which causes SvCUR to fail an
957	* assertion with -DDEBUGGING, although SvCUR is documented to
958	* return the xpv_cur field which certainly exists after upgrading.
959	* according to nicholas clark, calling SvPOK fixes this.
960	* But it doesn't fix it, so try another workaround, call SvPV_nolen
961	* and hope for the best.
962	* Damnit, SvPV_nolen still trips over yet another assertion. This
963	* assertion business is seriously broken, try yet another workaround
964	* for the broken -DDEBUGGING.
965	*/
966	{
967	#ifdef DEBUGGING
968	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
969	#else
970	STRLEN offset = SvCUR (string);
971	#endif
972
973	if (offset > cbor->max_size && cbor->max_size)	1064	if (len > cbor->max_size && cbor->max_size)
974	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1065	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
975	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1066	(unsigned long)len, (unsigned long)cbor->max_size);
976	}
977
978	sv_utf8_downgrade (string, 0);
979		1067
980	dec.cbor = *cbor;	1068	dec.cbor = *cbor;
981	dec.cur = (U8 *)SvPVX (string);	1069	dec.cur = (U8 *)data;
982	dec.end = (U8 *)SvEND (string);	1070	dec.end = (U8 *)data + len;
983	dec.err = 0;
984	dec.depth = 0;
985
986	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
987	;//TODO dec.cbor.flags \|= F_HOOK;
988		1071
989	sv = decode_sv (&dec);	1072	sv = decode_sv (&dec);
990		1073
991	if (offset_return)	1074	if (offset_return)
992	*offset_return = dec.cur;	1075	*offset_return = dec.cur;
…		…
996	dec.err = "garbage after CBOR object";	1079	dec.err = "garbage after CBOR object";
997		1080
998	if (dec.err)	1081	if (dec.err)
999	{	1082	{
1000	SvREFCNT_dec (sv);	1083	SvREFCNT_dec (sv);
1001	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1084	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
1002	}	1085	}
1003		1086
1004	sv = sv_2mortal (sv);	1087	sv = sv_2mortal (sv);
1005		1088
1006	return sv;	1089	return sv;
…		…
1012	MODULE = CBOR::XS PACKAGE = CBOR::XS	1095	MODULE = CBOR::XS PACKAGE = CBOR::XS
1013		1096
1014	BOOT:	1097	BOOT:
1015	{	1098	{
1016	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	1099	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1017	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	1100	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1018		1101
1019	cbor_true = get_bool ("CBOR::XS::true");	1102	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1020	cbor_false = get_bool ("CBOR::XS::false");	1103	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		1104
		1105	types_true = get_bool ("Types::Serialiser::true" );
		1106	types_false = get_bool ("Types::Serialiser::false");
		1107	types_error = get_bool ("Types::Serialiser::error");
		1108
		1109	default_filter = newSVpv ("CBOR::XS::default_filter", 0);
		1110
		1111	sv_cbor = newSVpv ("CBOR", 0);
		1112	SvREADONLY_on (sv_cbor);
1021	}	1113	}
1022		1114
1023	PROTOTYPES: DISABLE	1115	PROTOTYPES: DISABLE
1024		1116
1025	void CLONE (...)	1117	void CLONE (...)
1026	CODE:	1118	CODE:
1027	cbor_stash = 0;	1119	cbor_stash = 0;
		1120	cbor_tagged_stash = 0;
		1121	types_error_stash = 0;
1028	cbor_boolean_stash = 0;	1122	types_boolean_stash = 0;
1029		1123
1030	void new (char *klass)	1124	void new (char *klass)
1031	PPCODE:	1125	PPCODE:
1032	{	1126	{
1033	SV *pv = NEWSV (0, sizeof (CBOR));	1127	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1041		1135
1042	void shrink (CBOR *self, int enable = 1)	1136	void shrink (CBOR *self, int enable = 1)
1043	ALIAS:	1137	ALIAS:
1044	shrink = F_SHRINK	1138	shrink = F_SHRINK
1045	allow_unknown = F_ALLOW_UNKNOWN	1139	allow_unknown = F_ALLOW_UNKNOWN
		1140	allow_sharing = F_ALLOW_SHARING
		1141	allow_stringref = F_ALLOW_STRINGREF
1046	PPCODE:	1142	PPCODE:
1047	{	1143	{
1048	if (enable)	1144	if (enable)
1049	self->flags \|= ix;	1145	self->flags \|= ix;
1050	else	1146	else
…		…
1055		1151
1056	void get_shrink (CBOR *self)	1152	void get_shrink (CBOR *self)
1057	ALIAS:	1153	ALIAS:
1058	get_shrink = F_SHRINK	1154	get_shrink = F_SHRINK
1059	get_allow_unknown = F_ALLOW_UNKNOWN	1155	get_allow_unknown = F_ALLOW_UNKNOWN
		1156	get_allow_sharing = F_ALLOW_SHARING
		1157	get_allow_stringref = F_ALLOW_STRINGREF
1060	PPCODE:	1158	PPCODE:
1061	XPUSHs (boolSV (self->flags & ix));	1159	XPUSHs (boolSV (self->flags & ix));
1062		1160
1063	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1161	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1064	PPCODE:	1162	PPCODE:
…		…
1080	CODE:	1178	CODE:
1081	RETVAL = self->max_size;	1179	RETVAL = self->max_size;
1082	OUTPUT:	1180	OUTPUT:
1083	RETVAL	1181	RETVAL
1084		1182
1085	#if 0 //TODO	1183	void filter (CBOR self, SV filter = 0)
1086
1087	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1088	PPCODE:	1184	PPCODE:
1089	{
1090	SvREFCNT_dec (self->cb_object);	1185	SvREFCNT_dec (self->filter);
1091	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;	1186	self->filter = filter ? newSVsv (filter) : filter;
1092
1093	XPUSHs (ST (0));	1187	XPUSHs (ST (0));
1094	}
1095		1188
1096	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)	1189	SV get_filter (CBOR self)
1097	PPCODE:	1190	CODE:
1098	{	1191	RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1099	if (!self->cb_sk_object)	1192	OUTPUT:
1100	self->cb_sk_object = newHV ();	1193	RETVAL
1101
1102	if (SvOK (cb))
1103	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1104	else
1105	{
1106	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1107
1108	if (!HvKEYS (self->cb_sk_object))
1109	{
1110	SvREFCNT_dec (self->cb_sk_object);
1111	self->cb_sk_object = 0;
1112	}
1113	}
1114
1115	XPUSHs (ST (0));
1116	}
1117
1118	#endif
1119		1194
1120	void encode (CBOR self, SV scalar)	1195	void encode (CBOR self, SV scalar)
1121	PPCODE:	1196	PPCODE:
1122	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1197	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1123	XPUSHs (scalar);	1198	XPUSHs (scalar);
…		…
1137	PUSHs (sv);	1212	PUSHs (sv);
1138	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1213	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1139	}	1214	}
1140		1215
1141	void DESTROY (CBOR *self)	1216	void DESTROY (CBOR *self)
1142	CODE:	1217	PPCODE:
1143	SvREFCNT_dec (self->cb_sk_object);	1218	cbor_free (self);
1144	SvREFCNT_dec (self->cb_object);
1145		1219
1146	PROTOTYPES: ENABLE	1220	PROTOTYPES: ENABLE
1147		1221
1148	void encode_cbor (SV *scalar)	1222	void encode_cbor (SV *scalar)
1149	PPCODE:	1223	PPCODE:

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs. Revision 1.27 by root, Fri Nov 22 15:28:38 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.27 by root, Fri Nov 22 15:28:38 2013 UTC