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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.15 by root, Tue Oct 29 18:37:31 2013 UTC

…		…
8	#include <stdio.h>	8	#include <stdio.h>
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
		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 = 256,
		30	CBOR_TAG_GENERIC_OBJECT = 257,
		31
		32	// rfc7049
		33	CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
		34	CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
		35	CBOR_TAG_POS_BIGNUM = 2, // byte string
		36	CBOR_TAG_NEG_BIGNUM = 3, // byte string
		37	CBOR_TAG_DECIMAL = 4, // decimal fraction, array
		38	CBOR_TAG_BIGFLOAT = 5, // array
		39
		40	CBOR_TAG_CONV_B64U = 21, // base64url, any
		41	CBOR_TAG_CONV_B64 = 22, // base64, any
		42	CBOR_TAG_CONV_HEX = 23, // base16, any
		43	CBOR_TAG_CBOR = 24, // embedded cbor, byte string
		44
		45	CBOR_TAG_URI = 32, // URI rfc3986, utf-8
		46	CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
		47	CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
		48	CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
		49	CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
		50
		51	CBOR_TAG_MAGIC = 55799 // self-describe cbor
		52	};
13		53
14	#define F_SHRINK 0x00000200UL	54	#define F_SHRINK 0x00000200UL
15	#define F_ALLOW_UNKNOWN 0x00002000UL	55	#define F_ALLOW_UNKNOWN 0x00002000UL
16		56
17	#define INIT_SIZE 32 // initial scalar size to be allocated	57	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
31	#else	71	#else
32	# define CBOR_SLOW 0	72	# define CBOR_SLOW 0
33	# define CBOR_STASH cbor_stash	73	# define CBOR_STASH cbor_stash
34	#endif	74	#endif
35		75
36	static HV cbor_stash, cbor_boolean_stash; // CBOR::XS::	76	static HV cbor_stash, types_boolean_stash, types_error_stash, cbor_tagged_stash; // CBOR::XS::
37	static SV cbor_true, cbor_false;	77	static SV types_true, types_false, types_error, sv_cbor;
38		78
39	typedef struct {	79	typedef struct {
40	U32 flags;	80	U32 flags;
41	U32 max_depth;	81	U32 max_depth;
42	STRLEN max_size;	82	STRLEN max_size;
43
44	SV *cb_object;
45	HV *cb_sk_object;
46	} CBOR;	83	} CBOR;
47		84
48	ecb_inline void	85	ecb_inline void
49	cbor_init (CBOR *cbor)	86	cbor_init (CBOR *cbor)
50	{	87	{
…		…
233	SvGETMAGIC (sv);	270	SvGETMAGIC (sv);
234	svt = SvTYPE (sv);	271	svt = SvTYPE (sv);
235		272
236	if (ecb_expect_false (SvOBJECT (sv)))	273	if (ecb_expect_false (SvOBJECT (sv)))
237	{	274	{
238	HV *stash = !CBOR_SLOW \|\| cbor_boolean_stash	275	HV *boolean_stash = !CBOR_SLOW \|\| types_boolean_stash
239	? cbor_boolean_stash	276	? types_boolean_stash
		277	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		278	HV *error_stash = !CBOR_SLOW \|\| types_error_stash
		279	? types_error_stash
		280	: gv_stashpv ("Types::Serialiser::Error", 1);
		281	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		282	? cbor_tagged_stash
240	: gv_stashpv ("CBOR::XS::Boolean", 1);	283	: gv_stashpv ("CBOR::XS::Tagged" , 1);
241		284
242	if (SvSTASH (sv) == stash)	285	HV *stash = SvSTASH (sv);
		286	GV *method;
		287
		288	if (stash == boolean_stash)
243	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);	289	encode_ch (enc, SvIV (sv) ? 0xe0 \| 21 : 0xe0 \| 20);
		290	else if (stash == error_stash)
		291	encode_ch (enc, 0xe0 \| 23);
		292	else if (stash == tagged_stash)
		293	{
		294	if (svt != SVt_PVAV)
		295	croak ("encountered CBOR::XS::Tagged object that isn't an array");
		296
		297	encode_uint (enc, 0xc0, SvUV (av_fetch ((AV )sv, 0, 1)));
		298	encode_sv (enc, av_fetch ((AV )sv, 1, 1));
		299	}
		300	else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
		301	{
		302	dSP;
		303
		304	ENTER; SAVETMPS; PUSHMARK (SP);
		305	// we re-bless the reference to get overload and other niceties right
		306	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		307
		308	PUTBACK;
		309	// G_SCALAR ensures that return value is 1
		310	call_sv ((SV *)GvCV (method), G_SCALAR);
		311	SPAGAIN;
		312
		313	// catch this surprisingly common error
		314	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		315	croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
		316
		317	encode_sv (enc, POPs);
		318
		319	PUTBACK;
		320
		321	FREETMPS; LEAVE;
		322	}
		323	else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
		324	{
		325	dSP;
		326
		327	ENTER; SAVETMPS; PUSHMARK (SP);
		328	EXTEND (SP, 2);
		329	// we re-bless the reference to get overload and other niceties right
		330	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		331	PUSHs (sv_cbor);
		332
		333	PUTBACK;
		334	int count = call_sv ((SV *)GvCV (method), G_ARRAY);
		335	SPAGAIN;
		336
		337	// catch this surprisingly common error
		338	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));
		340
		341	encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);
		342	encode_uint (enc, 0x80, count + 1);
		343	encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
		344
		345	while (count)
		346	encode_sv (enc, SP[1 - count--]);
		347
		348	PUTBACK;
		349
		350	FREETMPS; LEAVE;
		351	}
244	else	352	else
245	{
246	#if 0 //TODO
247	if (enc->cbor.flags & F_CONV_BLESSED)
248	{
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",	353	croak ("encountered object '%s', but no TO_CBOR or FREEZE methods 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))));	354	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286	#endif
287	}
288	}	355	}
289	else if (svt == SVt_PVHV)	356	else if (svt == SVt_PVHV)
290	encode_hv (enc, (HV *)sv);	357	encode_hv (enc, (HV *)sv);
291	else if (svt == SVt_PVAV)	358	else if (svt == SVt_PVAV)
292	encode_av (enc, (AV *)sv);	359	encode_av (enc, (AV *)sv);
…		…
542		609
543	SV *k = decode_sv (dec);	610	SV *k = decode_sv (dec);
544	SV *v = decode_sv (dec);	611	SV *v = decode_sv (dec);
545		612
546	hv_store_ent (hv, k, v, 0);	613	hv_store_ent (hv, k, v, 0);
		614	SvREFCNT_dec (k);
547	}	615	}
548	}	616	}
549	else	617	else
550	{	618	{
551	int len = decode_uint (dec);	619	int len = decode_uint (dec);
…		…
554	{	622	{
555	SV *k = decode_sv (dec);	623	SV *k = decode_sv (dec);
556	SV *v = decode_sv (dec);	624	SV *v = decode_sv (dec);
557		625
558	hv_store_ent (hv, k, v, 0);	626	hv_store_ent (hv, k, v, 0);
		627	SvREFCNT_dec (k);
559	}	628	}
560	}	629	}
561		630
562	DEC_DEC_DEPTH;	631	DEC_DEC_DEPTH;
563	return newRV_noinc ((SV *)hv);	632	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		633
720	fail:	634	fail:
721	SvREFCNT_dec (hv);	635	SvREFCNT_dec (hv);
722	DEC_DEC_DEPTH;	636	DEC_DEC_DEPTH;
723	return &PL_sv_undef;	637	return &PL_sv_undef;
724	}	638	}
725		639
726	static SV *	640	static SV *
727	decode_str (dec_t *dec, int utf8)	641	decode_str (dec_t *dec, int utf8)
728	{	642	{
729	SV *sv;	643	SV *sv = 0;
730		644
731	if ((*dec->cur & 31) == 31)	645	if ((*dec->cur & 31) == 31)
732	{	646	{
733	++dec->cur;	647	++dec->cur;
734		648
…		…
743	{	657	{
744	++dec->cur;	658	++dec->cur;
745	break;	659	break;
746	}	660	}
747		661
748	SV *sv2 = decode_sv (dec);
749	sv_catsv (sv, sv2);	662	sv_catsv (sv, decode_sv (dec));
750	}	663	}
751	}	664	}
752	else	665	else
753	{	666	{
754	STRLEN len = decode_uint (dec);	667	STRLEN len = decode_uint (dec);
…		…
762	SvUTF8_on (sv);	675	SvUTF8_on (sv);
763		676
764	return sv;	677	return sv;
765		678
766	fail:	679	fail:
		680	SvREFCNT_dec (sv);
767	return &PL_sv_undef;	681	return &PL_sv_undef;
768	}	682	}
769		683
770	static SV *	684	static SV *
771	decode_tagged (dec_t *dec)	685	decode_tagged (dec_t *dec)
772	{	686	{
773	UV tag = decode_uint (dec);	687	UV tag = decode_uint (dec);
774	SV *sv = decode_sv (dec);	688	SV *sv = decode_sv (dec);
775		689
776	if (tag == 55799) // 2.4.5 Self-Describe CBOR	690	if (tag == CBOR_TAG_MAGIC)
777	return sv;	691	return sv;
		692	else if (tag == CBOR_TAG_PERL_OBJECT)
		693	{
		694	if (!SvROK (sv) \|\| SvTYPE (SvRV (sv)) != SVt_PVAV)
		695	ERR ("corrupted CBOR data (non-array perl object)");
778		696
		697	AV av = (AV )SvRV (sv);
		698	int len = av_len (av) + 1;
		699	HV stash = gv_stashsv (av_fetch (av, 0, 1), 0);
		700
		701	if (!stash)
		702	ERR ("cannot decode perl-object (package does not exist)");
		703
		704	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		705
		706	if (!method)
		707	ERR ("cannot decode perl-object (package does not have a THAW method)");
		708
		709	dSP;
		710
		711	ENTER; SAVETMPS; PUSHMARK (SP);
		712	EXTEND (SP, len + 1);
		713	// we re-bless the reference to get overload and other niceties right
		714	PUSHs (*av_fetch (av, 0, 1));
		715	PUSHs (sv_cbor);
		716
		717	int i;
		718
		719	for (i = 1; i < len; ++i)
		720	PUSHs (*av_fetch (av, i, 1));
		721
		722	PUTBACK;
		723	call_sv ((SV *)GvCV (method), G_SCALAR);
		724	SPAGAIN;
		725
		726	SvREFCNT_dec (sv);
		727	sv = SvREFCNT_inc (POPs);
		728
		729	PUTBACK;
		730
		731	FREETMPS; LEAVE;
		732
		733	return sv;
		734	}
		735	else
		736	{
779	AV *av = newAV ();	737	AV *av = newAV ();
780	av_push (av, newSVuv (tag));	738	av_push (av, newSVuv (tag));
781	av_push (av, sv);	739	av_push (av, sv);
782	return newRV_noinc ((SV *)av);	740
		741	HV *tagged_stash = !CBOR_SLOW \|\| cbor_tagged_stash
		742	? cbor_tagged_stash
		743	: gv_stashpv ("CBOR::XS::Tagged" , 1);
		744
		745	return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
		746	}
		747
		748	fail:
		749	SvREFCNT_dec (sv);
		750	return &PL_sv_undef;
783	}	751	}
784		752
785	static SV *	753	static SV *
786	decode_sv (dec_t *dec)	754	decode_sv (dec_t *dec)
787	{	755	{
788	WANT (1);	756	WANT (1);
789		757
790	switch (*dec->cur >> 5)	758	switch (*dec->cur >> 5)
791	{	759	{
792	case 0: // unsigned int	760	case 0: // unsigned int
793	//TODO: 64 bit values on 3 2bit perls
794	return newSVuv (decode_uint (dec));	761	return newSVuv (decode_uint (dec));
795	case 1: // negative int	762	case 1: // negative int
796	return newSViv (-1 - (IV)decode_uint (dec));	763	return newSViv (-1 - (IV)decode_uint (dec));
797	case 2: // octet string	764	case 2: // octet string
798	return decode_str (dec, 0);	765	return decode_str (dec, 0);
…		…
807	case 7: // misc	774	case 7: // misc
808	switch (*dec->cur++ & 31)	775	switch (*dec->cur++ & 31)
809	{	776	{
810	case 20:	777	case 20:
811	#if CBOR_SLOW	778	#if CBOR_SLOW
812	cbor_false = get_bool ("CBOR::XS::false");	779	types_false = get_bool ("Types::Serialiser::false");
813	#endif	780	#endif
814	return newSVsv (cbor_false);	781	return newSVsv (types_false);
815	case 21:	782	case 21:
816	#if CBOR_SLOW	783	#if CBOR_SLOW
817	cbor_true = get_bool ("CBOR::XS::true");	784	types_true = get_bool ("Types::Serialiser::true");
818	#endif	785	#endif
819	return newSVsv (cbor_true);	786	return newSVsv (types_true);
820	case 22:	787	case 22:
821	return newSVsv (&PL_sv_undef);	788	return newSVsv (&PL_sv_undef);
		789	case 23:
		790	#if CBOR_SLOW
		791	types_error = get_bool ("Types::Serialiser::error");
		792	#endif
		793	return newSVsv (types_error);
822		794
823	case 25:	795	case 25:
824	{	796	{
825	WANT (2);	797	WANT (2);
826		798
…		…
862	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");	834	ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863	}	835	}
864		836
865	break;	837	break;
866	}	838	}
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		839
924	fail:	840	fail:
925	return &PL_sv_undef;	841	return &PL_sv_undef;
926	}	842	}
927		843
…		…
970	dec.cur = (U8 *)SvPVX (string);	886	dec.cur = (U8 *)SvPVX (string);
971	dec.end = (U8 *)SvEND (string);	887	dec.end = (U8 *)SvEND (string);
972	dec.err = 0;	888	dec.err = 0;
973	dec.depth = 0;	889	dec.depth = 0;
974		890
975	if (dec.cbor.cb_object \|\| dec.cbor.cb_sk_object)
976	;//TODO dec.cbor.flags \|= F_HOOK;
977
978	sv = decode_sv (&dec);	891	sv = decode_sv (&dec);
979		892
980	if (offset_return)	893	if (offset_return)
981	*offset_return = dec.cur;	894	*offset_return = dec.cur;
982		895
…		…
1001	MODULE = CBOR::XS PACKAGE = CBOR::XS	914	MODULE = CBOR::XS PACKAGE = CBOR::XS
1002		915
1003	BOOT:	916	BOOT:
1004	{	917	{
1005	cbor_stash = gv_stashpv ("CBOR::XS" , 1);	918	cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);	919	cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007		920
1008	cbor_true = get_bool ("CBOR::XS::true");	921	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1009	cbor_false = get_bool ("CBOR::XS::false");	922	types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
		923
		924	types_true = get_bool ("Types::Serialiser::true" );
		925	types_false = get_bool ("Types::Serialiser::false");
		926	types_error = get_bool ("Types::Serialiser::error");
		927
		928	sv_cbor = newSVpv ("CBOR", 0);
		929	SvREADONLY_on (sv_cbor);
1010	}	930	}
1011		931
1012	PROTOTYPES: DISABLE	932	PROTOTYPES: DISABLE
1013		933
1014	void CLONE (...)	934	void CLONE (...)
1015	CODE:	935	CODE:
1016	cbor_stash = 0;	936	cbor_stash = 0;
		937	cbor_tagged_stash = 0;
		938	types_error_stash = 0;
1017	cbor_boolean_stash = 0;	939	types_boolean_stash = 0;
1018		940
1019	void new (char *klass)	941	void new (char *klass)
1020	PPCODE:	942	PPCODE:
1021	{	943	{
1022	SV *pv = NEWSV (0, sizeof (CBOR));	944	SV *pv = NEWSV (0, sizeof (CBOR));
…		…
1069	CODE:	991	CODE:
1070	RETVAL = self->max_size;	992	RETVAL = self->max_size;
1071	OUTPUT:	993	OUTPUT:
1072	RETVAL	994	RETVAL
1073		995
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
1109	void encode (CBOR self, SV scalar)	996	void encode (CBOR self, SV scalar)
1110	PPCODE:	997	PPCODE:
1111	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;	998	PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1112	XPUSHs (scalar);	999	XPUSHs (scalar);
1113		1000
…		…
1125	EXTEND (SP, 2);	1012	EXTEND (SP, 2);
1126	PUSHs (sv);	1013	PUSHs (sv);
1127	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));	1014	PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128	}	1015	}
1129		1016
1130	void DESTROY (CBOR *self)
1131	CODE:
1132	SvREFCNT_dec (self->cb_sk_object);
1133	SvREFCNT_dec (self->cb_object);
1134
1135	PROTOTYPES: ENABLE	1017	PROTOTYPES: ENABLE
1136		1018
1137	void encode_cbor (SV *scalar)	1019	void encode_cbor (SV *scalar)
1138	PPCODE:	1020	PPCODE:
1139	{	1021	{

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs. Revision 1.15 by root, Tue Oct 29 18:37:31 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.15 by root, Tue Oct 29 18:37:31 2013 UTC