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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC

 #define F_ALLOW_NONREF   0x00000100UL
 #define F_SHRINK         0x00000200UL
 #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
 #define F_MAXSIZE        0x01f00000UL
 #define S_MAXSIZE        20
   int incr_mode;
 } JSON;
 /////////////////////////////////////////////////////////////////////////////
 // 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)
 {
   sv_utf8_downgrade (sv, 1);
 static void
 encode_hv (enc_t *enc, HV *hv)
 {
   HE *he;
-  int count;
   if (enc->indent >= enc->maxdepth)
     croak ("data structure too deep (hit recursion limit)");
   encode_ch (enc, '{');
       if (len == 1 && *pv == '1')
         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))));
 }
                 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
         }
     }
   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",
            SvPV_nolen (sv), SvFLAGS (sv));
 }
       case 't':
         if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
           {
             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");
         break;
       case 'f':
         if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
           {
             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");
         break;
             : -1;
 	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_true  = get_bool ("JSON::XS::true");
-        json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
+        json_false = get_bool ("JSON::XS::false");
 }
 PROTOTYPES: DISABLE
 void CLONE (...)
         allow_nonref    = F_ALLOW_NONREF
         shrink          = F_SHRINK
         allow_blessed   = F_ALLOW_BLESSED
         convert_blessed = F_CONV_BLESSED
         relaxed         = F_RELAXED
+        allow_unknown   = F_ALLOW_UNKNOWN
 	PPCODE:
 {
         if (enable)
           self->flags |=  ix;
         else
         get_allow_nonref    = F_ALLOW_NONREF
         get_shrink          = F_SHRINK
         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));
 void max_depth (JSON *self, UV max_depth = 0x80000000UL)
 	PPCODE:
         if (GIMME_V != G_VOID)
           do
             {
               STRLEN offset;
-              incr_parse (self);
               if (!INCR_DONE (self))
+                {
+                  incr_parse (self);
+                  if (!INCR_DONE (self))
-                break;
+                    break;
+                }
               XPUSHs (decode_json (self->incr_text, self, &offset));
               sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
               self->incr_pos -= offset;
 SV *incr_text (JSON *self)
 	ATTRS: lvalue
 	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);
         SvREFCNT_dec (self->cb_object);

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs. Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC