Added in cjson.cJSON

2 files changed, 88 insertions, 11 deletions

diff --git a/libraries/json.c b/libraries/json.c
index 14b006f..841cd92 100644
--- a/libraries/json.c
+++ b/libraries/json.c
@@ -1,18 +1,29 @@
+#ifdef CJSON_STANDALONE
+  #include <lua.h>
+  #include <lauxlib.h>
+  #include <lualib.h>
+#else
+  #define LITE_XL_PLUGIN_ENTRYPOINT
+  #include <lite_xl_plugin_api.h>
+#endif
+
 #include "cJSON.h"
 #include "cJSON.c"
 
+
 typedef struct json_t {
   int allocated;
   cJSON* json;
 } json_t;
 
+
 static cJSON* lua_tocjson(lua_State* L, int index) {
   json_t* value = luaL_testudata(L, index, "cjson");
   return value ? value->json : NULL;
 }
 
-// Lua binidngs.
-static int f_cjson_push(lua_State* L, cJSON* json, int allocated) {
+
+static int lua_pushcjson(lua_State* L, cJSON* json, int allocated) {
   if (json) {
     switch (json->type) {
       case cJSON_Array:
@@ -33,6 +44,7 @@ static int f_cjson_push(lua_State* L, cJSON* json, int allocated) {
   return 1;
 }
 
+
 static cJSON* f_cjson_parse(lua_State* L, int index) {
   switch (lua_type(L, index)) {
     case LUA_TTABLE:
@@ -43,7 +55,7 @@ static cJSON* f_cjson_parse(lua_State* L, int index) {
         cJSON* array = cJSON_CreateArray();
         for (int i = 1; i <= length; ++i) {
           lua_geti(L, index, i);
-          cJSON_AddItemToArray(array, f_cjson_parse(-1));
+          cJSON_AddItemToArray(array, f_cjson_parse(L, -1));
           lua_pop(L, 1);
         }
         return array;
@@ -52,7 +64,7 @@ static cJSON* f_cjson_parse(lua_State* L, int index) {
         lua_pushvalue(L, index);
         lua_pushnil(L);
         while (lua_next(L, -2)) {
-            lua_pushvalue(L, -2);able
+            lua_pushvalue(L, -2);
             const char *key = lua_tostring(L, -1);
             cJSON_AddItemToObject(object, lua_tostring(L, -1), f_cjson_parse(L, -2));
             lua_pop(L, 2);
@@ -61,9 +73,8 @@ static cJSON* f_cjson_parse(lua_State* L, int index) {
         return object;
       }
     break;
-    case LUA_TBOOLEN: return lua_toboolean(L, index) ? cJSON_CreateTrue() : cJSON_CreateFalse();
+    case LUA_TBOOLEAN: return lua_toboolean(L, index) ? cJSON_CreateTrue() : cJSON_CreateFalse();
     case LUA_TSTRING: return cJSON_CreateString(lua_tostring(L, index));
-    case LUA_TINTEGER: return cJSON_CreateNumber(lua_tointeger(L, index));
     case LUA_TNUMBER: return cJSON_CreateNumber(lua_tonumber(L, index));
     case LUA_TUSERDATA: {
       cJSON* json = lua_tocjson(L, index);
@@ -73,31 +84,35 @@ static cJSON* f_cjson_parse(lua_State* L, int index) {
   }
 }
 
+
 static int f_cjson_gc(lua_State* L) {
   json_t* value = lua_touserdata(L, 1);
   if (value->allocated)
     cJSON_Delete(value->json);
 }
 
+
 static int f_cjson_index(lua_State* L) {
     cJSON* json = lua_tocjson(L, 1);
     switch (json->type) {
-        case cJSON_Object: f_cjson_push(L, cJSON_GetObjectItem(json, luaL_checkstring(L, 2)), 1); break;
-        case cJSON_Array: f_cjson_push(L, cJSON_GetArrayItem(json, luaL_checkinteger(L, 2) - 1), 1); break;
+        case cJSON_Object: lua_pushcjson(L, cJSON_GetObjectItem(json, luaL_checkstring(L, 2)), 0); break;
+        case cJSON_Array: lua_pushcjson(L, cJSON_GetArrayItem(json, luaL_checkinteger(L, 2) - 1), 0); break;
         default: return luaL_error(L, "invalid index");
     }
     return 1;
 }
 
+
 static int f_cjson_len(lua_State* L) {
     cJSON* json = lua_tocjson(L, 1);
     switch (json->type) {
-        case cJSON_Array: lua_pushinteger(L, cJSON_GetArraySize(json->length)); break;
+        case cJSON_Array: lua_pushinteger(L, cJSON_GetArraySize(json)); break;
         default: return luaL_error(L, "length operation invalid");
     }
     return 1;
 }
 
+
 static int f_cjson_newindex(lua_State* L) {
   cJSON* json = lua_tocjson(L, 1);
 
@@ -118,11 +133,64 @@ static int f_cjson_newindex(lua_State* L) {
 }
 
 
+typedef struct json_object_iterator_t {
+  cJSON* json;
+  cJSON* current;
+} json_object_iterator_t;
+
+
+static int f_cjson_next(lua_State* L) {
+  json_object_iterator_t* iterator = lua_touserdata(L, 1);
+  iterator->current = lua_isnil(L, 2) ? iterator->json->child : iterator->current->next;
+  if (!iterator->current)
+    return 0;
+  lua_pushstring(L, iterator->current->string);
+  lua_pushcjson(L, iterator->current, 0);
+  return 2;
+}
+
+
+static int f_cjson_inext(lua_State* L) {
+  cJSON* json = lua_tocjson(L, 1);
+  int index = !lua_isnil(L, 2) ? lua_tointeger(L, 2) : 0;
+  int length = cJSON_GetArraySize(json);
+  if (index >= length)
+    return 0;
+  lua_pushinteger(L, index + 1);
+  lua_pushcjson(L, cJSON_GetArrayItem(json, index), 0);
+  return 2;
+}
+
+
+static int f_cjson_pairs(lua_State* L) {
+  cJSON* json = lua_tocjson(L, 1);
+  if (json->type != cJSON_Array)
+    return luaL_error(L, "invalid value for ipairs");
+  lua_pushcfunction(L, f_cjson_next);
+  json_object_iterator_t* iterator = lua_newuserdata(L, sizeof(json_object_iterator_t));
+  iterator->json = json;
+  iterator->current = NULL;
+  lua_pushnil(L);
+  return 3;
+}
+
+
+static int f_cjson_ipairs(lua_State* L) {
+  cJSON* json = lua_tocjson(L, 1);
+  if (json->type != cJSON_Array)
+    return luaL_error(L, "invalid value for ipairs");
+  lua_pushcfunction(L, f_cjson_inext);
+  lua_pushvalue(L, 1);
+  lua_pushinteger(L, 0);
+  return 3;
+}
+
 static const luaL_Reg cjson_value[] = {
   { "__gc",        f_cjson_gc   },
   { "__index",     f_cjson_index },
   { "__newindex",  f_cjson_newindex },
   { "__pairs",     f_cjson_pairs },
+  { "__ipairs",    f_cjson_ipairs },
   { "__len",       f_cjson_len },
   { NULL,          NULL             }
 };
@@ -140,15 +208,22 @@ static int f_cjson_encode(lua_State* L) {
 static int f_cjson_decode(lua_State* L) {
   size_t len;
   const char* str = luaL_checklstring(L, 1, &len);
-  return f_cjson_push(L, cJSON_ParseWithLength(str, len), 1);
+  return lua_pushcjson(L, cJSON_ParseWithLength(str, len), 1);
 }
 
 
+static const luaL_Reg cjson_lib[] = {
+  { "encode",        f_cjson_encode },
+  { "decode",        f_cjson_decode },
+  { NULL,          NULL             }
+};
+
+
 #ifndef CJSON_STANDALONE
 int luaopen_lite_xl_cjson(lua_State* L, void* XL) {
   lite_xl_plugin_init(XL);
 #else
-int luaopen_cjson(lua_State* L) {
+int luaopen_libraries_cjson(lua_State* L) {
 #endif
   luaL_newmetatable(L, "cjson");
   luaL_setfuncs(L, cjson_value, 0);
diff --git a/libraries/json.lua b/libraries/json.lua
index 3499195..6cbfc45 100644
--- a/libraries/json.lua
+++ b/libraries/json.lua
@@ -391,6 +391,8 @@ if status then
   json.lencode = json.encode
   json.decode = cjson.decode
   json.encode = cjson.encode
+else
+  print(cjson)
 end
 
 return json