--- JSON-XS/XS.xs	2008/03/25 06:37:38	1.77
+++ JSON-XS/XS.xs	2008/03/27 06:37:35	1.84
@@ -33,6 +33,7 @@
 #define F_ALLOW_BLESSED  0x00000400UL
 #define F_CONV_BLESSED   0x00000800UL
 #define F_RELAXED        0x00001000UL
+#define F_ALLOW_UNKNOWN  0x00002000UL
 
 #define F_MAXDEPTH       0xf8000000UL
 #define S_MAXDEPTH       27
@@ -104,6 +105,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // utility functions
 
+INLINE SV *
+get_bool (const char *name)
+{
+  SV *sv = get_sv (name, 1);
+
+  SvREADONLY_on (sv);
+  SvREADONLY_on (SvRV (sv));
+
+  return sv;
+}
+
 INLINE void
 shrink (SV *sv)
 {
@@ -440,7 +452,6 @@
 encode_hv (enc_t *enc, HV *hv)
 {
   HE *he;
-  int count;
 
   if (enc->indent >= enc->maxdepth)
     croak ("data structure too deep (hit recursion limit)");
@@ -634,10 +645,14 @@
         encode_str (enc, "true", 4, 0);
       else if (len == 1 && *pv == '0')
         encode_str (enc, "false", 5, 0);
+      else if (enc->json.flags & F_ALLOW_UNKNOWN)
+        encode_str (enc, "null", 4, 0);
       else
         croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
                SvPV_nolen (sv_2mortal (newRV_inc (sv))));
     }
+  else if (enc->json.flags & F_ALLOW_UNKNOWN)
+    encode_str (enc, "null", 4, 0);
   else
     croak ("encountered %s, but JSON can only represent references to arrays or hashes",
            SvPV_nolen (sv_2mortal (newRV_inc (sv))));
@@ -709,7 +724,7 @@
     }
   else if (SvROK (sv))
     encode_rv (enc, SvRV (sv));
-  else if (!SvOK (sv))
+  else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
     encode_str (enc, "null", 4, 0);
   else
     croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
@@ -1346,9 +1361,9 @@
           {
             dec->cur += 4;
 #if JSON_SLOW
-            json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
+            json_true = get_bool ("JSON::XS::true");
 #endif
-            return SvREFCNT_inc (json_true);
+            return newSVsv (json_true);
           }
         else
           ERR ("'true' expected");
@@ -1360,9 +1375,9 @@
           {
             dec->cur += 5;
 #if JSON_SLOW
-            json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
+            json_false = get_bool ("JSON::XS::false");
 #endif
-            return SvREFCNT_inc (json_false);
+            return newSVsv (json_false);
           }
         else
           ERR ("'false' expected");
@@ -1610,8 +1625,8 @@
 	json_stash         = gv_stashpv ("JSON::XS"         , 1);
 	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
 
-        json_true  = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
-        json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
+        json_true  = get_bool ("JSON::XS::true");
+        json_false = get_bool ("JSON::XS::false");
 }
 
 PROTOTYPES: DISABLE
@@ -1649,6 +1664,7 @@
         allow_blessed   = F_ALLOW_BLESSED
         convert_blessed = F_CONV_BLESSED
         relaxed         = F_RELAXED
+        allow_unknown   = F_ALLOW_UNKNOWN
 	PPCODE:
 {
         if (enable)
@@ -1673,6 +1689,7 @@
         get_allow_blessed   = F_ALLOW_BLESSED
         get_convert_blessed = F_CONV_BLESSED
         get_relaxed         = F_RELAXED
+        get_allow_unknown   = F_ALLOW_UNKNOWN
 	PPCODE:
         XPUSHs (boolSV (self->flags & ix));
 
@@ -1801,10 +1818,12 @@
             {
               STRLEN offset;
 
-              incr_parse (self);
-
               if (!INCR_DONE (self))
-                break;
+                {
+                  incr_parse (self);
+                  if (!INCR_DONE (self))
+                    break;
+                }
 
               XPUSHs (decode_json (self->incr_text, self, &offset));
 
@@ -1821,13 +1840,25 @@
 	CODE:
 {
         if (self->incr_pos)
-          croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D
+          croak ("incr_text can not be called when the incremental parser already started parsing");
 
         RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
 }
 	OUTPUT:
         RETVAL
 
+void incr_skip (JSON *self)
+	CODE:
+{
+        if (self->incr_pos)
+          {
+            sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
+            self->incr_pos  = 0;
+            self->incr_nest = 0;
+            self->incr_mode = 0;
+          }
+}
+
 void DESTROY (JSON *self)
 	CODE:
         SvREFCNT_dec (self->cb_sk_object);