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

update PikaStdLib

Browse Source
This commit is contained in:
lyon 2022-03-02 15:27:19 +08:00
parent e6002621bf
commit a966d43ad0
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/PikaStdLib/PikaStdData_Dict.c
View File

@ -23,14 +23,14 @@ void PikaStdData_Dict_remove(PikaObj* self, char* key) {
Arg* PikaStdData_Dict___iter__(PikaObj* self) { Arg* PikaStdData_Dict___iter__(PikaObj* self) {
obj_setInt(self, "__iter_i", 0); obj_setInt(self, "__iter_i", 0);
return arg_setPtr(NULL, "", TYPE_POINTER, self); return arg_setPtr(NULL, "", ARG_TYPE_POINTER, self);
} }
Arg* PikaStdData_Dict___next__(PikaObj* self) { Arg* PikaStdData_Dict___next__(PikaObj* self) {
int __iter_i = args_getInt(self->list, "__iter_i"); int __iter_i = args_getInt(self->list, "__iter_i");
PikaObj* pyload = obj_getObj(self, "pyload", 0); PikaObj* pyload = obj_getObj(self, "pyload", 0);
Arg* res = arg_copy(args_getArg_index(pyload->list, __iter_i)); Arg* res = arg_copy(args_getArg_index(pyload->list, __iter_i));
if (TYPE_POINTER == arg_getType(res)) { if (ARG_TYPE_POINTER == arg_getType(res)) {
arg_deinit(res); arg_deinit(res);
return arg_setNull(NULL); return arg_setNull(NULL);
} }

2
package/PikaStdLib/PikaStdData_List.c
View File

@ -41,7 +41,7 @@ void PikaStdData_List_set(PikaObj* self, Arg* arg, int i) {
Arg* PikaStdData_List___iter__(PikaObj* self) { Arg* PikaStdData_List___iter__(PikaObj* self) {
obj_setInt(self, "__iter_i", 0); obj_setInt(self, "__iter_i", 0);
return arg_setPtr(NULL, "", TYPE_POINTER, self); return arg_setPtr(NULL, "", ARG_TYPE_POINTER, self);
} }
Arg* PikaStdData_List___next__(PikaObj* self) { Arg* PikaStdData_List___next__(PikaObj* self) {

2
package/PikaStdLib/PikaStdData_String.c
View File

@ -2,7 +2,7 @@
Arg* PikaStdData_String___iter__(PikaObj* self) { Arg* PikaStdData_String___iter__(PikaObj* self) {
obj_setInt(self, "__iter_i", 0); obj_setInt(self, "__iter_i", 0);
return arg_setPtr(NULL, "", TYPE_POINTER, self); return arg_setPtr(NULL, "", ARG_TYPE_POINTER, self);
} }
void PikaStdData_String_set(PikaObj* self, char* s) { void PikaStdData_String_set(PikaObj* self, char* s) {

38
package/PikaStdLib/PikaStdLib_SysObj.c
View File

@ -25,27 +25,27 @@ void PikaStdLib_SysObj_type(PikaObj* self, Arg* arg) {
return; return;
} }
ArgType type = arg_getType(arg); ArgType type = arg_getType(arg);
if (TYPE_INT == type) { if (ARG_TYPE_INT == type) {
obj_setSysOut(self, "int"); obj_setSysOut(self, "int");
return; return;
} }
if (TYPE_FLOAT == type) { if (ARG_TYPE_FLOAT == type) {
obj_setSysOut(self, "float"); obj_setSysOut(self, "float");
return; return;
} }
if (TYPE_STRING == type) { if (ARG_TYPE_STRING == type) {
obj_setSysOut(self, "string"); obj_setSysOut(self, "string");
return; return;
} }
if (TYPE_POINTER == type) { if (ARG_TYPE_POINTER == type) {
obj_setSysOut(self, "pointer"); obj_setSysOut(self, "pointer");
return; return;
} }
if (TYPE_MATE_OBJECT == type) { if (ARG_TYPE_MATE_OBJECT == type) {
obj_setSysOut(self, "mate_object"); obj_setSysOut(self, "mate_object");
return; return;
} }
if (TYPE_METHOD == type) { if (ARG_TYPE_STATIC_METHOD == type) {
obj_setSysOut(self, "method"); obj_setSysOut(self, "method");
return; return;
} }
@ -53,10 +53,10 @@ void PikaStdLib_SysObj_type(PikaObj* self, Arg* arg) {
float PikaStdLib_SysObj_float(PikaObj* self, Arg* arg) { float PikaStdLib_SysObj_float(PikaObj* self, Arg* arg) {
ArgType type = arg_getType(arg); ArgType type = arg_getType(arg);
if (TYPE_INT == type) { if (ARG_TYPE_INT == type) {
return (float)arg_getInt(arg); return (float)arg_getInt(arg);
} }
if (TYPE_FLOAT == type) { if (ARG_TYPE_FLOAT == type) {
return (float)arg_getFloat(arg); return (float)arg_getFloat(arg);
} }
obj_setSysOut(self, "[error] convert to float type faild."); obj_setSysOut(self, "[error] convert to float type faild.");
@ -66,10 +66,10 @@ float PikaStdLib_SysObj_float(PikaObj* self, Arg* arg) {
int PikaStdLib_SysObj_int(PikaObj* self, Arg* arg) { int PikaStdLib_SysObj_int(PikaObj* self, Arg* arg) {
ArgType type = arg_getType(arg); ArgType type = arg_getType(arg);
if (TYPE_INT == type) { if (ARG_TYPE_INT == type) {
return (int)arg_getInt(arg); return (int)arg_getInt(arg);
} }
if (TYPE_FLOAT == type) { if (ARG_TYPE_FLOAT == type) {
return (int)arg_getFloat(arg); return (int)arg_getFloat(arg);
} }
obj_setSysOut(self, "[error] convert to int type faild."); obj_setSysOut(self, "[error] convert to int type faild.");
@ -82,12 +82,12 @@ char* PikaStdLib_SysObj_str(PikaObj* self, Arg* arg) {
Args* buffs = New_strBuff(); Args* buffs = New_strBuff();
char* res = NULL; char* res = NULL;
do { do {
if (TYPE_INT == type) { if (ARG_TYPE_INT == type) {
int val = arg_getInt(arg); int val = arg_getInt(arg);
res = strsFormat(buffs, 11, "%d", val); res = strsFormat(buffs, 11, "%d", val);
break; break;
} }
if (TYPE_FLOAT == type) { if (ARG_TYPE_FLOAT == type) {
float val = arg_getFloat(arg); float val = arg_getFloat(arg);
res = strsFormat(buffs, 11, "%f", val); res = strsFormat(buffs, 11, "%f", val);
break; break;
@ -100,17 +100,17 @@ char* PikaStdLib_SysObj_str(PikaObj* self, Arg* arg) {
Arg* PikaStdLib_SysObj_iter(PikaObj* self, Arg* arg) { Arg* PikaStdLib_SysObj_iter(PikaObj* self, Arg* arg) {
/* a String, return a StringObj */ /* a String, return a StringObj */
if (TYPE_STRING == arg_getType(arg)) { if (ARG_TYPE_STRING == arg_getType(arg)) {
obj_setStr(self, "_sobj", arg_getStr(arg)); obj_setStr(self, "_sobj", arg_getStr(arg));
return arg_setMetaObj("", "PikaStdLib_StringObj", return arg_setMetaObj("", "PikaStdLib_StringObj",
New_PikaStdLib_StringObj); New_PikaStdLib_StringObj);
} }
/* a MATE object, return itself */ /* a MATE object, return itself */
if (TYPE_MATE_OBJECT == arg_getType(arg)) { if (ARG_TYPE_MATE_OBJECT == arg_getType(arg)) {
return arg_copy(arg); return arg_copy(arg);
} }
/* object */ /* object */
if (TYPE_POINTER == arg_getType(arg)) { if (ARG_TYPE_POINTER == arg_getType(arg)) {
PikaObj* arg_obj = arg_getPtr(arg); PikaObj* arg_obj = arg_getPtr(arg);
pikaVM_runAsm(arg_obj, pikaVM_runAsm(arg_obj,
"B0\n" "B0\n"
@ -140,14 +140,14 @@ Arg* PikaStdLib_SysObj_range(PikaObj* self, int a1, int a2, int a3) {
Arg* PikaStdLib_SysObj___get__(PikaObj* self, Arg* key, Arg* obj) { Arg* PikaStdLib_SysObj___get__(PikaObj* self, Arg* key, Arg* obj) {
ArgType obj_type = arg_getType(obj); ArgType obj_type = arg_getType(obj);
if (TYPE_STRING == obj_type) { if (ARG_TYPE_STRING == obj_type) {
int index = arg_getInt(key); int index = arg_getInt(key);
char* str_pyload = arg_getStr(obj); char* str_pyload = arg_getStr(obj);
char char_buff[] = " "; char char_buff[] = " ";
char_buff[0] = str_pyload[index]; char_buff[0] = str_pyload[index];
return arg_setStr(NULL, "", char_buff); return arg_setStr(NULL, "", char_buff);
} }
if ((TYPE_OBJECT == obj_type) || (TYPE_POINTER == obj_type)) { if ((ARG_TYPE_OBJECT == obj_type) || (ARG_TYPE_POINTER == obj_type)) {
PikaObj* arg_obj = arg_getPtr(obj); PikaObj* arg_obj = arg_getPtr(obj);
obj_setArg(arg_obj, "__key", key); obj_setArg(arg_obj, "__key", key);
pikaVM_runAsm(arg_obj, pikaVM_runAsm(arg_obj,
@ -166,14 +166,14 @@ void PikaStdLib_SysObj___set__(PikaObj* self,
char* obj_str, char* obj_str,
Arg* val) { Arg* val) {
ArgType obj_type = arg_getType(obj); ArgType obj_type = arg_getType(obj);
if (TYPE_STRING == obj_type) { if (ARG_TYPE_STRING == obj_type) {
int index = arg_getInt(key); int index = arg_getInt(key);
char* str_val = arg_getStr(val); char* str_val = arg_getStr(val);
char* str_pyload = arg_getStr(obj); char* str_pyload = arg_getStr(obj);
str_pyload[index] = str_val[0]; str_pyload[index] = str_val[0];
obj_setStr(self, obj_str, str_pyload); obj_setStr(self, obj_str, str_pyload);
} }
if ((TYPE_OBJECT == obj_type) || (TYPE_POINTER == obj_type)) { if ((ARG_TYPE_OBJECT == obj_type) || (ARG_TYPE_POINTER == obj_type)) {
PikaObj* arg_obj = arg_getPtr(obj); PikaObj* arg_obj = arg_getPtr(obj);
obj_setArg(arg_obj, "__key", key); obj_setArg(arg_obj, "__key", key);
obj_setArg(arg_obj, "__val", val); obj_setArg(arg_obj, "__val", val);