Version 1.0.1 cleanup

Author: MarkReedZ

.gitignore

@@ -1,5 +1,6 @@
 *.so
 *.o
+*.swp
 dist/
 build/
 *egg*

src/enc.c

@@ -8,8 +8,6 @@
 //#define IS_NAN(x) std::isnan(x)
 //#define IS_INF(x) std::isinf(x)
 
-#define RESERVE_STRING(_len) (2 + ((_len) * 6))
-
 static const char g_hexChars[] = "0123456789abcdef";
 
 typedef struct _encoder
@@ -49,7 +47,7 @@ static int resizeBuffer(Encoder *e, size_t len)
 }
 
 #define resizeBufferIfNeeded(__enc, __len) \
-    if ( (size_t) ((__enc)->end - (__enc)->s) < (size_t) (__len))  { resizeBuffer((__enc), (__len)); }\
+    if ( (size_t) ((__enc)->end - (__enc)->s) < (size_t) (__len))  { resizeBuffer((__enc), (__len)); }
 
 
 static inline void reverse(char* begin, char* end)
@@ -114,8 +112,7 @@ static int doStringNoEscapes (Encoder *e, const char *str, const char *end)
         break;
         //}
       }
-      case 0x01:
-      case 0x02:
+      case 0x01: case 0x02:
       case 0x03:
       case 0x04:
       case 0x05:
@@ -367,7 +364,7 @@ int encode( PyObject *o, Encoder *e ) {
     if (PyObject_HasAttrString(o, "__json__"))
     {
       PyObject* func = PyObject_GetAttrString(o, "__json__"); 
-      PyObject* res = PyObject_Call(func, NULL);
+      PyObject* res = PyObject_CallFunctionObjArgs(func, NULL);
       Py_DECREF(func);
 
       if (PyErr_Occurred()) {
@@ -404,7 +401,7 @@ int encode( PyObject *o, Encoder *e ) {
       PyObject* objectsRepresentation = PyObject_Repr(o);
       const char* msg;
 #if PY_MAJOR_VERSION >= 3
-      size_t sz;
+      Py_ssize_t sz;
       msg = PyUnicode_AsUTF8AndSize(objectsRepresentation, &sz);
 #else
       msg  = PyString_AsString(objectsRepresentation);

src/mrjson.c

@@ -17,8 +17,6 @@ PyDoc_STRVAR(docstring,
              "Decode a JSON string into a Python object.");
 
 static PyMethodDef mrjsonMethods[] = {
-  {"encode", (PyCFunction) toJson,       METH_VARARGS | METH_KEYWORDS, docstring },
-  {"decode", (PyCFunction) fromJson,     METH_VARARGS | METH_KEYWORDS, docstring },
   {"dumps",  (PyCFunction) toJson,       METH_VARARGS | METH_KEYWORDS, docstring },
   {"loads",  (PyCFunction) fromJson,     METH_VARARGS | METH_KEYWORDS, docstring },
   {"dump",   (PyCFunction) toJsonFile,   METH_VARARGS | METH_KEYWORDS, docstring },
@@ -55,9 +53,7 @@ static struct PyModuleDef moduledef = {
 PYMODINITFUNC
 {
   PyObject *m;
-  PyObject *v;
 
-  //initObjToJSON();
   m = PYMODULE_CREATE();
 
   if (m == NULL) { MODINITERROR; }

tests.py

@@ -60,14 +60,15 @@ def eq( a, b ):
   except Exception as e:
     print( "ERROR",str(e), o )
 
-raises( "NaNd", j.loads, ValueError, "JSON_BAD_IDENTIFIER" )  
-raises( "[", j.loads, ValueError, "JSON_UNEXPECTED_END" )  
-raises( "]", j.loads, ValueError, "JSON_STACK_UNDERFLOW" )  
-raises( "{", j.loads, ValueError, "JSON_UNEXPECTED_END" )  
-raises( "}", j.loads, ValueError, "JSON_STACK_UNDERFLOW" )  
-raises( "[1,2,,]", j.loads, ValueError, "JSON_UNEXPECTED_CHARACTER," )  
-raises( "[1,z]", j.loads, ValueError, "JSON_UNEXPECTED_CHARACTER" )  
 
+
+raises( "NaNd",    j.loads, ValueError, "JSON_BAD_IDENTIFIER" )  
+raises( "[",       j.loads, ValueError, "JSON_UNEXPECTED_END" )  
+raises( "]",       j.loads, ValueError, "JSON_STACK_UNDERFLOW" )  
+raises( "{",       j.loads, ValueError, "JSON_UNEXPECTED_END" )  
+raises( "}",       j.loads, ValueError, "JSON_STACK_UNDERFLOW" )  
+raises( "[1,2,,]", j.loads, ValueError, "JSON_UNEXPECTED_CHARACTER," )  
+raises( "[1,z]",   j.loads, ValueError, "JSON_UNEXPECTED_CHARACTER" )  
 raises( "["*(1024*1024), j.loads, ValueError, "JSON_STACK_OVERFLOW" )  
 
 class JSONTest:

version.txt

@@ -1 +1 @@
-1.0.0
+1.0.1