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

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 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_ALLOW_STRINGREF 0x00000008UL //TODO
56		63
57	#define INIT_SIZE 32 // initial scalar size to be allocated	64	#define INIT_SIZE 32 // initial scalar size to be allocated
58		65
59	#define SB do {	66	#define SB do {
60	#define SE } while (0)	67	#define SE } while (0)
…		…
116	SvPV_renew (sv, SvCUR (sv) + 1);	123	SvPV_renew (sv, SvCUR (sv) + 1);
117	#endif	124	#endif
118	}	125	}
119	}	126	}
120		127
121	/////////////////////////////////////////////////////////////////////////////	128	// minimum length of a string to be registered for stringref
122	// fp hell	129	ecb_inline int
123		130	minimum_string_length (UV idx)
124	//TODO	131	{
		132	return idx > 23
		133	? idx > 0xffU
		134	? idx > 0xffffU
		135	? idx > 0xffffffffU
		136	? 7
		137	: 6
		138	: 5
		139	: 4
		140	: 3;
		141	}
125		142
126	/////////////////////////////////////////////////////////////////////////////	143	/////////////////////////////////////////////////////////////////////////////
127	// encoder	144	// encoder
128		145
129	// structure used for encoding CBOR	146	// structure used for encoding CBOR
…		…
132	char *cur; // SvPVX (sv) + current output position	149	char *cur; // SvPVX (sv) + current output position
133	char *end; // SvEND (sv)	150	char *end; // SvEND (sv)
134	SV *sv; // result scalar	151	SV *sv; // result scalar
135	CBOR cbor;	152	CBOR cbor;
136	U32 depth; // recursion level	153	U32 depth; // recursion level
		154	HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
		155	UV stringref_idx;
		156	HV *shareable; // ptr => index, or 0
		157	UV shareable_idx;
137	} enc_t;	158	} enc_t;
138		159
139	ecb_inline void	160	ecb_inline void
140	need (enc_t *enc, STRLEN len)	161	need (enc_t *enc, STRLEN len)
141	{	162	{
…		…
193	*enc->cur++ = len >> 8;	214	*enc->cur++ = len >> 8;
194	*enc->cur++ = len;	215	*enc->cur++ = len;
195	}	216	}
196	}	217	}
197		218
		219	ecb_inline void
		220	encode_tag (enc_t *enc, UV tag)
		221	{
		222	encode_uint (enc, 0xc0, tag);
		223	}
		224
198	static void	225	static void
199	encode_str (enc_t enc, int utf8, char str, STRLEN len)	226	encode_str (enc_t enc, int utf8, char str, STRLEN len)
200	{	227	{
		228	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
		229	{
		230	SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
		231
		232	if (SvOK (*svp))
		233	{
		234	// already registered, use stringref
		235	encode_tag (enc, CBOR_TAG_STRINGREF);
		236	encode_uint (enc, 0x00, SvUV (*svp));
		237	return;
		238	}
		239	else if (len >= minimum_string_length (enc->stringref_idx))
		240	{
		241	// register only
		242	sv_setuv (*svp, enc->stringref_idx);
		243	++enc->stringref_idx;
		244	}
		245	}
		246
201	encode_uint (enc, utf8 ? 0x60 : 0x40, len);	247	encode_uint (enc, utf8 ? 0x60 : 0x40, len);
202	need (enc, len);	248	need (enc, len);
203	memcpy (enc->cur, str, len);	249	memcpy (enc->cur, str, len);
204	enc->cur += len;	250	enc->cur += len;
205	}	251	}
…		…
263		309
264	// encode objects, arrays and special \0=false and \1=true values.	310	// encode objects, arrays and special \0=false and \1=true values.
265	static void	311	static void
266	encode_rv (enc_t enc, SV sv)	312	encode_rv (enc_t enc, SV sv)
267	{	313	{
268	svtype svt;
269
270	SvGETMAGIC (sv);	314	SvGETMAGIC (sv);
		315
		316	if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
		317	&& ecb_expect_false (SvREFCNT (sv) > 1))
		318	{
		319	if (!enc->shareable)
		320	enc->shareable = (HV )sv_2mortal ((SV )newHV ());
		321
		322	SV *svp = hv_fetch (enc->shareable, (char )&sv, sizeof (sv), 1);
		323
		324	if (SvOK (*svp))
		325	{
		326	encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
		327	encode_uint (enc, 0x00, SvUV (*svp));
		328	return;
		329	}
		330	else
		331	{
		332	sv_setuv (*svp, enc->shareable_idx);
		333	++enc->shareable_idx;
		334	encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
		335	}
		336	}
		337
271	svt = SvTYPE (sv);	338	svtype svt = SvTYPE (sv);
272		339
273	if (ecb_expect_false (SvOBJECT (sv)))	340	if (ecb_expect_false (SvOBJECT (sv)))
274	{	341	{
275	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash	342	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
276	? types_boolean_stash	343	? types_boolean_stash
…		…
336		403
337	// catch this surprisingly common error	404	// catch this surprisingly common error
338	if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)	405	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));	406	croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340		407
341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);	408	encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342	encode_uint (enc, 0x80, count + 1);	409	encode_uint (enc, 0x80, count + 1);
343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));	410	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344		411
345	while (count)	412	while (count)
346	encode_sv (enc, SP[1 - count--]);	413	encode_sv (enc, SP[1 - count--]);
…		…
355	}	422	}
356	else if (svt == SVt_PVHV)	423	else if (svt == SVt_PVHV)
357	encode_hv (enc, (HV *)sv);	424	encode_hv (enc, (HV *)sv);
358	else if (svt == SVt_PVAV)	425	else if (svt == SVt_PVAV)
359	encode_av (enc, (AV *)sv);	426	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	427	else
378	croak ("encountered %s, but CBOR can only represent references to arrays or hashes",	428	{
379	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	429	encode_tag (enc, CBOR_TAG_INDIRECTION);
		430	encode_sv (enc, sv);
		431	}
380	}	432	}
381		433
382	static void	434	static void
383	encode_nv (enc_t enc, SV sv)	435	encode_nv (enc_t enc, SV sv)
384	{	436	{
…		…
449	}	501	}
450		502
451	static SV *	503	static SV *
452	encode_cbor (SV scalar, CBOR cbor)	504	encode_cbor (SV scalar, CBOR cbor)
453	{	505	{
454	enc_t enc;	506	enc_t enc = { };
455		507
456	enc.cbor = *cbor;	508	enc.cbor = *cbor;
457	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	509	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458	enc.cur = SvPVX (enc.sv);	510	enc.cur = SvPVX (enc.sv);
459	enc.end = SvEND (enc.sv);	511	enc.end = SvEND (enc.sv);
460	enc.depth = 0;
461		512
462	SvPOK_only (enc.sv);	513	SvPOK_only (enc.sv);
		514
		515	if (cbor->flags & F_ALLOW_STRINGREF)
		516	{
		517	encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
		518	enc.stringref[0]= (HV )sv_2mortal ((SV )newHV ());
		519	enc.stringref[1]= (HV )sv_2mortal ((SV )newHV ());
		520	}
		521
463	encode_sv (&enc, scalar);	522	encode_sv (&enc, scalar);
464		523
465	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	524	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	525	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467		526
…		…
481	U8 *end; // end of input string	540	U8 *end; // end of input string
482	const char *err; // parse error, if != 0	541	const char *err; // parse error, if != 0
483	CBOR cbor;	542	CBOR cbor;
484	U32 depth; // recursion depth	543	U32 depth; // recursion depth
485	U32 maxdepth; // recursion depth limit	544	U32 maxdepth; // recursion depth limit
		545	AV *shareable;
		546	AV *stringref;
486	} dec_t;	547	} dec_t;
487		548
488	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE	549	#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489		550
490	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")	551	#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
…		…
588		649
589	static void	650	static void
590	decode_he (dec_t dec, HV hv)	651	decode_he (dec_t dec, HV hv)
591	{	652	{
592	// for speed reasons, we specialcase single-string	653	// for speed reasons, we specialcase single-string
593	// byte or utf-8 strings as keys.	654	// byte or utf-8 strings as keys, but only when !stringref
594		655
		656	if (ecb_expect_true (!dec->stringref))
595	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)	657	if (dec->cur >= 0x40 && dec->cur <= 0x40 + 27)
596	{	658	{
597	I32 len = decode_uint (dec);	659	I32 len = decode_uint (dec);
598	char key = (char )dec->cur;	660	char key = (char )dec->cur;
599		661
600	dec->cur += len;	662	dec->cur += len;
601		663
		664	if (ecb_expect_false (dec->stringref))
		665	av_push (dec->stringref, newSVpvn (key, len));
		666
602	hv_store (hv, key, len, decode_sv (dec), 0);	667	hv_store (hv, key, len, decode_sv (dec), 0);
		668
		669	return;
603	}	670	}
604	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)	671	else if (dec->cur >= 0x60 && dec->cur <= 0x60 + 27)
605	{	672	{
606	I32 len = decode_uint (dec);	673	I32 len = decode_uint (dec);
607	char key = (char )dec->cur;	674	char key = (char )dec->cur;
608		675
609	dec->cur += len;	676	dec->cur += len;
610		677
		678	if (ecb_expect_false (dec->stringref))
		679	av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
		680
611	hv_store (hv, key, -len, decode_sv (dec), 0);	681	hv_store (hv, key, -len, decode_sv (dec), 0);
		682
		683	return;
612	}	684	}
613	else	685
614	{
615	SV *k = decode_sv (dec);	686	SV *k = decode_sv (dec);
616	SV *v = decode_sv (dec);	687	SV *v = decode_sv (dec);
617		688
618	hv_store_ent (hv, k, v, 0);	689	hv_store_ent (hv, k, v, 0);
619	SvREFCNT_dec (k);	690	SvREFCNT_dec (k);
620	}
621	}	691	}
622		692
623	static SV *	693	static SV *
624	decode_hv (dec_t *dec)	694	decode_hv (dec_t *dec)
625	{	695	{
…		…
691	STRLEN len = decode_uint (dec);	761	STRLEN len = decode_uint (dec);
692		762
693	WANT (len);	763	WANT (len);
694	sv = newSVpvn (dec->cur, len);	764	sv = newSVpvn (dec->cur, len);
695	dec->cur += len;	765	dec->cur += len;
		766
		767	if (ecb_expect_false (dec->stringref)
		768	&& SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
		769	av_push (dec->stringref, SvREFCNT_inc_NN (sv));
696	}	770	}
697		771
698	if (utf8)	772	if (utf8)
699	SvUTF8_on (sv);	773	SvUTF8_on (sv);
700		774
…		…
706	}	780	}
707		781
708	static SV *	782	static SV *
709	decode_tagged (dec_t *dec)	783	decode_tagged (dec_t *dec)
710	{	784	{
		785	SV *sv = 0;
711	UV tag = decode_uint (dec);	786	UV tag = decode_uint (dec);
		787
		788	WANT (1);
		789
		790	switch (tag)
		791	{
		792	case CBOR_TAG_MAGIC:
712	SV *sv = decode_sv (dec);	793	sv = decode_sv (dec);
		794	break;
713		795
714	if (tag == CBOR_TAG_MAGIC)	796	case CBOR_TAG_INDIRECTION:
715	return sv;	797	sv = newRV_noinc (decode_sv (dec));
716	else if (tag == CBOR_TAG_PERL_OBJECT)	798	break;
717	{
718	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
719	ERR ("corrupted CBOR data (non-array perl object)");
720		799
721	AV av = (AV )SvRV (sv);	800	case CBOR_TAG_STRINGREF_NAMESPACE:
722	int len = av_len (av) + 1;
723	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
724
725	if (!stash)
726	ERR ("cannot decode perl-object (package does not exist)");
727
728	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
729		801	{
730	if (!method)	802	ENTER; SAVETMPS;
731	ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733	dSP;
734		803
735	ENTER; SAVETMPS; PUSHMARK (SP);	804	SAVESPTR (dec->stringref);
736	EXTEND (SP, len + 1);	805	dec->stringref = (AV )sv_2mortal ((SV )newAV ());
737	// we re-bless the reference to get overload and other niceties right
738	PUSHs (*av_fetch (av, 0, 1));
739	PUSHs (sv_cbor);
740		806
741	int i;	807	sv = decode_sv (dec);
742		808
743	for (i = 1; i < len; ++i)
744	PUSHs (*av_fetch (av, i, 1));
745
746	PUTBACK;
747	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
748	SPAGAIN;
749
750	if (SvTRUE (ERRSV))
751	{
752	FREETMPS; LEAVE;	809	FREETMPS; LEAVE;
		810	}
		811	break;
		812
		813	case CBOR_TAG_STRINGREF:
		814	{
		815	if ((*dec->cur >> 5) != 0)
		816	ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
		817
		818	UV idx = decode_uint (dec);
		819
		820	if (!dec->stringref \|\| (int)idx > AvFILLp (dec->stringref))
		821	ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
		822
		823	sv = newSVsv (AvARRAY (dec->stringref)[idx]);
		824	}
		825	break;
		826
		827	case CBOR_TAG_VALUE_SHAREABLE:
		828	{
		829	if (ecb_expect_false (!dec->shareable))
		830	dec->shareable = (AV )sv_2mortal ((SV )newAV ());
		831
		832	sv = newSV (0);
		833	av_push (dec->shareable, SvREFCNT_inc_NN (sv));
		834
		835	SV *osv = decode_sv (dec);
		836	sv_setsv (sv, osv);
		837	SvREFCNT_dec_NN (osv);
		838	}
		839	break;
		840
		841	case CBOR_TAG_VALUE_SHAREDREF:
		842	{
		843	if ((*dec->cur >> 5) != 0)
		844	ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
		845
		846	UV idx = decode_uint (dec);
		847
		848	if (!dec->shareable \|\| (int)idx > AvFILLp (dec->shareable))
		849	ERR ("corrupted CBOR data (sharedref index out of bounds)");
		850
		851	sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
		852	}
		853	break;
		854
		855	case CBOR_TAG_PERL_OBJECT:
		856	{
		857	sv = decode_sv (dec);
		858
		859	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		860	ERR ("corrupted CBOR data (non-array perl object)");
		861
		862	AV av = (AV )SvRV (sv);
		863	int len = av_len (av) + 1;
		864	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		865
		866	if (!stash)
		867	ERR ("cannot decode perl-object (package does not exist)");
		868
		869	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		870
		871	if (!method)
		872	ERR ("cannot decode perl-object (package does not have a THAW method)");
		873
		874	dSP;
		875
		876	ENTER; SAVETMPS; PUSHMARK (SP);
		877	EXTEND (SP, len + 1);
		878	// we re-bless the reference to get overload and other niceties right
		879	PUSHs (*av_fetch (av, 0, 1));
		880	PUSHs (sv_cbor);
		881
		882	int i;
		883
		884	for (i = 1; i < len; ++i)
		885	PUSHs (*av_fetch (av, i, 1));
		886
		887	PUTBACK;
		888	call_sv ((SV *)GvCV (method), G_SCALAR \| G_EVAL);
		889	SPAGAIN;
		890
		891	if (SvTRUE (ERRSV))
		892	{
		893	FREETMPS; LEAVE;
753	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));	894	ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
754	}	895	}
755		896
756	SvREFCNT_dec (sv);	897	SvREFCNT_dec (sv);
757	sv = SvREFCNT_inc (POPs);	898	sv = SvREFCNT_inc (POPs);
758		899
759	PUTBACK;	900	PUTBACK;
760		901
761	FREETMPS; LEAVE;	902	FREETMPS; LEAVE;
		903	}
		904	break;
762		905
763	return sv;	906	default:
764	}	907	{
765	else	908	sv = decode_sv (dec);
766	{	909
767	AV *av = newAV ();	910	AV *av = newAV ();
768	av_push (av, newSVuv (tag));	911	av_push (av, newSVuv (tag));
769	av_push (av, sv);	912	av_push (av, sv);
770		913
771	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash	914	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
772	? cbor_tagged_stash	915	? cbor_tagged_stash
773	: gv_stashpv ("CBOR::XS::Tagged" , 1);	916	: gv_stashpv ("CBOR::XS::Tagged" , 1);
774		917
775	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);	918	sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		919	}
		920	break;
776	}	921	}
		922
		923	return sv;
777		924
778	fail:	925	fail:
779	SvREFCNT_dec (sv);	926	SvREFCNT_dec (sv);
780	return &PL_sv_undef;	927	return &PL_sv_undef;
781	}	928	}
…		…
872	}	1019	}
873		1020
874	static SV *	1021	static SV *
875	decode_cbor (SV string, CBOR cbor, char **offset_return)	1022	decode_cbor (SV string, CBOR cbor, char **offset_return)
876	{	1023	{
877	dec_t dec;	1024	dec_t dec = { };
878	SV *sv;	1025	SV *sv;
879	STRLEN len;	1026	STRLEN len;
880	char *data = SvPVbyte (string, len);	1027	char *data = SvPVbyte (string, len);
881		1028
882	if (len > cbor->max_size && cbor->max_size)	1029	if (len > cbor->max_size && cbor->max_size)
…		…
884	(unsigned long)len, (unsigned long)cbor->max_size);	1031	(unsigned long)len, (unsigned long)cbor->max_size);
885		1032
886	dec.cbor = *cbor;	1033	dec.cbor = *cbor;
887	dec.cur = (U8 *)data;	1034	dec.cur = (U8 *)data;
888	dec.end = (U8 *)data + len;	1035	dec.end = (U8 *)data + len;
889	dec.err = 0;
890	dec.depth = 0;
891		1036
892	sv = decode_sv (&dec);	1037	sv = decode_sv (&dec);
893		1038
894	if (offset_return)	1039	if (offset_return)
895	*offset_return = dec.cur;	1040	*offset_return = dec.cur;
…		…
953		1098
954	void shrink (CBOR *self, int enable = 1)	1099	void shrink (CBOR *self, int enable = 1)
955	ALIAS:	1100	ALIAS:
956	shrink = F_SHRINK	1101	shrink = F_SHRINK
957	allow_unknown = F_ALLOW_UNKNOWN	1102	allow_unknown = F_ALLOW_UNKNOWN
		1103	allow_sharing = F_ALLOW_SHARING
		1104	allow_stringref = F_ALLOW_STRINGREF
958	PPCODE:	1105	PPCODE:
959	{	1106	{
960	if (enable)	1107	if (enable)
961	self->flags \|= ix;	1108	self->flags \|= ix;
962	else	1109	else
…		…
967		1114
968	void get_shrink (CBOR *self)	1115	void get_shrink (CBOR *self)
969	ALIAS:	1116	ALIAS:
970	get_shrink = F_SHRINK	1117	get_shrink = F_SHRINK
971	get_allow_unknown = F_ALLOW_UNKNOWN	1118	get_allow_unknown = F_ALLOW_UNKNOWN
		1119	get_allow_sharing = F_ALLOW_SHARING
		1120	get_allow_stringref = F_ALLOW_STRINGREF
972	PPCODE:	1121	PPCODE:
973	XPUSHs (boolSV (self->flags & ix));	1122	XPUSHs (boolSV (self->flags & ix));
974		1123
975	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)	1124	void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
976	PPCODE:	1125	PPCODE:

Diff Legend

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

Comparing cvsroot/CBOR-XS/XS.xs (file contents): Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs. Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

Diff Legend

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC