diff --git a/package/cJSON/cJSON_Utils.c b/package/cJSON/cJSON_Utils.c deleted file mode 100644 index 9f7906c65..000000000 --- a/package/cJSON/cJSON_Utils.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "cJSON_Utils.h" - -PikaObj* cJSON_Utils_parse(PikaObj* self) { - return NULL; -} - -PikaObj* cJSON_Utils_createObject(PikaObj *self){ - return NULL; -} diff --git a/package/cJSON/cJSON.c b/package/pika_cjson/cJSON.c similarity index 100% rename from package/cJSON/cJSON.c rename to package/pika_cjson/cJSON.c diff --git a/package/cJSON/cJSON.h b/package/pika_cjson/cJSON.h similarity index 100% rename from package/cJSON/cJSON.h rename to package/pika_cjson/cJSON.h diff --git a/port/linux/package/pikascript/pikascript-lib/cJSON/cJSON_cJSON.c b/package/pika_cjson/cJSON_cJSON.c similarity index 70% rename from port/linux/package/pikascript/pikascript-lib/cJSON/cJSON_cJSON.c rename to package/pika_cjson/cJSON_cJSON.c index 1b4b66fb1..1e9e95dc5 100644 --- a/port/linux/package/pikascript/pikascript-lib/cJSON/cJSON_cJSON.c +++ b/package/pika_cjson/cJSON_cJSON.c @@ -1,13 +1,13 @@ -#include "cJSON_cJSON.h" +#include "pika_cjson_cJSON.h" #include "cJSON.h" -void cJSON_cJSON_parse(PikaObj* self, char* value) { +void pika_cjson_cJSON_parse(PikaObj* self, char* value) { cJSON* item = cJSON_Parse(value); obj_setPtr(self, "item", item); obj_setInt(self, "needfree", 1); } -char* cJSON_cJSON_print(PikaObj* self) { +char* pika_cjson_cJSON_print(PikaObj* self) { cJSON* item = obj_getPtr(self, "item"); char* res = cJSON_Print(item); obj_setStr(self, "_buf", res); @@ -15,19 +15,19 @@ char* cJSON_cJSON_print(PikaObj* self) { return obj_getStr(self, "_buf"); } -void cJSON_cJSON___del__(PikaObj* self) { +void pika_cjson_cJSON___del__(PikaObj* self) { cJSON* item = obj_getPtr(self, "item"); if (obj_getInt(self, "needfree") == 1) { cJSON_Delete(item); } } -Arg* cJSON_cJSON_getObjectItem(PikaObj* self, char* string) { +Arg* pika_cjson_cJSON_getObjectItem(PikaObj* self, char* string) { cJSON* item = obj_getPtr(self, "item"); cJSON* subItem = cJSON_GetObjectItem(item, string); /* create subCJSON */ - Arg* subCJSON_arg = obj_newObjInPackage(New_cJSON_cJSON); + Arg* subCJSON_arg = obj_newObjInPackage(New_pika_cjson_cJSON); /* init the subCJSON */ PikaObj* subCJSON = arg_getPtr(subCJSON_arg); diff --git a/package/cJSON/cJSON.pyi b/package/pika_cjson/pika_cjson.pyi similarity index 89% rename from package/cJSON/cJSON.pyi rename to package/pika_cjson/pika_cjson.pyi index e93d8360a..7d60205e8 100644 --- a/package/cJSON/cJSON.pyi +++ b/package/pika_cjson/pika_cjson.pyi @@ -1,6 +1,4 @@ -import imp from PikaObj import * -import json class cJSON(TinyObj): diff --git a/port/linux/package/pikascript/main.py b/port/linux/package/pikascript/main.py index 47541440f..033547121 100644 --- a/port/linux/package/pikascript/main.py +++ b/port/linux/package/pikascript/main.py @@ -9,7 +9,7 @@ import test_module1 import test_cmodule import TempDevTest as dev import TemplateDevice -import cJSON +import pika_cjson from PikaStdData import String as S mem = PikaStdLib.MemChecker() diff --git a/port/linux/package/pikascript/cJSON.pyi b/port/linux/package/pikascript/pika_cjson.pyi similarity index 89% rename from port/linux/package/pikascript/cJSON.pyi rename to port/linux/package/pikascript/pika_cjson.pyi index e93d8360a..7d60205e8 100644 --- a/port/linux/package/pikascript/cJSON.pyi +++ b/port/linux/package/pikascript/pika_cjson.pyi @@ -1,6 +1,4 @@ -import imp from PikaObj import * -import json class cJSON(TinyObj): diff --git a/port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.c b/port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.c similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.c rename to port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.c diff --git a/port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.h b/port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.h similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.h rename to port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.h diff --git a/package/cJSON/cJSON_cJSON.c b/port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON_cJSON.c similarity index 70% rename from package/cJSON/cJSON_cJSON.c rename to port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON_cJSON.c index 1b4b66fb1..1e9e95dc5 100644 --- a/package/cJSON/cJSON_cJSON.c +++ b/port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON_cJSON.c @@ -1,13 +1,13 @@ -#include "cJSON_cJSON.h" +#include "pika_cjson_cJSON.h" #include "cJSON.h" -void cJSON_cJSON_parse(PikaObj* self, char* value) { +void pika_cjson_cJSON_parse(PikaObj* self, char* value) { cJSON* item = cJSON_Parse(value); obj_setPtr(self, "item", item); obj_setInt(self, "needfree", 1); } -char* cJSON_cJSON_print(PikaObj* self) { +char* pika_cjson_cJSON_print(PikaObj* self) { cJSON* item = obj_getPtr(self, "item"); char* res = cJSON_Print(item); obj_setStr(self, "_buf", res); @@ -15,19 +15,19 @@ char* cJSON_cJSON_print(PikaObj* self) { return obj_getStr(self, "_buf"); } -void cJSON_cJSON___del__(PikaObj* self) { +void pika_cjson_cJSON___del__(PikaObj* self) { cJSON* item = obj_getPtr(self, "item"); if (obj_getInt(self, "needfree") == 1) { cJSON_Delete(item); } } -Arg* cJSON_cJSON_getObjectItem(PikaObj* self, char* string) { +Arg* pika_cjson_cJSON_getObjectItem(PikaObj* self, char* string) { cJSON* item = obj_getPtr(self, "item"); cJSON* subItem = cJSON_GetObjectItem(item, string); /* create subCJSON */ - Arg* subCJSON_arg = obj_newObjInPackage(New_cJSON_cJSON); + Arg* subCJSON_arg = obj_newObjInPackage(New_pika_cjson_cJSON); /* init the subCJSON */ PikaObj* subCJSON = arg_getPtr(subCJSON_arg); diff --git a/port/linux/test/cJSON-test.cpp b/port/linux/test/cJSON-test.cpp index d51f8dfbe..26b1da409 100644 --- a/port/linux/test/cJSON-test.cpp +++ b/port/linux/test/cJSON-test.cpp @@ -36,7 +36,7 @@ TEST(cJSON, parse_print) { /* run */ obj_setStr(pikaMain, "testjson", testjson); obj_run(pikaMain, - "a = cJSON.cJSON()\n" + "a = pika_cjson.cJSON()\n" "a.parse(testjson)\n" "a.print()\n"); /* collect */ @@ -67,7 +67,7 @@ TEST(cJSON, getItem) { obj_setStr(pikaMain, "testjson", testjson); __platform_printf("BEGIN\r\n"); obj_run(pikaMain, - "a = cJSON.cJSON()\n" + "a = pika_cjson.cJSON()\n" "a.parse(testjson)\n" "age = a.getObjectItem('age')\n" "age.print()\n");