Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename cJSON to pika_cjson

Browse Source
This commit is contained in:
pikastech 2022-06-02 17:47:53 +08:00
parent 87090181f5
commit 60389c541d
11 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/cJSON/cJSON_Utils.c
View File

@ -1,9 +0,0 @@
#include "cJSON_Utils.h"
PikaObj* cJSON_Utils_parse(PikaObj* self) {
return NULL;
}
PikaObj* cJSON_Utils_createObject(PikaObj *self){
return NULL;
}

0
package/cJSON/cJSON.c → package/pika_cjson/cJSON.c
View File

0
package/cJSON/cJSON.h → package/pika_cjson/cJSON.h
View File

12
port/linux/package/pikascript/pikascript-lib/cJSON/cJSON_cJSON.c → package/pika_cjson/cJSON_cJSON.c
View File

@ -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);

2
package/cJSON/cJSON.pyi → package/pika_cjson/pika_cjson.pyi
View File

@ -1,6 +1,4 @@
import imp
from PikaObj import *
import json
class cJSON(TinyObj):

2
port/linux/package/pikascript/main.py
View File

@ -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()

2
port/linux/package/pikascript/cJSON.pyi → port/linux/package/pikascript/pika_cjson.pyi
View File

@ -1,6 +1,4 @@
import imp
from PikaObj import *
import json
class cJSON(TinyObj):

0
port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.c → port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.c
View File

0
port/linux/package/pikascript/pikascript-lib/cJSON/cJSON.h → port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON.h
View File

12
package/cJSON/cJSON_cJSON.c → port/linux/package/pikascript/pikascript-lib/pika_cjson/cJSON_cJSON.c
View File

@ -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);

4
port/linux/test/cJSON-test.cpp
View File

@ -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");