--- JSON-XS/XS.xs	2007/08/26 21:56:47	1.61
+++ JSON-XS/XS.xs	2007/08/27 02:03:23	1.64
@@ -29,6 +29,8 @@
 #define F_SHRINK         0x00000200UL
 #define F_ALLOW_BLESSED  0x00000400UL
 #define F_CONV_BLESSED   0x00000800UL
+#define F_RELAXED        0x00001000UL
+
 #define F_MAXDEPTH       0xf8000000UL
 #define S_MAXDEPTH       27
 #define F_MAXSIZE        0x01f00000UL
@@ -464,7 +466,7 @@
               encode_indent (enc);
               he = hes [count];
               encode_hk (enc, he);
-              encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
+              encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
 
               if (count)
                 encode_comma (enc);
@@ -479,7 +481,7 @@
             {
               encode_indent (enc);
               encode_hk (enc, he);
-              encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
+              encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
 
               if (!(he = hv_iternext (hv)))
                 break;
@@ -700,15 +702,35 @@
 } dec_t;
 
 inline void
+decode_comment (dec_t *dec)
+{
+  // only '#'-style comments allowed a.t.m.
+
+  while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
+    ++dec->cur;
+}
+
+inline void
 decode_ws (dec_t *dec)
 {
   for (;;)
     {
       char ch = *dec->cur;
 
-      if (ch > 0x20
-          || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 
-        break;
+      if (ch > 0x20)
+        {
+          if (expect_false (ch == '#'))
+            {
+              if (dec->json.flags & F_RELAXED)
+                decode_comment (dec);
+              else
+                break;
+            }
+          else
+            break;
+        }
+      else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
+        break; // parse error, but let higher level handle it, gives better error messages
 
       ++dec->cur;
     }
@@ -1055,6 +1077,14 @@
           ERR (", or ] expected while parsing array");
 
         ++dec->cur;
+
+        decode_ws (dec);
+
+        if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
+          {
+            ++dec->cur;
+            break;
+          }
       }
 
   DEC_DEC_DEPTH;
@@ -1080,7 +1110,7 @@
   else
     for (;;)
       {
-        decode_ws (dec); EXPECT_CH ('"');
+        EXPECT_CH ('"');
 
         // heuristic: assume that
         // a) decode_str + hv_store_ent are abysmally slow.
@@ -1104,6 +1134,7 @@
 
                   decode_ws (dec); EXPECT_CH (':');
 
+                  decode_ws (dec);
                   value = decode_sv (dec);
                   if (!value)
                     {
@@ -1125,6 +1156,7 @@
 
                   decode_ws (dec); EXPECT_CH (':');
 
+                  decode_ws (dec);
                   value = decode_sv (dec);
                   if (!value)
                     goto fail;
@@ -1150,6 +1182,14 @@
           ERR (", or } expected while parsing object/hash");
 
         ++dec->cur;
+
+        decode_ws (dec);
+
+        if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
+          {
+            ++dec->cur;
+            break;
+          }
       }
 
   DEC_DEC_DEPTH;
@@ -1224,8 +1264,6 @@
 static SV *
 decode_sv (dec_t *dec)
 {
-  decode_ws (dec);
-
   // the beauty of JSON: you need exactly one character lookahead
   // to parse anything.
   switch (*dec->cur)
@@ -1319,6 +1357,8 @@
     dec.json.flags |= F_HOOK;
 
   *dec.end = 0; // this should basically be a nop, too, but make sure it's there
+
+  decode_ws (&dec);
   sv = decode_sv (&dec);
 
   if (!(offset_return || !sv))
@@ -1425,6 +1465,7 @@
         shrink          = F_SHRINK
         allow_blessed   = F_ALLOW_BLESSED
         convert_blessed = F_CONV_BLESSED
+        relaxed         = F_RELAXED
 	PPCODE:
 {
         if (enable)