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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.14 by root, Tue Oct 29 15:56:32 2013 UTC vs.
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC

…		…
24		24
25	// known tags	25	// known tags
26	enum cbor_tag	26	enum cbor_tag
27	{	27	{
28	// inofficial extensions (pending iana registration)	28	// inofficial extensions (pending iana registration)
29	CBOR_TAG_PERL_OBJECT = 256,	29	CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
30	CBOR_TAG_GENERIC_OBJECT = 257,	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
31		36
32	// rfc7049	37	// rfc7049
33	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8	38	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any	39	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35	CBOR_TAG_POS_BIGNUM = 2, // byte string	40	CBOR_TAG_POS_BIGNUM = 2, // byte string
…		…
49	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8	54	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50		55
51	CBOR_TAG_MAGIC = 55799 // self-describe cbor	56	CBOR_TAG_MAGIC = 55799 // self-describe cbor
52	};	57	};
53		58
54	#define F_SHRINK 0x00000200UL	59	#define F_SHRINK 0x00000001UL
55	#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
56		64
57	#define INIT_SIZE 32 // initial scalar size to be allocated	65	#define INIT_SIZE 32 // initial scalar size to be allocated
58		66
59	#define SB do {	67	#define SB do {
60	#define SE } while (0)	68	#define SE } while (0)
…		…
117	#endif	125	#endif
118	}	126	}
119	}	127	}
120		128
121	/////////////////////////////////////////////////////////////////////////////	129	/////////////////////////////////////////////////////////////////////////////
122	// fp hell
123
124	//TODO
125
126	/////////////////////////////////////////////////////////////////////////////
127	// encoder	130	// encoder
128		131
129	// structure used for encoding CBOR	132	// structure used for encoding CBOR
130	typedef struct	133	typedef struct
131	{	134	{
132	char *cur; // SvPVX (sv) + current output position	135	char *cur; // SvPVX (sv) + current output position
133	char *end; // SvEND (sv)	136	char *end; // SvEND (sv)
134	SV *sv; // result scalar	137	SV *sv; // result scalar
135	CBOR cbor;	138	CBOR cbor;
136	U32 depth; // recursion level	139	U32 depth; // recursion level
		140	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		141	UV stringref_idx;
		142	HV *shareable; // ptr => index, or 0
		143	UV shareable_idx;
137	} enc_t;	144	} enc_t;
138		145
139	ecb_inline void	146	ecb_inline void
140	need (enc_t *enc, STRLEN len)	147	need (enc_t *enc, STRLEN len)
141	{	148	{
…		…
202	need (enc, len);	209	need (enc, len);
203	memcpy (enc->cur, str, len);	210	memcpy (enc->cur, str, len);
204	enc->cur += len;	211	enc->cur += len;
205	}	212	}
206		213
		214	ecb_inline void
		215	encode_tag (enc_t *enc, UV tag)
		216	{
		217	encode_uint (enc, 0xc0, tag);
		218	}
		219
207	static void encode_sv (enc_t enc, SV sv);	220	static void encode_sv (enc_t enc, SV sv);
208		221
209	static void	222	static void
210	encode_av (enc_t enc, AV av)	223	encode_av (enc_t enc, AV av)
211	{	224	{
…		…
223	SV **svp = av_fetch (av, i, 0);	236	SV **svp = av_fetch (av, i, 0);
224	encode_sv (enc, svp ? *svp : &PL_sv_undef);	237	encode_sv (enc, svp ? *svp : &PL_sv_undef);
225	}	238	}
226		239
227	--enc->depth;	240	--enc->depth;
		241	}
		242
		243	ecb_inline void
		244	encode_he (enc_t enc, HE he)
		245	{
		246	if (HeKLEN (he) == HEf_SVKEY)
		247	encode_sv (enc, HeSVKEY (he));
		248	else
		249	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
228	}	250	}
229		251
230	static void	252	static void
231	encode_hv (enc_t enc, HV hv)	253	encode_hv (enc_t enc, HV hv)
232	{	254	{
…		…
245	else	267	else
246	encode_uint (enc, 0xa0, pairs);	268	encode_uint (enc, 0xa0, pairs);
247		269
248	while ((he = hv_iternext (hv)))	270	while ((he = hv_iternext (hv)))
249	{	271	{
		272	if (ecb_expect_false (enc->cbor.flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS)))
		273	{
		274	SV **svp;
		275
250	if (HeKLEN (he) == HEf_SVKEY)	276	if (HeKLEN (he) == HEf_SVKEY)
251	encode_sv (enc, HeSVKEY (he));	277	svp = hv_fetch_ent (enc->stringref[!! SvUTF8 (HeSVKEY (he))], HeSVKEY (he) , 1, 0);//TODO return HE :/
		278	else
		279	svp = hv_fetch (enc->stringref[!! HeKUTF8 (he) ], HeKEY (he), HeKLEN (he), 1);
		280
		281	if (SvOK (*svp))
		282	{
		283	encode_tag (enc, CBOR_TAG_STRINGREF);
		284	encode_uint (enc, 0x00, SvUV (*svp));
		285	}
		286	else
		287	{
		288	sv_setuv (*svp, enc->stringref_idx);
		289	++enc->stringref_idx;
		290	encode_he (enc, he);
		291	}
		292	}
252	else	293	else
253	encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));	294	encode_he (enc, he);
254		295
255	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));	296	encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
256	}	297	}
257		298
258	if (mg)	299	if (mg)
…		…
263		304
264	// encode objects, arrays and special \0=false and \1=true values.	305	// encode objects, arrays and special \0=false and \1=true values.
265	static void	306	static void
266	encode_rv (enc_t enc, SV sv)	307	encode_rv (enc_t enc, SV sv)
267	{	308	{
268	svtype svt;
269
270	SvGETMAGIC (sv);	309	SvGETMAGIC (sv);
		310
		311	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		312	&& ecb_expect_false (SvREFCNT (sv) > 1))
		313	{
		314	if (!enc->shareable)
		315	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		316
		317	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		318
		319	if (SvOK (*svp))
		320	{
		321	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		322	encode_uint (enc, 0x00, SvUV (*svp));
		323	return;
		324	}
		325	else
		326	{
		327	sv_setuv (*svp, enc->shareable_idx);
		328	++enc->shareable_idx;
		329	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		330	}
		331	}
		332
271	svt = SvTYPE (sv);	333	svtype svt = SvTYPE (sv);
272		334
273	if (ecb_expect_false (SvOBJECT (sv)))	335	if (ecb_expect_false (SvOBJECT (sv)))
274	{	336	{
275	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	337	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
276	? types_boolean_stash	338	? types_boolean_stash
…		…
336		398
337	// catch this surprisingly common error	399	// catch this surprisingly common error
338	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	400	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));	401	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340		402
341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	403	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342	encode_uint (enc, 0x80, count + 1);	404	encode_uint (enc, 0x80, count + 1);
343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	405	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344		406
345	while (count)	407	while (count)
346	encode_sv (enc, SP[1 - count--]);	408	encode_sv (enc, SP[1 - count--]);
…		…
355	}	417	}
356	else if (svt == SVt_PVHV)	418	else if (svt == SVt_PVHV)
357	encode_hv (enc, (HV *)sv);	419	encode_hv (enc, (HV *)sv);
358	else if (svt == SVt_PVAV)	420	else if (svt == SVt_PVAV)
359	encode_av (enc, (AV *)sv);	421	encode_av (enc, (AV *)sv);
360	else if (svt < SVt_PVAV)
361	{
362	STRLEN len = 0;
363	char *pv = svt ? SvPV (sv, len) : 0;
364
365	if (len == 1 && *pv == '1')
366	encode_ch (enc, 0xe0 \| 21);
367	else if (len == 1 && *pv == '0')
368	encode_ch (enc, 0xe0 \| 20);
369	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
370	encode_ch (enc, 0xe0 \| 23);
371	else
372	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
373	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
374	}
375	else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
376	encode_ch (enc, 0xe0 \| 23);
377	else	422	else
378	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	423	{
379	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	424	encode_tag (enc, CBOR_TAG_INDIRECTION);
		425	encode_sv (enc, sv);
		426	}
380	}	427	}
381		428
382	static void	429	static void
383	encode_nv (enc_t enc, SV sv)	430	encode_nv (enc_t enc, SV sv)
384	{	431	{
…		…
449	}	496	}
450		497
451	static SV *	498	static SV *
452	encode_cbor (SV scalar, CBOR cbor)	499	encode_cbor (SV scalar, CBOR cbor)
453	{	500	{
454	enc_t enc;	501	enc_t enc = { };
455		502
456	enc.cbor = *cbor;	503	enc.cbor = *cbor;
457	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	504	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458	enc.cur = SvPVX (enc.sv);	505	enc.cur = SvPVX (enc.sv);
459	enc.end = SvEND (enc.sv);	506	enc.end = SvEND (enc.sv);
460	enc.depth = 0;
461		507
462	SvPOK_only (enc.sv);	508	SvPOK_only (enc.sv);
		509
		510	if (cbor->flags & (F_DEDUP_STRINGS \| F_DEDUP_KEYS))
		511	{
		512	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		513	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		514	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		515	}
		516
463	encode_sv (&enc, scalar);	517	encode_sv (&enc, scalar);
464		518
465	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	519	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	520	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467		521
…		…
481	U8 *end; // end of input string	535	U8 *end; // end of input string
482	const char *err; // parse error, if != 0	536	const char *err; // parse error, if != 0
483	CBOR cbor;	537	CBOR cbor;
484	U32 depth; // recursion depth	538	U32 depth; // recursion depth
485	U32 maxdepth; // recursion depth limit	539	U32 maxdepth; // recursion depth limit
		540	AV *shareable;
		541	AV *stringref;
486	} dec_t;	542	} dec_t;
487		543
488	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	544	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489		545
490	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	546	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
584	SvREFCNT_dec (av);	640	SvREFCNT_dec (av);
585	DEC_DEC_DEPTH;	641	DEC_DEC_DEPTH;
586	return &PL_sv_undef;	642	return &PL_sv_undef;
587	}	643	}
588		644
		645	static void
		646	decode_he (dec_t dec, HV hv)
		647	{
		648	// for speed reasons, we specialcase single-string
		649	// byte or utf-8 strings as keys.
		650
		651	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
		652	{
		653	I32 len = decode_uint (dec);
		654	char key = (char )dec->cur;
		655
		656	dec->cur += len;
		657
		658	if (ecb_expect_false (dec->stringref))
		659	av_push (dec->stringref, newSVpvn (key, len));
		660
		661	hv_store (hv, key, len, decode_sv (dec), 0);
		662	}
		663	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
		664	{
		665	I32 len = decode_uint (dec);
		666	char key = (char )dec->cur;
		667
		668	dec->cur += len;
		669
		670	if (ecb_expect_false (dec->stringref))
		671	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		672
		673	hv_store (hv, key, -len, decode_sv (dec), 0);
		674	}
		675	else
		676	{
		677	SV *k = decode_sv (dec);
		678	SV *v = decode_sv (dec);
		679
		680	hv_store_ent (hv, k, v, 0);
		681	SvREFCNT_dec (k);
		682	}
		683	}
		684
589	static SV *	685	static SV *
590	decode_hv (dec_t *dec)	686	decode_hv (dec_t *dec)
591	{	687	{
592	HV *hv = newHV ();	688	HV *hv = newHV ();
593		689
…		…
605	{	701	{
606	++dec->cur;	702	++dec->cur;
607	break;	703	break;
608	}	704	}
609		705
610	SV *k = decode_sv (dec);	706	decode_he (dec, hv);
611	SV *v = decode_sv (dec);
612
613	hv_store_ent (hv, k, v, 0);
614	SvREFCNT_dec (k);
615	}	707	}
616	}	708	}
617	else	709	else
618	{	710	{
619	int len = decode_uint (dec);	711	int pairs = decode_uint (dec);
620		712
621	while (len--)	713	while (pairs--)
622	{	714	decode_he (dec, hv);
623	SV *k = decode_sv (dec);
624	SV *v = decode_sv (dec);
625
626	hv_store_ent (hv, k, v, 0);
627	SvREFCNT_dec (k);
628	}
629	}	715	}
630		716
631	DEC_DEC_DEPTH;	717	DEC_DEC_DEPTH;
632	return newRV_noinc ((SV *)hv);	718	return newRV_noinc ((SV *)hv);
633		719
…		…
672	}	758	}
673		759
674	if (utf8)	760	if (utf8)
675	SvUTF8_on (sv);	761	SvUTF8_on (sv);
676		762
		763	if (ecb_expect_false (dec->stringref))
		764	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
		765
677	return sv;	766	return sv;
678		767
679	fail:	768	fail:
680	SvREFCNT_dec (sv);	769	SvREFCNT_dec (sv);
681	return &PL_sv_undef;	770	return &PL_sv_undef;
682	}	771	}
683		772
684	static SV *	773	static SV *
685	decode_tagged (dec_t *dec)	774	decode_tagged (dec_t *dec)
686	{	775	{
		776	SV *sv = 0;
687	UV tag = decode_uint (dec);	777	UV tag = decode_uint (dec);
		778
		779	WANT (1);
		780
		781	switch (tag)
		782	{
		783	case CBOR_TAG_MAGIC:
		784	sv = decode_sv (dec);
		785	break;
		786
		787	case CBOR_TAG_INDIRECTION:
		788	sv = newRV_noinc (decode_sv (dec));
		789	break;
		790
		791	case CBOR_TAG_STRINGREF_NAMESPACE:
		792	{
		793	ENTER; SAVETMPS;
		794
		795	SAVESPTR (dec->stringref);
		796	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
		797
		798	sv = decode_sv (dec);
		799
		800	FREETMPS; LEAVE;
		801	}
		802	break;
		803
		804	case CBOR_TAG_STRINGREF:
		805	{
		806	if ((*dec->cur >> 5) != 0)
		807	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		808
		809	UV idx = decode_uint (dec);
		810
		811	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		812	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		813
		814	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		815	}
		816	break;
		817
		818	case CBOR_TAG_VALUE_SHAREABLE:
		819	{
		820	if (ecb_expect_false (!dec->shareable))
		821	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		822
		823	sv = newSV (0);
		824	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		825
688	SV *sv = decode_sv (dec);	826	SV *osv = decode_sv (dec);
		827	sv_setsv (sv, osv);
		828	SvREFCNT_dec_NN (osv);
		829	}
		830	break;
689		831
690	if (tag == CBOR_TAG_MAGIC)	832	case CBOR_TAG_VALUE_SHAREDREF:
691	return sv;	833	{
692	else if (tag == CBOR_TAG_PERL_OBJECT)	834	if ((*dec->cur >> 5) != 0)
693	{	835	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		836
		837	UV idx = decode_uint (dec);
		838
		839	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		840	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		841
		842	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		843	}
		844	break;
		845
		846	case CBOR_TAG_PERL_OBJECT:
		847	{
		848	sv = decode_sv (dec);
		849
694	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)	850	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
695	ERR ("corrupted CBOR data (non-array perl object)");	851	ERR ("corrupted CBOR data (non-array perl object)");
696		852
697	AV av = (AV )SvRV (sv);	853	AV av = (AV )SvRV (sv);
698	int len = av_len (av) + 1;	854	int len = av_len (av) + 1;
699	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);	855	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
700		856
701	if (!stash)	857	if (!stash)
702	ERR ("cannot decode perl-object (package does not exist)");	858	ERR ("cannot decode perl-object (package does not exist)");
703		859
704	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);	860	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
705		861
706	if (!method)	862	if (!method)
707	ERR ("cannot decode perl-object (package does not have a THAW method)");	863	ERR ("cannot decode perl-object (package does not have a THAW method)");
708		864
709	dSP;	865	dSP;
710		866
711	ENTER; SAVETMPS; PUSHMARK (SP);	867	ENTER; SAVETMPS; PUSHMARK (SP);
712	EXTEND (SP, len + 1);	868	EXTEND (SP, len + 1);
713	// we re-bless the reference to get overload and other niceties right	869	// we re-bless the reference to get overload and other niceties right
714	PUSHs (*av_fetch (av, 0, 1));	870	PUSHs (*av_fetch (av, 0, 1));
715	PUSHs (sv_cbor);	871	PUSHs (sv_cbor);
716		872
717	int i;	873	int i;
718		874
719	for (i = 1; i < len; ++i)	875	for (i = 1; i < len; ++i)
720	PUSHs (*av_fetch (av, i, 1));	876	PUSHs (*av_fetch (av, i, 1));
721		877
722	PUTBACK;	878	PUTBACK;
723	call_sv ((SV *)GvCV (method), G_SCALAR);	879	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
724	SPAGAIN;	880	SPAGAIN;
725		881
		882	if (SvTRUE (ERRSV))
		883	{
		884	FREETMPS; LEAVE;
		885	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
		886	}
		887
726	SvREFCNT_dec (sv);	888	SvREFCNT_dec (sv);
727	sv = SvREFCNT_inc (POPs);	889	sv = SvREFCNT_inc (POPs);
728		890
729	PUTBACK;	891	PUTBACK;
730		892
731	FREETMPS; LEAVE;	893	FREETMPS; LEAVE;
		894	}
		895	break;
732		896
733	return sv;	897	default:
734	}	898	{
735	else	899	sv = decode_sv (dec);
736	{	900
737	AV *av = newAV ();	901	AV *av = newAV ();
738	av_push (av, newSVuv (tag));	902	av_push (av, newSVuv (tag));
739	av_push (av, sv);	903	av_push (av, sv);
740		904
741	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	905	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
742	? cbor_tagged_stash	906	? cbor_tagged_stash
743	: gv_stashpv ("CBOR::XS::Tagged" , 1);	907	: gv_stashpv ("CBOR::XS::Tagged" , 1);
744		908
745	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	909	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		910	}
		911	break;
746	}	912	}
		913
		914	return sv;
747		915
748	fail:	916	fail:
749	SvREFCNT_dec (sv);	917	SvREFCNT_dec (sv);
750	return &PL_sv_undef;	918	return &PL_sv_undef;
751	}	919	}
…		…
842	}	1010	}
843		1011
844	static SV *	1012	static SV *
845	decode_cbor (SV string, CBOR cbor, char **offset_return)	1013	decode_cbor (SV string, CBOR cbor, char **offset_return)
846	{	1014	{
847	dec_t dec;	1015	dec_t dec = { };
848	SV *sv;	1016	SV *sv;
		1017	STRLEN len;
		1018	char *data = SvPVbyte (string, len);
849		1019
850	/* work around bugs in 5.10 where manipulating magic values
851	* makes perl ignore the magic in subsequent accesses.
852	* also make a copy of non-PV values, to get them into a clean
853	* state (SvPV should do that, but it's buggy, see below).
854	*/
855	/SvGETMAGIC (string);/
856	if (SvMAGICAL (string) \|\| !SvPOK (string))
857	string = sv_2mortal (newSVsv (string));
858
859	SvUPGRADE (string, SVt_PV);
860
861	/* work around a bug in perl 5.10, which causes SvCUR to fail an
862	* assertion with -DDEBUGGING, although SvCUR is documented to
863	* return the xpv_cur field which certainly exists after upgrading.
864	* according to nicholas clark, calling SvPOK fixes this.
865	* But it doesn't fix it, so try another workaround, call SvPV_nolen
866	* and hope for the best.
867	* Damnit, SvPV_nolen still trips over yet another assertion. This
868	* assertion business is seriously broken, try yet another workaround
869	* for the broken -DDEBUGGING.
870	*/
871	{
872	#ifdef DEBUGGING
873	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
874	#else
875	STRLEN offset = SvCUR (string);
876	#endif
877
878	if (offset > cbor->max_size && cbor->max_size)	1020	if (len > cbor->max_size && cbor->max_size)
879	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",	1021	croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
880	(unsigned long)SvCUR (string), (unsigned long)cbor->max_size);	1022	(unsigned long)len, (unsigned long)cbor->max_size);
881	}
882
883	sv_utf8_downgrade (string, 0);
884		1023
885	dec.cbor = *cbor;	1024	dec.cbor = *cbor;
886	dec.cur = (U8 *)SvPVX (string);	1025	dec.cur = (U8 *)data;
887	dec.end = (U8 *)SvEND (string);	1026	dec.end = (U8 *)data + len;
888	dec.err = 0;
889	dec.depth = 0;
890		1027
891	sv = decode_sv (&dec);	1028	sv = decode_sv (&dec);
892		1029
893	if (offset_return)	1030	if (offset_return)
894	*offset_return = dec.cur;	1031	*offset_return = dec.cur;
…		…
898	dec.err = "garbage after CBOR object";	1035	dec.err = "garbage after CBOR object";
899		1036
900	if (dec.err)	1037	if (dec.err)
901	{	1038	{
902	SvREFCNT_dec (sv);	1039	SvREFCNT_dec (sv);
903	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )SvPVX (string), (int)(uint8_t)dec.cur);	1040	croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 )data, (int)(uint8_t)dec.cur);
904	}	1041	}
905		1042
906	sv = sv_2mortal (sv);	1043	sv = sv_2mortal (sv);
907		1044
908	return sv;	1045	return sv;
…		…
952		1089
953	void shrink (CBOR *self, int enable = 1)	1090	void shrink (CBOR *self, int enable = 1)
954	ALIAS:	1091	ALIAS:
955	shrink = F_SHRINK	1092	shrink = F_SHRINK
956	allow_unknown = F_ALLOW_UNKNOWN	1093	allow_unknown = F_ALLOW_UNKNOWN
		1094	allow_sharing = F_ALLOW_SHARING
		1095	dedup_keys = F_DEDUP_KEYS
		1096	dedup_strings = F_DEDUP_STRINGS
957	PPCODE:	1097	PPCODE:
958	{	1098	{
959	if (enable)	1099	if (enable)
960	self->flags \|= ix;	1100	self->flags \|= ix;
961	else	1101	else
…		…
966		1106
967	void get_shrink (CBOR *self)	1107	void get_shrink (CBOR *self)
968	ALIAS:	1108	ALIAS:
969	get_shrink = F_SHRINK	1109	get_shrink = F_SHRINK
970	get_allow_unknown = F_ALLOW_UNKNOWN	1110	get_allow_unknown = F_ALLOW_UNKNOWN
		1111	get_allow_sharing = F_ALLOW_SHARING
		1112	get_dedup_keys = F_DEDUP_KEYS
		1113	get_dedup_strings = F_DEDUP_STRINGS
971	PPCODE:	1114	PPCODE:
972	XPUSHs (boolSV (self->flags & ix));	1115	XPUSHs (boolSV (self->flags & ix));
973		1116
974	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1117	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
975	PPCODE:	1118	PPCODE:
…		…
990	int get_max_size (CBOR *self)	1133	int get_max_size (CBOR *self)
991	CODE:	1134	CODE:
992	RETVAL = self->max_size;	1135	RETVAL = self->max_size;
993	OUTPUT:	1136	OUTPUT:
994	RETVAL	1137	RETVAL
995
996	#if 0 //TODO
997
998	void filter_cbor_object (CBOR self, SV cb = &PL_sv_undef)
999	PPCODE:
1000	{
1001	SvREFCNT_dec (self->cb_object);
1002	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1003
1004	XPUSHs (ST (0));
1005	}
1006
1007	void filter_cbor_single_key_object (CBOR self, SV key, SV *cb = &PL_sv_undef)
1008	PPCODE:
1009	{
1010	if (!self->cb_sk_object)
1011	self->cb_sk_object = newHV ();
1012
1013	if (SvOK (cb))
1014	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1015	else
1016	{
1017	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1018
1019	if (!HvKEYS (self->cb_sk_object))
1020	{
1021	SvREFCNT_dec (self->cb_sk_object);
1022	self->cb_sk_object = 0;
1023	}
1024	}
1025
1026	XPUSHs (ST (0));
1027	}
1028
1029	#endif
1030		1138
1031	void encode (CBOR self, SV scalar)	1139	void encode (CBOR self, SV scalar)
1032	PPCODE:	1140	PPCODE:
1033	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	1141	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1034	XPUSHs (scalar);	1142	XPUSHs (scalar);
…		…
1047	EXTEND (SP, 2);	1155	EXTEND (SP, 2);
1048	PUSHs (sv);	1156	PUSHs (sv);
1049	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1157	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1050	}	1158	}
1051		1159
1052	#if 0
1053
1054	void DESTROY (CBOR *self)
1055	CODE:
1056	SvREFCNT_dec (self->cb_sk_object);
1057	SvREFCNT_dec (self->cb_object);
1058
1059	#endif
1060
1061	PROTOTYPES: ENABLE	1160	PROTOTYPES: ENABLE
1062		1161
1063	void encode_cbor (SV *scalar)	1162	void encode_cbor (SV *scalar)
1064	PPCODE:	1163	PPCODE:
1065	{	1164	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.14 by root, Tue Oct 29 15:56:32 2013 UTC vs. Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.14 by root, Tue Oct 29 15:56:32 2013 UTC vs.
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC