--- JSON-XS/XS.xs	2007/11/29 08:37:11	1.68
+++ JSON-XS/XS.xs	2008/03/19 00:44:54	1.70
@@ -1002,22 +1002,24 @@
     {
       int len = dec->cur - start;
 
-      // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
+      // special case the rather common 1..5-digit-int case
       if (*start == '-')
         switch (len)
           {
-            case 2: return newSViv (-(                                                      start [1] - '0' *    1));
-            case 3: return newSViv (-(                                     start [1] * 10 + start [2] - '0' *   11));
-            case 4: return newSViv (-(                   start [1] * 100 + start [2] * 10 + start [3] - '0' *  111));
-            case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
+            case 2: return newSViv (-(                                                                          start [1] - '0' *     1));
+            case 3: return newSViv (-(                                                         start [1] * 10 + start [2] - '0' *    11));
+            case 4: return newSViv (-(                                       start [1] * 100 + start [2] * 10 + start [3] - '0' *   111));
+            case 5: return newSViv (-(                    start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' *  1111));
+            case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
           }
       else
         switch (len)
           {
-            case 1: return newSViv (                                                        start [0] - '0' *    1);
-            case 2: return newSViv (                                       start [0] * 10 + start [1] - '0' *   11);
-            case 3: return newSViv (                     start [0] * 100 + start [1] * 10 + start [2] - '0' *  111);
-            case 4: return newSViv (  start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
+            case 1: return newSViv (                                                                            start [0] - '0' *     1);
+            case 2: return newSViv (                                                           start [0] * 10 + start [1] - '0' *    11);
+            case 3: return newSViv (                                         start [0] * 100 + start [1] * 10 + start [2] - '0' *   111);
+            case 4: return newSViv (                      start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' *  1111);
+            case 5: return newSViv (  start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
           }
 
       {
@@ -1605,14 +1607,14 @@
 
 PROTOTYPES: ENABLE
 
-void to_json (SV *scalar)
+void encode_json (SV *scalar)
 	PPCODE:
 {
         JSON json = { F_DEFAULT | F_UTF8 };
         XPUSHs (encode_json (scalar, &json));
 }
 
-void from_json (SV *jsonstr)
+void decode_json (SV *jsonstr)
 	PPCODE:
 {
         JSON json = { F_DEFAULT | F_UTF8 };