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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs.
Revision 1.19 by root, Wed Nov 20 02:03:09 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_DEDUP_STRINGS 0x00000008UL //TODO
		63	#define F_DEDUP_KEYS 0x00000010UL //TODO
16		64
17	#define INIT_SIZE 32 // initial scalar size to be allocated	65	#define INIT_SIZE 32 // initial scalar size to be allocated
18		66
19	#define SB do {	67	#define SB do {
20	#define SE } while (0)	68	#define SE } while (0)
…		…
31	#else	79	#else
32	# define CBOR_SLOW 0	80	# define CBOR_SLOW 0
33	# define CBOR_STASH cbor_stash	81	# define CBOR_STASH cbor_stash
34	#endif	82	#endif
35		83
36	static HV cbor_stash, cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::	84	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
37	static SV cbor_true, cbor_false;	85	static SV types_true, types_false, types_error, sv_cbor;
38		86
39	typedef struct {	87	typedef struct {
40	U32 flags;	88	U32 flags;
41	U32 max_depth;	89	U32 max_depth;
42	STRLEN max_size;	90	STRLEN max_size;
…		…
77	#endif	125	#endif
78	}	126	}
79	}	127	}
80		128
81	/////////////////////////////////////////////////////////////////////////////	129	/////////////////////////////////////////////////////////////////////////////
82	// fp hell
83
84	//TODO
85
86	/////////////////////////////////////////////////////////////////////////////
87	// encoder	130	// encoder
88		131
89	// structure used for encoding CBOR	132	// structure used for encoding CBOR
90	typedef struct	133	typedef struct
91	{	134	{
92	char *cur; // SvPVX (sv) + current output position	135	char *cur; // SvPVX (sv) + current output position
93	char *end; // SvEND (sv)	136	char *end; // SvEND (sv)
94	SV *sv; // result scalar	137	SV *sv; // result scalar
95	CBOR cbor;	138	CBOR cbor;
96	U32 depth; // recursion level	139	U32 depth; // recursion level
		140	HV *stringref; // string => index, or 0
		141	HV *shareable; // ptr => index, or 0
		142	UV shareable_idx;
97	} enc_t;	143	} enc_t;
98		144
99	ecb_inline void	145	ecb_inline void
100	need (enc_t *enc, STRLEN len)	146	need (enc_t *enc, STRLEN len)
101	{	147	{
…		…
162	need (enc, len);	208	need (enc, len);
163	memcpy (enc->cur, str, len);	209	memcpy (enc->cur, str, len);
164	enc->cur += len;	210	enc->cur += len;
165	}	211	}
166		212
		213	ecb_inline void
		214	encode_tag (enc_t *enc, UV tag)
		215	{
		216	encode_uint (enc, 0xc0, tag);
		217	}
		218
167	static void encode_sv (enc_t enc, SV sv);	219	static void encode_sv (enc_t enc, SV sv);
168		220
169	static void	221	static void
170	encode_av (enc_t enc, AV av)	222	encode_av (enc_t enc, AV av)
171	{	223	{
…		…
223		275
224	// encode objects, arrays and special \0=false and \1=true values.	276	// encode objects, arrays and special \0=false and \1=true values.
225	static void	277	static void
226	encode_rv (enc_t enc, SV sv)	278	encode_rv (enc_t enc, SV sv)
227	{	279	{
228	svtype svt;
229
230	SvGETMAGIC (sv);	280	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
231	svt = SvTYPE (sv);	304	svtype svt = SvTYPE (sv);
232		305
233	if (ecb_expect_false (SvOBJECT (sv)))	306	if (ecb_expect_false (SvOBJECT (sv)))
234	{	307	{
235	HV *boolean_stash = !CBOR_SLOW \|\| cbor_boolean_stash	308	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
236	? cbor_boolean_stash	309	? types_boolean_stash
237	: gv_stashpv ("CBOR::XS::Boolean", 1);	310	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		311	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		312	? types_error_stash
		313	: gv_stashpv ("Types::Serialiser::Error", 1);
238	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
239	? cbor_tagged_stash	315	? cbor_tagged_stash
240	: gv_stashpv ("CBOR::XS::Tagged" , 1);	316	: gv_stashpv ("CBOR::XS::Tagged" , 1);
241		317
		318	HV *stash = SvSTASH (sv);
		319	GV *method;
		320
242	if (SvSTASH (sv) == boolean_stash)	321	if (stash == boolean_stash)
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	322	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		323	else if (stash == error_stash)
		324	encode_ch (enc, 0xe0 \| 23);
244	else if (SvSTASH (sv) == tagged_stash)	325	else if (stash == tagged_stash)
245	{	326	{
246	if (svt != SVt_PVAV)	327	if (svt != SVt_PVAV)
247	croak ("encountered CBOR::XS::Tagged object that isn't an array");	328	croak ("encountered CBOR::XS::Tagged object that isn't an array");
248		329
249	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));	330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
250	encode_sv (enc, av_fetch ((AV )sv, 1, 1));	331	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
251	}	332	}
		333	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		334	{
		335	dSP;
		336
		337	ENTER; SAVETMPS; PUSHMARK (SP);
		338	// we re-bless the reference to get overload and other niceties right
		339	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		340
		341	PUTBACK;
		342	// G_SCALAR ensures that return value is 1
		343	call_sv ((SV *)GvCV (method), G_SCALAR);
		344	SPAGAIN;
		345
		346	// catch this surprisingly common error
		347	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		348	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		349
		350	encode_sv (enc, POPs);
		351
		352	PUTBACK;
		353
		354	FREETMPS; LEAVE;
		355	}
		356	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		357	{
		358	dSP;
		359
		360	ENTER; SAVETMPS; PUSHMARK (SP);
		361	EXTEND (SP, 2);
		362	// we re-bless the reference to get overload and other niceties right
		363	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		364	PUSHs (sv_cbor);
		365
		366	PUTBACK;
		367	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		368	SPAGAIN;
		369
		370	// catch this surprisingly common error
		371	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));
		373
		374	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
		375	encode_uint (enc, 0x80, count + 1);
		376	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		377
		378	while (count)
		379	encode_sv (enc, SP[1 - count--]);
		380
		381	PUTBACK;
		382
		383	FREETMPS; LEAVE;
		384	}
252	else	385	else
253	{
254	// we re-bless the reference to get overload and other niceties right
255	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257	if (to_cbor)
258	{
259	dSP;
260
261	ENTER; SAVETMPS; PUSHMARK (SP);
262	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
263
264	// calling with G_SCALAR ensures that we always get a 1 return value
265	PUTBACK;
266	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
267	SPAGAIN;
268
269	// catch this surprisingly common error
270	if (SvROK (TOPs) && SvRV (TOPs) == sv)
271	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
272
273	sv = POPs;
274	PUTBACK;
275
276	encode_sv (enc, sv);
277
278	FREETMPS; LEAVE;
279	}
280	else
281	croak ("encountered object '%s', but no TO_CBOR method available on it",	386	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	387	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283	}
284	}	388	}
285	else if (svt == SVt_PVHV)	389	else if (svt == SVt_PVHV)
286	encode_hv (enc, (HV *)sv);	390	encode_hv (enc, (HV *)sv);
287	else if (svt == SVt_PVAV)	391	else if (svt == SVt_PVAV)
288	encode_av (enc, (AV *)sv);	392	encode_av (enc, (AV *)sv);
289	else if (svt < SVt_PVAV)
290	{
291	STRLEN len = 0;
292	char *pv = svt ? SvPV (sv, len) : 0;
293
294	if (len == 1 && *pv == '1')
295	encode_ch (enc, 0xe0 \| 21);
296	else if (len == 1 && *pv == '0')
297	encode_ch (enc, 0xe0 \| 20);
298	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299	encode_ch (enc, 0xe0 \| 23);
300	else
301	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303	}
304	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305	encode_ch (enc, 0xe0 \| 23);
306	else	393	else
307	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	394	{
308	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	395	encode_tag (enc, CBOR_TAG_INDIRECTION);
		396	encode_sv (enc, sv);
		397	}
309	}	398	}
310		399
311	static void	400	static void
312	encode_nv (enc_t enc, SV sv)	401	encode_nv (enc_t enc, SV sv)
313	{	402	{
…		…
378	}	467	}
379		468
380	static SV *	469	static SV *
381	encode_cbor (SV scalar, CBOR cbor)	470	encode_cbor (SV scalar, CBOR cbor)
382	{	471	{
383	enc_t enc;	472	enc_t enc = { };
384		473
385	enc.cbor = *cbor;	474	enc.cbor = *cbor;
386	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387	enc.cur = SvPVX (enc.sv);	476	enc.cur = SvPVX (enc.sv);
388	enc.end = SvEND (enc.sv);	477	enc.end = SvEND (enc.sv);
389	enc.depth = 0;
390		478
391	SvPOK_only (enc.sv);	479	SvPOK_only (enc.sv);
392	encode_sv (&enc, scalar);	480	encode_sv (&enc, scalar);
393		481
394	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
410	U8 *end; // end of input string	498	U8 *end; // end of input string
411	const char *err; // parse error, if != 0	499	const char *err; // parse error, if != 0
412	CBOR cbor;	500	CBOR cbor;
413	U32 depth; // recursion depth	501	U32 depth; // recursion depth
414	U32 maxdepth; // recursion depth limit	502	U32 maxdepth; // recursion depth limit
		503	AV *shareable;
415	} dec_t;	504	} dec_t;
416		505
417	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	506	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
418		507
419	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	508	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
513	SvREFCNT_dec (av);	602	SvREFCNT_dec (av);
514	DEC_DEC_DEPTH;	603	DEC_DEC_DEPTH;
515	return &PL_sv_undef;	604	return &PL_sv_undef;
516	}	605	}
517		606
		607	static void
		608	decode_he (dec_t dec, HV hv)
		609	{
		610	// for speed reasons, we specialcase single-string
		611	// byte or utf-8 strings as keys.
		612
		613	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		614	{
		615	I32 len = decode_uint (dec);
		616	char key = (char )dec->cur;
		617
		618	dec->cur += len;
		619
		620	hv_store (hv, key, len, decode_sv (dec), 0);
		621	}
		622	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		623	{
		624	I32 len = decode_uint (dec);
		625	char key = (char )dec->cur;
		626
		627	dec->cur += len;
		628
		629	hv_store (hv, key, -len, decode_sv (dec), 0);
		630	}
		631	else
		632	{
		633	SV *k = decode_sv (dec);
		634	SV *v = decode_sv (dec);
		635
		636	hv_store_ent (hv, k, v, 0);
		637	SvREFCNT_dec (k);
		638	}
		639	}
		640
518	static SV *	641	static SV *
519	decode_hv (dec_t *dec)	642	decode_hv (dec_t *dec)
520	{	643	{
521	HV *hv = newHV ();	644	HV *hv = newHV ();
522		645
…		…
534	{	657	{
535	++dec->cur;	658	++dec->cur;
536	break;	659	break;
537	}	660	}
538		661
539	SV *k = decode_sv (dec);	662	decode_he (dec, hv);
540	SV *v = decode_sv (dec);
541
542	hv_store_ent (hv, k, v, 0);
543	}	663	}
544	}	664	}
545	else	665	else
546	{	666	{
547	int len = decode_uint (dec);	667	int pairs = decode_uint (dec);
548		668
549	while (len--)	669	while (pairs--)
550	{	670	decode_he (dec, hv);
551	SV *k = decode_sv (dec);
552	SV *v = decode_sv (dec);
553
554	hv_store_ent (hv, k, v, 0);
555	}
556	}	671	}
557		672
558	DEC_DEC_DEPTH;	673	DEC_DEC_DEPTH;
559	return newRV_noinc ((SV *)hv);	674	return newRV_noinc ((SV *)hv);
560		675
…		…
609	}	724	}
610		725
611	static SV *	726	static SV *
612	decode_tagged (dec_t *dec)	727	decode_tagged (dec_t *dec)
613	{	728	{
		729	SV *sv = 0;
614	UV tag = decode_uint (dec);	730	UV tag = decode_uint (dec);
		731
		732	WANT (1);
		733
		734	switch (tag)
		735	{
		736	case CBOR_TAG_MAGIC:
		737	return decode_sv (dec);
		738
		739	case CBOR_TAG_INDIRECTION:
		740	return newRV_noinc (decode_sv (dec));
		741
		742	case CBOR_TAG_VALUE_SHAREABLE:
		743	{
		744	if (ecb_expect_false (!dec->shareable))
		745	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		746
		747	sv = newSV (0);
		748	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		749
615	SV *sv = decode_sv (dec);	750	SV *osv = decode_sv (dec);
		751	sv_setsv (sv, osv);
		752	SvREFCNT_dec_NN (osv);
		753	}
616		754
617	if (tag == 55799) // 2.4.5 Self-Describe CBOR
618	return sv;	755	return sv;
619		756
		757	case CBOR_TAG_VALUE_SHAREDREF:
		758	{
		759	if ((*dec->cur >> 5) != 0)
		760	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		761
		762	UV idx = decode_uint (dec);
		763
		764	if (!dec->shareable \|\| idx > AvFILLp (dec->shareable))
		765	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		766
		767	return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		768	}
		769
		770	case CBOR_TAG_PERL_OBJECT:
		771	{
		772	sv = decode_sv (dec);
		773
		774	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		775	ERR ("corrupted CBOR data (non-array perl object)");
		776
		777	AV av = (AV )SvRV (sv);
		778	int len = av_len (av) + 1;
		779	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		780
		781	if (!stash)
		782	ERR ("cannot decode perl-object (package does not exist)");
		783
		784	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		785
		786	if (!method)
		787	ERR ("cannot decode perl-object (package does not have a THAW method)");
		788
		789	dSP;
		790
		791	ENTER; SAVETMPS; PUSHMARK (SP);
		792	EXTEND (SP, len + 1);
		793	// we re-bless the reference to get overload and other niceties right
		794	PUSHs (*av_fetch (av, 0, 1));
		795	PUSHs (sv_cbor);
		796
		797	int i;
		798
		799	for (i = 1; i < len; ++i)
		800	PUSHs (*av_fetch (av, i, 1));
		801
		802	PUTBACK;
		803	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		804	SPAGAIN;
		805
		806	if (SvTRUE (ERRSV))
		807	{
		808	FREETMPS; LEAVE;
		809	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		810	}
		811
		812	SvREFCNT_dec (sv);
		813	sv = SvREFCNT_inc (POPs);
		814
		815	PUTBACK;
		816
		817	FREETMPS; LEAVE;
		818
		819	return sv;
		820	}
		821
		822	default:
		823	{
		824	sv = decode_sv (dec);
		825
620	AV *av = newAV ();	826	AV *av = newAV ();
621	av_push (av, newSVuv (tag));	827	av_push (av, newSVuv (tag));
622	av_push (av, sv);	828	av_push (av, sv);
623	return newRV_noinc ((SV *)av);	829
		830	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		831	? cbor_tagged_stash
		832	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		833
		834	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		835	}
		836	}
		837
		838	fail:
		839	SvREFCNT_dec (sv);
		840	return &PL_sv_undef;
624	}	841	}
625		842
626	static SV *	843	static SV *
627	decode_sv (dec_t *dec)	844	decode_sv (dec_t *dec)
628	{	845	{
…		…
647	case 7: // misc	864	case 7: // misc
648	switch (*dec->cur++ & 31)	865	switch (*dec->cur++ & 31)
649	{	866	{
650	case 20:	867	case 20:
651	#if CBOR_SLOW	868	#if CBOR_SLOW
652	cbor_false = get_bool ("CBOR::XS::false");	869	types_false = get_bool ("Types::Serialiser::false");
653	#endif	870	#endif
654	return newSVsv (cbor_false);	871	return newSVsv (types_false);
655	case 21:	872	case 21:
656	#if CBOR_SLOW	873	#if CBOR_SLOW
657	cbor_true = get_bool ("CBOR::XS::true");	874	types_true = get_bool ("Types::Serialiser::true");
658	#endif	875	#endif
659	return newSVsv (cbor_true);	876	return newSVsv (types_true);
660	case 22:	877	case 22:
661	return newSVsv (&PL_sv_undef);	878	return newSVsv (&PL_sv_undef);
		879	case 23:
		880	#if CBOR_SLOW
		881	types_error = get_bool ("Types::Serialiser::error");
		882	#endif
		883	return newSVsv (types_error);
662		884
663	case 25:	885	case 25:
664	{	886	{
665	WANT (2);	887	WANT (2);
666		888
…		…
710	}	932	}
711		933
712	static SV *	934	static SV *
713	decode_cbor (SV string, CBOR cbor, char **offset_return)	935	decode_cbor (SV string, CBOR cbor, char **offset_return)
714	{	936	{
715	dec_t dec;	937	dec_t dec = { };
716	SV *sv;	938	SV *sv;
		939	STRLEN len;
		940	char *data = SvPVbyte (string, len);
717		941
718	/* work around bugs in 5.10 where manipulating magic values
719	* makes perl ignore the magic in subsequent accesses.
720	* also make a copy of non-PV values, to get them into a clean
721	* state (SvPV should do that, but it's buggy, see below).
722	*/
723	/SvGETMAGIC (string);/
724	if (SvMAGICAL (string) \|\| !SvPOK (string))
725	string = sv_2mortal (newSVsv (string));
726
727	SvUPGRADE (string, SVt_PV);
728
729	/* work around a bug in perl 5.10, which causes SvCUR to fail an
730	* assertion with -DDEBUGGING, although SvCUR is documented to
731	* return the xpv_cur field which certainly exists after upgrading.
732	* according to nicholas clark, calling SvPOK fixes this.
733	* But it doesn't fix it, so try another workaround, call SvPV_nolen
734	* and hope for the best.
735	* Damnit, SvPV_nolen still trips over yet another assertion. This
736	* assertion business is seriously broken, try yet another workaround
737	* for the broken -DDEBUGGING.
738	*/
739	{
740	#ifdef DEBUGGING
741	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
742	#else
743	STRLEN offset = SvCUR (string);
744	#endif
745
746	if (offset > cbor->max_size && cbor->max_size)	942	if (len > cbor->max_size && cbor->max_size)
747	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	943	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
748	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	944	(unsigned long)len, (unsigned long)cbor->max_size);
749	}
750
751	sv_utf8_downgrade (string, 0);
752		945
753	dec.cbor = *cbor;	946	dec.cbor = *cbor;
754	dec.cur = (U8 *)SvPVX (string);	947	dec.cur = (U8 *)data;
755	dec.end = (U8 *)SvEND (string);	948	dec.end = (U8 *)data + len;
756	dec.err = 0;
757	dec.depth = 0;
758		949
759	sv = decode_sv (&dec);	950	sv = decode_sv (&dec);
760		951
761	if (offset_return)	952	if (offset_return)
762	*offset_return = dec.cur;	953	*offset_return = dec.cur;
…		…
766	dec.err = "garbage after CBOR object";	957	dec.err = "garbage after CBOR object";
767		958
768	if (dec.err)	959	if (dec.err)
769	{	960	{
770	SvREFCNT_dec (sv);	961	SvREFCNT_dec (sv);
771	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	962	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
772	}	963	}
773		964
774	sv = sv_2mortal (sv);	965	sv = sv_2mortal (sv);
775		966
776	return sv;	967	return sv;
…		…
782	MODULE = CBOR::XS PACKAGE = CBOR::XS	973	MODULE = CBOR::XS PACKAGE = CBOR::XS
783		974
784	BOOT:	975	BOOT:
785	{	976	{
786	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	977	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
787	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
788	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);	978	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
789		979
790	cbor_true = get_bool ("CBOR::XS::true");	980	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
791	cbor_false = get_bool ("CBOR::XS::false");	981	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		982
		983	types_true = get_bool ("Types::Serialiser::true" );
		984	types_false = get_bool ("Types::Serialiser::false");
		985	types_error = get_bool ("Types::Serialiser::error");
		986
		987	sv_cbor = newSVpv ("CBOR", 0);
		988	SvREADONLY_on (sv_cbor);
792	}	989	}
793		990
794	PROTOTYPES: DISABLE	991	PROTOTYPES: DISABLE
795		992
796	void CLONE (...)	993	void CLONE (...)
797	CODE:	994	CODE:
798	cbor_stash = 0;	995	cbor_stash = 0;
799	cbor_boolean_stash = 0;
800	cbor_tagged_stash = 0;	996	cbor_tagged_stash = 0;
		997	types_error_stash = 0;
		998	types_boolean_stash = 0;
801		999
802	void new (char *klass)	1000	void new (char *klass)
803	PPCODE:	1001	PPCODE:
804	{	1002	{
805	SV *pv = NEWSV (0, sizeof (CBOR));	1003	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
813		1011
814	void shrink (CBOR *self, int enable = 1)	1012	void shrink (CBOR *self, int enable = 1)
815	ALIAS:	1013	ALIAS:
816	shrink = F_SHRINK	1014	shrink = F_SHRINK
817	allow_unknown = F_ALLOW_UNKNOWN	1015	allow_unknown = F_ALLOW_UNKNOWN
		1016	allow_sharing = F_ALLOW_SHARING
		1017	dedup_keys = F_DEDUP_KEYS
		1018	dedup_strings = F_DEDUP_STRINGS
818	PPCODE:	1019	PPCODE:
819	{	1020	{
820	if (enable)	1021	if (enable)
821	self->flags \|= ix;	1022	self->flags \|= ix;
822	else	1023	else
…		…
827		1028
828	void get_shrink (CBOR *self)	1029	void get_shrink (CBOR *self)
829	ALIAS:	1030	ALIAS:
830	get_shrink = F_SHRINK	1031	get_shrink = F_SHRINK
831	get_allow_unknown = F_ALLOW_UNKNOWN	1032	get_allow_unknown = F_ALLOW_UNKNOWN
		1033	get_allow_sharing = F_ALLOW_SHARING
		1034	get_dedup_keys = F_DEDUP_KEYS
		1035	get_dedup_strings = F_DEDUP_STRINGS
832	PPCODE:	1036	PPCODE:
833	XPUSHs (boolSV (self->flags & ix));	1037	XPUSHs (boolSV (self->flags & ix));
834		1038
835	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
836	PPCODE:	1040	PPCODE:
…		…
851	int get_max_size (CBOR *self)	1055	int get_max_size (CBOR *self)
852	CODE:	1056	CODE:
853	RETVAL = self->max_size;	1057	RETVAL = self->max_size;
854	OUTPUT:	1058	OUTPUT:
855	RETVAL	1059	RETVAL
856
857	#if 0 //TODO
858
859	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
860	PPCODE:
861	{
862	SvREFCNT_dec (self->cb_object);
863	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
864
865	XPUSHs (ST (0));
866	}
867
868	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
869	PPCODE:
870	{
871	if (!self->cb_sk_object)
872	self->cb_sk_object = newHV ();
873
874	if (SvOK (cb))
875	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
876	else
877	{
878	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
879
880	if (!HvKEYS (self->cb_sk_object))
881	{
882	SvREFCNT_dec (self->cb_sk_object);
883	self->cb_sk_object = 0;
884	}
885	}
886
887	XPUSHs (ST (0));
888	}
889
890	#endif
891		1060
892	void encode (CBOR self, SV scalar)	1061	void encode (CBOR self, SV scalar)
893	PPCODE:	1062	PPCODE:
894	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1063	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
895	XPUSHs (scalar);	1064	XPUSHs (scalar);
…		…
908	EXTEND (SP, 2);	1077	EXTEND (SP, 2);
909	PUSHs (sv);	1078	PUSHs (sv);
910	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
911	}	1080	}
912		1081
913	#if 0
914
915	void DESTROY (CBOR *self)
916	CODE:
917	SvREFCNT_dec (self->cb_sk_object);
918	SvREFCNT_dec (self->cb_object);
919
920	#endif
921
922	PROTOTYPES: ENABLE	1082	PROTOTYPES: ENABLE
923		1083
924	void encode_cbor (SV *scalar)	1084	void encode_cbor (SV *scalar)
925	PPCODE:	1085	PPCODE:
926	{	1086	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs. Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.6 by root, Sat Oct 26 22:25:47 2013 UTC vs.
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC