--- CBOR-XS/XS.xs	2013/10/27 10:12:01	1.8
+++ CBOR-XS/XS.xs	2013/10/27 20:40:25	1.10
@@ -11,28 +11,33 @@
 
 #include "ecb.h"
 
-// known tags, rfc7049
+// known tags
 enum cbor_tag
 {
-   CBOR_TAG_DATETIME   =     0, // rfc4287, utf-8
-   CBOR_TAG_TIMESTAMP  =     1, // unix timestamp, any
-   CBOR_TAG_POS_BIGNUM =     2, // byte string
-   CBOR_TAG_NEG_BIGNUM =     3, // byte string
-   CBOR_TAG_DECIMAL    =     4, // decimal fraction, array
-   CBOR_TAG_BIGFLOAT   =     5, // array
-
-   CBOR_TAG_CONV_B64U  =    21, // base64url, any
-   CBOR_TAG_CONV_B64   =    22, // base64, any
-   CBOR_TAG_CONV_HEX   =    23, // base16, any
-   CBOR_TAG_CBOR       =    24, // embedded cbor, byte string
-
-   CBOR_TAG_URI        =    32, // URI rfc3986, utf-8
-   CBOR_TAG_B64U       =    33, // base64url rfc4648, utf-8
-   CBOR_TAG_B64        =    34, // base6 rfc46484, utf-8
-   CBOR_TAG_REGEX      =    35, // regex pcre/ecma262, utf-8
-   CBOR_TAG_MIME       =    36, // mime message rfc2045, utf-8
+   // inofficial extensions (pending iana registration)
+   CBOR_TAG_PERL_OBJECT    = 256,
+   CBOR_TAG_GENERIC_OBJECT = 257,
+
+   // rfc7049
+   CBOR_TAG_DATETIME    =     0, // rfc4287, utf-8
+   CBOR_TAG_TIMESTAMP   =     1, // unix timestamp, any
+   CBOR_TAG_POS_BIGNUM  =     2, // byte string
+   CBOR_TAG_NEG_BIGNUM  =     3, // byte string
+   CBOR_TAG_DECIMAL     =     4, // decimal fraction, array
+   CBOR_TAG_BIGFLOAT    =     5, // array
+
+   CBOR_TAG_CONV_B64U   =    21, // base64url, any
+   CBOR_TAG_CONV_B64    =    22, // base64, any
+   CBOR_TAG_CONV_HEX    =    23, // base16, any
+   CBOR_TAG_CBOR        =    24, // embedded cbor, byte string
+
+   CBOR_TAG_URI         =    32, // URI rfc3986, utf-8
+   CBOR_TAG_B64U        =    33, // base64url rfc4648, utf-8
+   CBOR_TAG_B64         =    34, // base6 rfc46484, utf-8
+   CBOR_TAG_REGEX       =    35, // regex pcre/ecma262, utf-8
+   CBOR_TAG_MIME        =    36, // mime message rfc2045, utf-8
 
-   CBOR_TAG_MAGIC      = 55799
+   CBOR_TAG_MAGIC       = 55799  // self-describe cbor
 };
 
 #define F_SHRINK         0x00000200UL
@@ -57,8 +62,8 @@
 # define CBOR_STASH cbor_stash
 #endif
 
-static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS::
-static SV *cbor_true, *cbor_false;
+static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
+static SV *types_true, *types_false, *types_error;
 
 typedef struct {
   U32 flags;
@@ -256,15 +261,20 @@
 
   if (ecb_expect_false (SvOBJECT (sv)))
     {
-      HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash
-                          ? cbor_boolean_stash
-                          : gv_stashpv ("CBOR::XS::Boolean", 1);
+      HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
+                          ? types_boolean_stash
+                          : gv_stashpv ("Types::Serialiser::Boolean", 1);
+      HV *error_stash   = !CBOR_SLOW || types_error_stash
+                          ? types_error_stash
+                          : gv_stashpv ("Types::Serialiser::Error", 1);
       HV *tagged_stash  = !CBOR_SLOW || cbor_tagged_stash
                           ? cbor_tagged_stash
                           : gv_stashpv ("CBOR::XS::Tagged" , 1);
 
       if (SvSTASH (sv) == boolean_stash)
         encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
+      else if (SvSTASH (sv) == error_stash)
+        encode_ch (enc, 0xe0 | 23);
       else if (SvSTASH (sv) == tagged_stash)
         {
           if (svt != SVt_PVAV)
@@ -638,9 +648,17 @@
   UV tag = decode_uint (dec);
   SV *sv = decode_sv (dec);
 
-  if (tag == CBOR_TAG_MAGIC) // 2.4.5 Self-Describe CBOR
+  if (tag == CBOR_TAG_MAGIC)
     return sv;
 
+  if (tag == CBOR_TAG_PERL_OBJECT)
+    {
+      if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
+        ERR ("corrupted CBOR data (non-array perl object)");
+      
+      // TODO
+    }
+
   AV *av = newAV ();
   av_push (av, newSVuv (tag));
   av_push (av, sv);
@@ -650,6 +668,10 @@
                       : gv_stashpv ("CBOR::XS::Tagged" , 1);
 
   return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
+
+fail:
+  SvREFCNT_dec (sv);
+  return &PL_sv_undef;
 }
 
 static SV *
@@ -678,16 +700,21 @@
           {
             case 20:
 #if CBOR_SLOW
-              cbor_false = get_bool ("CBOR::XS::false");
+              types_false = get_bool ("Types::Serialiser::false");
 #endif
-              return newSVsv (cbor_false);
+              return newSVsv (types_false);
             case 21:
 #if CBOR_SLOW
-              cbor_true = get_bool ("CBOR::XS::true");
+              types_true = get_bool ("Types::Serialiser::true");
 #endif
-              return newSVsv (cbor_true);
+              return newSVsv (types_true);
             case 22:
               return newSVsv (&PL_sv_undef);
+            case 23:
+#if CBOR_SLOW
+              types_error = get_bool ("Types::Serialiser::error");
+#endif
+              return newSVsv (types_error);
 
             case 25:
               {
@@ -813,20 +840,24 @@
 BOOT:
 {
 	cbor_stash         = gv_stashpv ("CBOR::XS"         , 1);
-	cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
 	cbor_tagged_stash  = gv_stashpv ("CBOR::XS::Tagged" , 1);
 
-        cbor_true  = get_bool ("CBOR::XS::true");
-        cbor_false = get_bool ("CBOR::XS::false");
+	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
+	types_error_stash   = gv_stashpv ("Types::Serialiser::Error"  , 1);
+
+        types_true  = get_bool ("Types::Serialiser::true" );
+        types_false = get_bool ("Types::Serialiser::false");
+        types_error = get_bool ("Types::Serialiser::error");
 }
 
 PROTOTYPES: DISABLE
 
 void CLONE (...)
 	CODE:
-        cbor_stash         = 0;
-        cbor_boolean_stash = 0;
-        cbor_tagged_stash  = 0;
+        cbor_stash          = 0;
+        cbor_tagged_stash   = 0;
+        types_error_stash   = 0;
+        types_boolean_stash = 0;
 
 void new (char *klass)
 	PPCODE: