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

修复py.o上传，增加dict,list API

Browse Source
This commit is contained in:
lyon 2024-08-01 14:55:55 +01:00
parent 940b273c4e
commit 743c865716
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/PikaObj.c
View File

@ -1941,9 +1941,9 @@ char _await_getchar(sh_getchar fn_getchar) {
#define PIKA_MAGIC_CODE_LEN 4
/* return file size */
PIKA_WEAK uint32_t _pikaShell_recv_file(ShellConfig* cfg,
uint8_t* magic_code,
uint8_t** pbuff) {
uint32_t _pikaShell_recv_file_direct(ShellConfig* cfg,
uint8_t* magic_code,
uint8_t** pbuff) {
uint32_t size = 0;
for (int i = 0; i < 4; i++) {
uint8_t* size_byte = (uint8_t*)&size;
@ -1964,6 +1964,13 @@ PIKA_WEAK uint32_t _pikaShell_recv_file(ShellConfig* cfg,
return size;
}
/* return file size */
PIKA_WEAK uint32_t _pikaShell_recv_file(ShellConfig* cfg,
uint8_t* magic_code,
uint8_t** pbuff) {
return _pikaShell_recv_file_direct(cfg, magic_code, pbuff);
}
void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
/* init the shell */
_obj_runChar_beforeRun(self, cfg);
@ -2049,7 +2056,12 @@ void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
magic_code[2 + i] = cfg->fn_getchar();
}
uint8_t* recv = NULL;
uint32_t size = _pikaShell_recv_file(cfg, magic_code, &recv);
uint32_t size = 0;
if (magic_code[2] == 'y' && magic_code[3] == 'a'){
size = _pikaShell_recv_file(cfg, magic_code, &recv);
}else{
size = _pikaShell_recv_file_direct(cfg, magic_code, &recv);
}
pika_platform_printf(
"\r\n=============== [File] ===============\r\n");
pika_platform_printf("[ Info] Recived size: %d\r\n", size);
@ -2061,7 +2073,8 @@ void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
"=============== [ RUN] ===============\r\n");
pikaVM_runByteCodeInconstant(self, recv);
pikaFree(recv, size);
return;
pika_platform_printf("%s", cfg->prefix);
continue;
}
if (magic_code[3] == 'a') {
_save_file(PIKA_SHELL_SAVE_APP_PATH, (uint8_t*)recv, size);
@ -4693,6 +4706,11 @@ void* pikaList_getPtr(PikaList* self, int index) {
return arg_getPtr(arg);
}
PikaObj* pikaList_getObj(PikaList* self, int index) {
Arg* arg = pikaList_get(self, index);
return arg_getObj(arg);
}
PIKA_RES pikaList_append(PikaList* self, Arg* arg) {
if (NULL == arg) {
return PIKA_RES_ERR_ARG_NO_FOUND;
@ -4803,6 +4821,7 @@ void pikaList_init(PikaObj* self) {
obj_setPtr(self, "list", list);
}
void pikaList_reverse(PikaList* self) {
pika_assert(NULL != self);
int top = pikaList_getSize(self);
@ -4917,6 +4936,10 @@ void* pikaDict_getPtr(PikaDict* self, char* name) {
return args_getPtr(_OBJ2DICT(self), (name));
}
PikaObj* pikaDict_getObj(PikaDict* self, char* name) {
return args_getPtr(_OBJ2DICT(self), (name));
}
int pikaDict_getSize(PikaDict* self) {
return args_getSize(_OBJ2DICT(self));
}

2
src/PikaObj.h
View File

@ -878,6 +878,7 @@ pika_bool pikaTuple_getBool(PikaTuple* self, int index);
pika_float pikaList_getFloat(PikaList* self, int index);
char* pikaList_getStr(PikaList* self, int index);
void* pikaList_getPtr(PikaList* self, int index);
PikaObj* pikaList_getObj(PikaList* self, int index);
Arg* pikaList_get(PikaList* self, int index);
#define pikaList_getArg pikaList_get
size_t pikaList_getSize(PikaList* self);
@ -931,6 +932,7 @@ pika_bool pikaDict_getBool(PikaDict* self, char* name);
pika_float pikaDict_getFloat(PikaDict* self, char* name);
char* pikaDict_getStr(PikaDict* self, char* name);
void* pikaDict_getPtr(PikaDict* self, char* name);
PikaObj* pikaDict_getObj(PikaDict* self, char* name);
int pikaDict_getSize(PikaDict* self);
Arg* pikaDict_getArgByidex(PikaDict* self, int index);
Arg* pikaDict_get(PikaDict* self, char* name);