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

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 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::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;
43
44	SV *cb_object;
45	HV *cb_sk_object;
46	} CBOR;	91	} CBOR;
47		92
48	ecb_inline void	93	ecb_inline void
49	cbor_init (CBOR *cbor)	94	cbor_init (CBOR *cbor)
50	{	95	{
…		…
80	#endif	125	#endif
81	}	126	}
82	}	127	}
83		128
84	/////////////////////////////////////////////////////////////////////////////	129	/////////////////////////////////////////////////////////////////////////////
85	// fp hell
86
87	//TODO
88
89	/////////////////////////////////////////////////////////////////////////////
90	// encoder	130	// encoder
91		131
92	// structure used for encoding CBOR	132	// structure used for encoding CBOR
93	typedef struct	133	typedef struct
94	{	134	{
95	char *cur; // SvPVX (sv) + current output position	135	char *cur; // SvPVX (sv) + current output position
96	char *end; // SvEND (sv)	136	char *end; // SvEND (sv)
97	SV *sv; // result scalar	137	SV *sv; // result scalar
98	CBOR cbor;	138	CBOR cbor;
99	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;
100	} enc_t;	143	} enc_t;
101		144
102	ecb_inline void	145	ecb_inline void
103	need (enc_t *enc, STRLEN len)	146	need (enc_t *enc, STRLEN len)
104	{	147	{
…		…
165	need (enc, len);	208	need (enc, len);
166	memcpy (enc->cur, str, len);	209	memcpy (enc->cur, str, len);
167	enc->cur += len;	210	enc->cur += len;
168	}	211	}
169		212
		213	ecb_inline void
		214	encode_tag (enc_t *enc, UV tag)
		215	{
		216	encode_uint (enc, 0xc0, tag);
		217	}
		218
170	static void encode_sv (enc_t enc, SV sv);	219	static void encode_sv (enc_t enc, SV sv);
171		220
172	static void	221	static void
173	encode_av (enc_t enc, AV av)	222	encode_av (enc_t enc, AV av)
174	{	223	{
…		…
226		275
227	// encode objects, arrays and special \0=false and \1=true values.	276	// encode objects, arrays and special \0=false and \1=true values.
228	static void	277	static void
229	encode_rv (enc_t enc, SV sv)	278	encode_rv (enc_t enc, SV sv)
230	{	279	{
231	svtype svt;
232
233	SvGETMAGIC (sv);	280	SvGETMAGIC (sv);
234	svt = SvTYPE (sv);
235		281
		282	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
236	if (ecb_expect_false (SvOBJECT (sv)))	283	&& ecb_expect_false (SvREFCNT (sv) > 1))
237	{	284	{
238	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	285	if (!enc->shareable)
239	? cbor_boolean_stash	286	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
240	: gv_stashpv ("CBOR::XS::Boolean", 1);
241		287
242	if (SvSTASH (sv) == stash)	288	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	289
		290	if (SvOK (*svp))
		291	{
		292	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		293	encode_uint (enc, 0x00, SvUV (*svp));
		294	return;
		295	}
244	else	296	else
245	{	297	{
246	#if 0 //TODO	298	sv_setuv (*svp, enc->shareable_idx);
247	if (enc->cbor.flags & F_CONV_BLESSED)	299	++enc->shareable_idx;
248	{	300	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
249	// we re-bless the reference to get overload and other niceties right
250	GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
251
252	if (to_cbor)
253	{
254	dSP;
255
256	ENTER; SAVETMPS; PUSHMARK (SP);
257	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
258
259	// calling with G_SCALAR ensures that we always get a 1 return value
260	PUTBACK;
261	call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
262	SPAGAIN;
263
264	// catch this surprisingly common error
265	if (SvROK (TOPs) && SvRV (TOPs) == sv)
266	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
267
268	sv = POPs;
269	PUTBACK;
270
271	encode_sv (enc, sv);
272
273	FREETMPS; LEAVE;
274	}
275	else if (enc->cbor.flags & F_ALLOW_BLESSED)
276	encode_str (enc, "null", 4, 0);
277	else
278	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",
279	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
280	}
281	else if (enc->cbor.flags & F_ALLOW_BLESSED)
282	encode_str (enc, "null", 4, 0);
283	else
284	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
285	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286	#endif
287	}	301	}
		302	}
		303
		304	svtype svt = SvTYPE (sv);
		305
		306	if (ecb_expect_false (SvOBJECT (sv)))
		307	{
		308	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
		309	? types_boolean_stash
		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);
		314	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		315	? cbor_tagged_stash
		316	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		317
		318	HV *stash = SvSTASH (sv);
		319	GV *method;
		320
		321	if (stash == boolean_stash)
		322	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		323	else if (stash == error_stash)
		324	encode_ch (enc, 0xe0 \| 23);
		325	else if (stash == tagged_stash)
		326	{
		327	if (svt != SVt_PVAV)
		328	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		329
		330	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		331	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		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	}
		385	else
		386	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
		387	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
288	}	388	}
289	else if (svt == SVt_PVHV)	389	else if (svt == SVt_PVHV)
290	encode_hv (enc, (HV *)sv);	390	encode_hv (enc, (HV *)sv);
291	else if (svt == SVt_PVAV)	391	else if (svt == SVt_PVAV)
292	encode_av (enc, (AV *)sv);	392	encode_av (enc, (AV *)sv);
293	else if (svt < SVt_PVAV)
294	{
295	STRLEN len = 0;
296	char *pv = svt ? SvPV (sv, len) : 0;
297
298	if (len == 1 && *pv == '1')
299	encode_ch (enc, 0xe0 \| 21);
300	else if (len == 1 && *pv == '0')
301	encode_ch (enc, 0xe0 \| 20);
302	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
303	encode_ch (enc, 0xe0 \| 23);
304	else
305	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
306	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307	}
308	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
309	encode_ch (enc, 0xe0 \| 23);
310	else	393	else
311	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	394	{
312	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	395	encode_tag (enc, CBOR_TAG_INDIRECTION);
		396	encode_sv (enc, sv);
		397	}
313	}	398	}
314		399
315	static void	400	static void
316	encode_nv (enc_t enc, SV sv)	401	encode_nv (enc_t enc, SV sv)
317	{	402	{
…		…
382	}	467	}
383		468
384	static SV *	469	static SV *
385	encode_cbor (SV scalar, CBOR cbor)	470	encode_cbor (SV scalar, CBOR cbor)
386	{	471	{
387	enc_t enc;	472	enc_t enc = { };
388		473
389	enc.cbor = *cbor;	474	enc.cbor = *cbor;
390	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	475	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
391	enc.cur = SvPVX (enc.sv);	476	enc.cur = SvPVX (enc.sv);
392	enc.end = SvEND (enc.sv);	477	enc.end = SvEND (enc.sv);
393	enc.depth = 0;
394		478
395	SvPOK_only (enc.sv);	479	SvPOK_only (enc.sv);
396	encode_sv (&enc, scalar);	480	encode_sv (&enc, scalar);
397		481
398	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	482	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
414	U8 *end; // end of input string	498	U8 *end; // end of input string
415	const char *err; // parse error, if != 0	499	const char *err; // parse error, if != 0
416	CBOR cbor;	500	CBOR cbor;
417	U32 depth; // recursion depth	501	U32 depth; // recursion depth
418	U32 maxdepth; // recursion depth limit	502	U32 maxdepth; // recursion depth limit
		503	AV *shareable;
419	} dec_t;	504	} dec_t;
420		505
421	#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
422		507
423	#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")
…		…
517	SvREFCNT_dec (av);	602	SvREFCNT_dec (av);
518	DEC_DEC_DEPTH;	603	DEC_DEC_DEPTH;
519	return &PL_sv_undef;	604	return &PL_sv_undef;
520	}	605	}
521		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
522	static SV *	641	static SV *
523	decode_hv (dec_t *dec)	642	decode_hv (dec_t *dec)
524	{	643	{
525	HV *hv = newHV ();	644	HV *hv = newHV ();
526		645
…		…
538	{	657	{
539	++dec->cur;	658	++dec->cur;
540	break;	659	break;
541	}	660	}
542		661
543	SV *k = decode_sv (dec);	662	decode_he (dec, hv);
544	SV *v = decode_sv (dec);
545
546	hv_store_ent (hv, k, v, 0);
547	}	663	}
548	}	664	}
549	else	665	else
550	{	666	{
551	int len = decode_uint (dec);	667	int pairs = decode_uint (dec);
552		668
553	while (len--)	669	while (pairs--)
554	{	670	decode_he (dec, hv);
555	SV *k = decode_sv (dec);
556	SV *v = decode_sv (dec);
557
558	hv_store_ent (hv, k, v, 0);
559	}
560	}	671	}
561		672
562	DEC_DEC_DEPTH;	673	DEC_DEC_DEPTH;
563	return newRV_noinc ((SV *)hv);	674	return newRV_noinc ((SV *)hv);
564
565	#if 0
566	SV *sv;
567	HV *hv = newHV ();
568
569	DEC_INC_DEPTH;
570	decode_ws (dec);
571
572	for (;;)
573	{
574	// heuristic: assume that
575	// a) decode_str + hv_store_ent are abysmally slow.
576	// b) most hash keys are short, simple ascii text.
577	// => try to "fast-match" such strings to avoid
578	// the overhead of decode_str + hv_store_ent.
579	{
580	SV *value;
581	char *p = dec->cur;
582	char *e = p + 24; // only try up to 24 bytes
583
584	for (;;)
585	{
586	// the >= 0x80 is false on most architectures
587	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
588	{
589	// slow path, back up and use decode_str
590	SV *key = decode_str (dec);
591	if (!key)
592	goto fail;
593
594	decode_ws (dec); EXPECT_CH (':');
595
596	decode_ws (dec);
597	value = decode_sv (dec);
598	if (!value)
599	{
600	SvREFCNT_dec (key);
601	goto fail;
602	}
603
604	hv_store_ent (hv, key, value, 0);
605	SvREFCNT_dec (key);
606
607	break;
608	}
609	else if (*p == '"')
610	{
611	// fast path, got a simple key
612	char *key = dec->cur;
613	int len = p - key;
614	dec->cur = p + 1;
615
616	decode_ws (dec); EXPECT_CH (':');
617
618	decode_ws (dec);
619	value = decode_sv (dec);
620	if (!value)
621	goto fail;
622
623	hv_store (hv, key, len, value, 0);
624
625	break;
626	}
627
628	++p;
629	}
630	}
631
632	decode_ws (dec);
633
634	if (*dec->cur == '}')
635	{
636	++dec->cur;
637	break;
638	}
639
640	if (*dec->cur != ',')
641	ERR (", or } expected while parsing object/hash");
642
643	++dec->cur;
644
645	decode_ws (dec);
646
647	if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
648	{
649	++dec->cur;
650	break;
651	}
652	}
653
654	DEC_DEC_DEPTH;
655	sv = newRV_noinc ((SV *)hv);
656
657	// check filter callbacks
658	if (dec->cbor.flags & F_HOOK)
659	{
660	if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
661	{
662	HE cb, he;
663
664	hv_iterinit (hv);
665	he = hv_iternext (hv);
666	hv_iterinit (hv);
667
668	// the next line creates a mortal sv each time its called.
669	// might want to optimise this for common cases.
670	cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
671
672	if (cb)
673	{
674	dSP;
675	int count;
676
677	ENTER; SAVETMPS; PUSHMARK (SP);
678	XPUSHs (HeVAL (he));
679	sv_2mortal (sv);
680
681	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
682
683	if (count == 1)
684	{
685	sv = newSVsv (POPs);
686	FREETMPS; LEAVE;
687	return sv;
688	}
689
690	SvREFCNT_inc (sv);
691	FREETMPS; LEAVE;
692	}
693	}
694
695	if (dec->cbor.cb_object)
696	{
697	dSP;
698	int count;
699
700	ENTER; SAVETMPS; PUSHMARK (SP);
701	XPUSHs (sv_2mortal (sv));
702
703	PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
704
705	if (count == 1)
706	{
707	sv = newSVsv (POPs);
708	FREETMPS; LEAVE;
709	return sv;
710	}
711
712	SvREFCNT_inc (sv);
713	FREETMPS; LEAVE;
714	}
715	}
716
717	return sv;
718	#endif
719		675
720	fail:	676	fail:
721	SvREFCNT_dec (hv);	677	SvREFCNT_dec (hv);
722	DEC_DEC_DEPTH;	678	DEC_DEC_DEPTH;
723	return &PL_sv_undef;	679	return &PL_sv_undef;
724	}	680	}
725		681
726	static SV *	682	static SV *
727	decode_str (dec_t *dec, int utf8)	683	decode_str (dec_t *dec, int utf8)
728	{	684	{
729	SV *sv;	685	SV *sv = 0;
730		686
731	if ((*dec->cur & 31) == 31)	687	if ((*dec->cur & 31) == 31)
732	{	688	{
733	++dec->cur;	689	++dec->cur;
734		690
…		…
743	{	699	{
744	++dec->cur;	700	++dec->cur;
745	break;	701	break;
746	}	702	}
747		703
748	SV *sv2 = decode_sv (dec);
749	sv_catsv (sv, sv2);	704	sv_catsv (sv, decode_sv (dec));
750	}	705	}
751	}	706	}
752	else	707	else
753	{	708	{
754	STRLEN len = decode_uint (dec);	709	STRLEN len = decode_uint (dec);
…		…
762	SvUTF8_on (sv);	717	SvUTF8_on (sv);
763		718
764	return sv;	719	return sv;
765		720
766	fail:	721	fail:
		722	SvREFCNT_dec (sv);
767	return &PL_sv_undef;	723	return &PL_sv_undef;
768	}	724	}
769		725
770	static SV *	726	static SV *
771	decode_tagged (dec_t *dec)	727	decode_tagged (dec_t *dec)
772	{	728	{
		729	SV *sv = 0;
773	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
774	SV *sv = decode_sv (dec);	750	SV *osv = decode_sv (dec);
		751	sv_setsv (sv, osv);
		752	SvREFCNT_dec_NN (osv);
		753	}
775		754
776	if (tag == 55799) // 2.4.5 Self-Describe CBOR
777	return sv;	755	return sv;
778		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
779	AV *av = newAV ();	826	AV *av = newAV ();
780	av_push (av, newSVuv (tag));	827	av_push (av, newSVuv (tag));
781	av_push (av, sv);	828	av_push (av, sv);
782	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;
783	}	841	}
784		842
785	static SV *	843	static SV *
786	decode_sv (dec_t *dec)	844	decode_sv (dec_t *dec)
787	{	845	{
788	WANT (1);	846	WANT (1);
789		847
790	switch (*dec->cur >> 5)	848	switch (*dec->cur >> 5)
791	{	849	{
792	case 0: // unsigned int	850	case 0: // unsigned int
793	//TODO: 64 bit values on 3 2bit perls
794	return newSVuv (decode_uint (dec));	851	return newSVuv (decode_uint (dec));
795	case 1: // negative int	852	case 1: // negative int
796	return newSViv (-1 - (IV)decode_uint (dec));	853	return newSViv (-1 - (IV)decode_uint (dec));
797	case 2: // octet string	854	case 2: // octet string
798	return decode_str (dec, 0);	855	return decode_str (dec, 0);
…		…
807	case 7: // misc	864	case 7: // misc
808	switch (*dec->cur++ & 31)	865	switch (*dec->cur++ & 31)
809	{	866	{
810	case 20:	867	case 20:
811	#if CBOR_SLOW	868	#if CBOR_SLOW
812	cbor_false = get_bool ("CBOR::XS::false");	869	types_false = get_bool ("Types::Serialiser::false");
813	#endif	870	#endif
814	return newSVsv (cbor_false);	871	return newSVsv (types_false);
815	case 21:	872	case 21:
816	#if CBOR_SLOW	873	#if CBOR_SLOW
817	cbor_true = get_bool ("CBOR::XS::true");	874	types_true = get_bool ("Types::Serialiser::true");
818	#endif	875	#endif
819	return newSVsv (cbor_true);	876	return newSVsv (types_true);
820	case 22:	877	case 22:
821	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);
822		884
823	case 25:	885	case 25:
824	{	886	{
825	WANT (2);	887	WANT (2);
826		888
…		…
862	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	924	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863	}	925	}
864		926
865	break;	927	break;
866	}	928	}
867	#if 0
868	switch (*dec->cur)
869	{
870	//case '"': ++dec->cur; return decode_str (dec);
871	case '[': ++dec->cur; return decode_av (dec);
872	case '{': ++dec->cur; return decode_hv (dec);
873
874	case '-':
875	case '0': case '1': case '2': case '3': case '4':
876	case '5': case '6': case '7': case '8': case '9':
877	//TODO return decode_num (dec);
878
879	case 't':
880	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
881	{
882	dec->cur += 4;
883	#if CBOR_SLOW
884	cbor_true = get_bool ("CBOR::XS::true");
885	#endif
886	return newSVsv (cbor_true);
887	}
888	else
889	ERR ("'true' expected");
890
891	break;
892
893	case 'f':
894	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
895	{
896	dec->cur += 5;
897	#if CBOR_SLOW
898	cbor_false = get_bool ("CBOR::XS::false");
899	#endif
900	return newSVsv (cbor_false);
901	}
902	else
903	ERR ("'false' expected");
904
905	break;
906
907	case 'n':
908	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
909	{
910	dec->cur += 4;
911	return newSVsv (&PL_sv_undef);
912	}
913	else
914	ERR ("'null' expected");
915
916	break;
917
918	default:
919	ERR ("malformed CBOR string, neither array, object, number, string or atom");
920	break;
921	}
922	#endif
923		929
924	fail:	930	fail:
925	return &PL_sv_undef;	931	return &PL_sv_undef;
926	}	932	}
927		933
928	static SV *	934	static SV *
929	decode_cbor (SV string, CBOR cbor, char **offset_return)	935	decode_cbor (SV string, CBOR cbor, char **offset_return)
930	{	936	{
931	dec_t dec;	937	dec_t dec = { };
932	SV *sv;	938	SV *sv;
		939	STRLEN len;
		940	char *data = SvPVbyte (string, len);
933		941
934	/* work around bugs in 5.10 where manipulating magic values
935	* makes perl ignore the magic in subsequent accesses.
936	* also make a copy of non-PV values, to get them into a clean
937	* state (SvPV should do that, but it's buggy, see below).
938	*/
939	/SvGETMAGIC (string);/
940	if (SvMAGICAL (string) \|\| !SvPOK (string))
941	string = sv_2mortal (newSVsv (string));
942
943	SvUPGRADE (string, SVt_PV);
944
945	/* work around a bug in perl 5.10, which causes SvCUR to fail an
946	* assertion with -DDEBUGGING, although SvCUR is documented to
947	* return the xpv_cur field which certainly exists after upgrading.
948	* according to nicholas clark, calling SvPOK fixes this.
949	* But it doesn't fix it, so try another workaround, call SvPV_nolen
950	* and hope for the best.
951	* Damnit, SvPV_nolen still trips over yet another assertion. This
952	* assertion business is seriously broken, try yet another workaround
953	* for the broken -DDEBUGGING.
954	*/
955	{
956	#ifdef DEBUGGING
957	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
958	#else
959	STRLEN offset = SvCUR (string);
960	#endif
961
962	if (offset > cbor->max_size && cbor->max_size)	942	if (len > cbor->max_size && cbor->max_size)
963	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",
964	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	944	(unsigned long)len, (unsigned long)cbor->max_size);
965	}
966
967	sv_utf8_downgrade (string, 0);
968		945
969	dec.cbor = *cbor;	946	dec.cbor = *cbor;
970	dec.cur = (U8 *)SvPVX (string);	947	dec.cur = (U8 *)data;
971	dec.end = (U8 *)SvEND (string);	948	dec.end = (U8 *)data + len;
972	dec.err = 0;
973	dec.depth = 0;
974
975	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
976	;//TODO dec.cbor.flags \|= F_HOOK;
977		949
978	sv = decode_sv (&dec);	950	sv = decode_sv (&dec);
979		951
980	if (offset_return)	952	if (offset_return)
981	*offset_return = dec.cur;	953	*offset_return = dec.cur;
…		…
985	dec.err = "garbage after CBOR object";	957	dec.err = "garbage after CBOR object";
986		958
987	if (dec.err)	959	if (dec.err)
988	{	960	{
989	SvREFCNT_dec (sv);	961	SvREFCNT_dec (sv);
990	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);
991	}	963	}
992		964
993	sv = sv_2mortal (sv);	965	sv = sv_2mortal (sv);
994		966
995	return sv;	967	return sv;
…		…
1001	MODULE = CBOR::XS PACKAGE = CBOR::XS	973	MODULE = CBOR::XS PACKAGE = CBOR::XS
1002		974
1003	BOOT:	975	BOOT:
1004	{	976	{
1005	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	977	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	978	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007		979
1008	cbor_true = get_bool ("CBOR::XS::true");	980	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1009	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);
1010	}	989	}
1011		990
1012	PROTOTYPES: DISABLE	991	PROTOTYPES: DISABLE
1013		992
1014	void CLONE (...)	993	void CLONE (...)
1015	CODE:	994	CODE:
1016	cbor_stash = 0;	995	cbor_stash = 0;
		996	cbor_tagged_stash = 0;
		997	types_error_stash = 0;
1017	cbor_boolean_stash = 0;	998	types_boolean_stash = 0;
1018		999
1019	void new (char *klass)	1000	void new (char *klass)
1020	PPCODE:	1001	PPCODE:
1021	{	1002	{
1022	SV *pv = NEWSV (0, sizeof (CBOR));	1003	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1030		1011
1031	void shrink (CBOR *self, int enable = 1)	1012	void shrink (CBOR *self, int enable = 1)
1032	ALIAS:	1013	ALIAS:
1033	shrink = F_SHRINK	1014	shrink = F_SHRINK
1034	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
1035	PPCODE:	1019	PPCODE:
1036	{	1020	{
1037	if (enable)	1021	if (enable)
1038	self->flags \|= ix;	1022	self->flags \|= ix;
1039	else	1023	else
…		…
1044		1028
1045	void get_shrink (CBOR *self)	1029	void get_shrink (CBOR *self)
1046	ALIAS:	1030	ALIAS:
1047	get_shrink = F_SHRINK	1031	get_shrink = F_SHRINK
1048	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
1049	PPCODE:	1036	PPCODE:
1050	XPUSHs (boolSV (self->flags & ix));	1037	XPUSHs (boolSV (self->flags & ix));
1051		1038
1052	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1039	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1053	PPCODE:	1040	PPCODE:
…		…
1068	int get_max_size (CBOR *self)	1055	int get_max_size (CBOR *self)
1069	CODE:	1056	CODE:
1070	RETVAL = self->max_size;	1057	RETVAL = self->max_size;
1071	OUTPUT:	1058	OUTPUT:
1072	RETVAL	1059	RETVAL
1073
1074	#if 0 //TODO
1075
1076	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
1077	PPCODE:
1078	{
1079	SvREFCNT_dec (self->cb_object);
1080	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1081
1082	XPUSHs (ST (0));
1083	}
1084
1085	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
1086	PPCODE:
1087	{
1088	if (!self->cb_sk_object)
1089	self->cb_sk_object = newHV ();
1090
1091	if (SvOK (cb))
1092	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1093	else
1094	{
1095	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1096
1097	if (!HvKEYS (self->cb_sk_object))
1098	{
1099	SvREFCNT_dec (self->cb_sk_object);
1100	self->cb_sk_object = 0;
1101	}
1102	}
1103
1104	XPUSHs (ST (0));
1105	}
1106
1107	#endif
1108		1060
1109	void encode (CBOR self, SV scalar)	1061	void encode (CBOR self, SV scalar)
1110	PPCODE:	1062	PPCODE:
1111	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1063	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1112	XPUSHs (scalar);	1064	XPUSHs (scalar);
…		…
1125	EXTEND (SP, 2);	1077	EXTEND (SP, 2);
1126	PUSHs (sv);	1078	PUSHs (sv);
1127	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1079	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128	}	1080	}
1129		1081
1130	void DESTROY (CBOR *self)
1131	CODE:
1132	SvREFCNT_dec (self->cb_sk_object);
1133	SvREFCNT_dec (self->cb_object);
1134
1135	PROTOTYPES: ENABLE	1082	PROTOTYPES: ENABLE
1136		1083
1137	void encode_cbor (SV *scalar)	1084	void encode_cbor (SV *scalar)
1138	PPCODE:	1085	PPCODE:
1139	{	1086	{

Diff Legend

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

Comparing cvsroot/CBOR-XS/XS.xs (file contents): Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs. Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC

Diff Legend

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.19 by root, Wed Nov 20 02:03:09 2013 UTC