--- JSON-XS/XS.xs	2007/07/10 16:22:31	1.54
+++ JSON-XS/XS.xs	2007/08/13 16:05:42	1.57
@@ -2,10 +2,11 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#include "assert.h"
-#include "string.h"
-#include "stdlib.h"
-#include "stdio.h"
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <float.h>
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
 # define snprintf _snprintf // C compilers have this in stdio.h
@@ -59,6 +60,12 @@
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 
+#ifdef USE_ITHREADS
+# define JSON_SLOW 1
+#else
+# define JSON_SLOW 1
+#endif
+
 static HV *json_stash, *json_boolean_stash; // JSON::XS::
 static SV *json_true, *json_false;
 
@@ -308,8 +315,14 @@
 
   for (i = 0; i <= len; ++i)
     {
+      SV **svp = av_fetch (av, i, 0);
+
       encode_indent (enc);
-      encode_sv (enc, *av_fetch (av, i, 0));
+
+      if (svp)
+        encode_sv (enc, *svp);
+      else
+        encode_str (enc, "null", 4, 0);
 
       if (i < len)
         encode_comma (enc);
@@ -473,7 +486,11 @@
 
   if (expect_false (SvOBJECT (sv)))
     {
-      if (SvSTASH (sv) == json_boolean_stash)
+      HV *stash = !JSON_SLOW || json_boolean_stash
+                  ? json_boolean_stash
+                  : gv_stashpv ("JSON::XS::Boolean", 1);
+
+      if (SvSTASH (sv) == stash)
         {
           if (SvIV (sv))
             encode_str (enc, "true", 4, 0);
@@ -933,9 +950,11 @@
 
   if (!is_nv)
     {
+      int len = dec->cur - start;
+
       // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
       if (*start == '-')
-        switch (dec->cur - start)
+        switch (len)
           {
             case 2: return newSViv (-(                                                      start [1] - '0' *    1));
             case 3: return newSViv (-(                                     start [1] * 10 + start [2] - '0' *   11));
@@ -943,7 +962,7 @@
             case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
           }
       else
-        switch (dec->cur - start)
+        switch (len)
           {
             case 1: return newSViv (                                                        start [0] - '0' *    1);
             case 2: return newSViv (                                       start [0] * 10 + start [1] - '0' *   11);
@@ -953,7 +972,7 @@
 
       {
         UV uv;
-        int numtype = grok_number (start, dec->cur - start, &uv);
+        int numtype = grok_number (start, len, &uv);
         if (numtype & IS_NUMBER_IN_UV)
           if (numtype & IS_NUMBER_NEG)
             {
@@ -962,12 +981,24 @@
             }
           else
             return newSVuv (uv);
-
-        // here would likely be the place for bigint support
       }
+
+      len -= *start == '-' ? 1 : 0;
+
+      // does not fit into IV or UV, try NV
+      if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
+          #if defined (LDBL_DIG)
+          || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
+          #endif
+         )
+        // fits into NV without loss of precision
+        return newSVnv (Atof (start));
+
+      // everything else fails, convert it to a string
+      return newSVpvn (start, dec->cur - start);
     }
 
-  // if we ever support bigint or bigfloat, this is the place for bigfloat
+  // loss of precision here
   return newSVnv (Atof (start));
 
 fail:
@@ -1342,14 +1373,22 @@
 
 PROTOTYPES: DISABLE
 
+void CLONE (...)
+	CODE:
+        json_stash         = 0;
+        json_boolean_stash = 0;
+
 void new (char *klass)
 	PPCODE:
 {
+  	HV *stash = !JSON_SLOW || json_stash
+                    ? json_stash
+                    : gv_stashpv ("JSON::XS", 1);
   	SV *pv = NEWSV (0, sizeof (JSON));
         SvPOK_only (pv);
         Zero (SvPVX (pv), 1, JSON);
         ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
-        XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
+        XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash)));
 }
 
 void ascii (JSON *self, int enable = 1)