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

ready to merge arg_singlePrint and _print_arg

Browse Source
This commit is contained in:
lyon 2023-01-23 14:30:12 +08:00
parent 68fac66530
commit 63cc3434ee
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/PikaStdLib/PikaStdLib_SysObj.c
View File

@ -113,7 +113,7 @@ int PikaStdLib_SysObj_int(PikaObj* self, Arg* arg) {
return -999999999; return -999999999;
} }
int PikaStdLib_SysObj_bool(PikaObj *self, Arg* arg){ int PikaStdLib_SysObj_bool(PikaObj* self, Arg* arg) {
return PikaStdLib_SysObj_int(self, arg); return PikaStdLib_SysObj_int(self, arg);
} }
@ -426,7 +426,7 @@ Arg* PikaStdLib_SysObj_bytes(PikaObj* self, Arg* val) {
return arg_newNull(); return arg_newNull();
} }
static char* __print_arg(PikaObj* self, Arg* val) { static char* _print_arg(PikaObj* self, Arg* val) {
Args buffs = {0}; Args buffs = {0};
char* res = NULL; char* res = NULL;
if (NULL == val) { if (NULL == val) {
@ -434,7 +434,7 @@ static char* __print_arg(PikaObj* self, Arg* val) {
} }
ArgType arg_type = arg_getType(val); ArgType arg_type = arg_getType(val);
if (arg_type == ARG_TYPE_BYTES) { if (arg_type == ARG_TYPE_BYTES) {
res = __printBytes(self, val); res = _printBytes(self, val);
goto __exit; goto __exit;
} }
if (arg_type == ARG_TYPE_STRING) { if (arg_type == ARG_TYPE_STRING) {
@ -496,7 +496,7 @@ void PikaStdLib_SysObj_print(PikaObj* self, PikaTuple* val, PikaDict* ops) {
PIKA_BOOL is_get_print = PIKA_FALSE; PIKA_BOOL is_get_print = PIKA_FALSE;
for (int i = 0; i < arg_size; i++) { for (int i = 0; i < arg_size; i++) {
Arg* arg = pikaTuple_getArg(val, i); Arg* arg = pikaTuple_getArg(val, i);
char* item = __print_arg(self, arg); char* item = _print_arg(self, arg);
if (NULL != item) { if (NULL != item) {
is_get_print = PIKA_TRUE; is_get_print = PIKA_TRUE;
if (NULL == print_out_arg) { if (NULL == print_out_arg) {

8
port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c
View File

@ -113,7 +113,7 @@ int PikaStdLib_SysObj_int(PikaObj* self, Arg* arg) {
return -999999999; return -999999999;
} }
int PikaStdLib_SysObj_bool(PikaObj *self, Arg* arg){ int PikaStdLib_SysObj_bool(PikaObj* self, Arg* arg) {
return PikaStdLib_SysObj_int(self, arg); return PikaStdLib_SysObj_int(self, arg);
} }
@ -426,7 +426,7 @@ Arg* PikaStdLib_SysObj_bytes(PikaObj* self, Arg* val) {
return arg_newNull(); return arg_newNull();
} }
static char* __print_arg(PikaObj* self, Arg* val) { static char* _print_arg(PikaObj* self, Arg* val) {
Args buffs = {0}; Args buffs = {0};
char* res = NULL; char* res = NULL;
if (NULL == val) { if (NULL == val) {
@ -434,7 +434,7 @@ static char* __print_arg(PikaObj* self, Arg* val) {
} }
ArgType arg_type = arg_getType(val); ArgType arg_type = arg_getType(val);
if (arg_type == ARG_TYPE_BYTES) { if (arg_type == ARG_TYPE_BYTES) {
res = __printBytes(self, val); res = _printBytes(self, val);
goto __exit; goto __exit;
} }
if (arg_type == ARG_TYPE_STRING) { if (arg_type == ARG_TYPE_STRING) {
@ -496,7 +496,7 @@ void PikaStdLib_SysObj_print(PikaObj* self, PikaTuple* val, PikaDict* ops) {
PIKA_BOOL is_get_print = PIKA_FALSE; PIKA_BOOL is_get_print = PIKA_FALSE;
for (int i = 0; i < arg_size; i++) { for (int i = 0; i < arg_size; i++) {
Arg* arg = pikaTuple_getArg(val, i); Arg* arg = pikaTuple_getArg(val, i);
char* item = __print_arg(self, arg); char* item = _print_arg(self, arg);
if (NULL != item) { if (NULL != item) {
is_get_print = PIKA_TRUE; is_get_print = PIKA_TRUE;
if (NULL == print_out_arg) { if (NULL == print_out_arg) {

2
src/PikaObj.h
View File

@ -396,7 +396,7 @@ static inline uint8_t obj_refcntNow(PikaObj* self) {
char* obj_cacheStr(PikaObj* self, char* str); char* obj_cacheStr(PikaObj* self, char* str);
PikaObj* _arg_to_obj(Arg* self, PIKA_BOOL* pIsTemp); PikaObj* _arg_to_obj(Arg* self, PIKA_BOOL* pIsTemp);
char* __printBytes(PikaObj* self, Arg* arg); char* _printBytes(PikaObj* self, Arg* arg);
#define PIKASCRIPT_VERSION_TO_NUM(majer, minor, micro) \ #define PIKASCRIPT_VERSION_TO_NUM(majer, minor, micro) \
majer * 100 * 100 + minor * 100 + micro majer * 100 * 100 + minor * 100 + micro

16
src/dataArg.c
View File

@ -142,7 +142,7 @@ static Arg* _arg_set_hash(Arg* self,
pika_platform_memcpy(arg_getContent(self), content, size); pika_platform_memcpy(arg_getContent(self), content, size);
} else { } else {
pika_platform_memset(arg_getContent(self), 0, pika_platform_memset(arg_getContent(self), 0,
aline_by(size, sizeof(uint32_t))); aline_by(size, sizeof(uint32_t)));
} }
pika_assert(self->flag < ARG_FLAG_MAX); pika_assert(self->flag < ARG_FLAG_MAX);
return self; return self;
@ -243,7 +243,8 @@ Arg* arg_setBytes(Arg* self, char* name, uint8_t* src, size_t size) {
/* set init value */ /* set init value */
if (NULL != src) { if (NULL != src) {
pika_platform_memcpy((void*)((uintptr_t)dir + sizeof(size_t)), src, size); pika_platform_memcpy((void*)((uintptr_t)dir + sizeof(size_t)), src,
size);
} }
pika_assert(self->flag < ARG_FLAG_MAX); pika_assert(self->flag < ARG_FLAG_MAX);
return self; return self;
@ -258,7 +259,7 @@ uint8_t* arg_getBytes(Arg* self) {
return arg_getContent(self) + sizeof(size_t); return arg_getContent(self) + sizeof(size_t);
} }
char* __printBytes(PikaObj* self, Arg* arg) { char* _printBytes(PikaObj* self, Arg* arg) {
Args buffs = {0}; Args buffs = {0};
size_t bytes_size = arg_getBytesSize(arg); size_t bytes_size = arg_getBytesSize(arg);
uint8_t* bytes = arg_getBytes(arg); uint8_t* bytes = arg_getBytes(arg);
@ -276,7 +277,7 @@ char* __printBytes(PikaObj* self, Arg* arg) {
void arg_printBytes(Arg* self, char* end) { void arg_printBytes(Arg* self, char* end) {
PikaObj* obj = New_PikaObj(); PikaObj* obj = New_PikaObj();
pika_platform_printf("%s%s", __printBytes(obj, self), end); pika_platform_printf("%s%s", _printBytes(obj, self), end);
obj_deinit(obj); obj_deinit(obj);
} }
@ -315,7 +316,8 @@ void arg_singlePrint(Arg* self, PIKA_BOOL in_REPL, char* end) {
arg_printBytes(self, end); arg_printBytes(self, end);
return; return;
} }
if (ARG_TYPE_POINTER == type || ARG_TYPE_METHOD_NATIVE_CONSTRUCTOR) { if (ARG_TYPE_POINTER == type ||
ARG_TYPE_METHOD_NATIVE_CONSTRUCTOR == type) {
pika_platform_printf("%p%s", arg_getPtr(self), end); pika_platform_printf("%p%s", arg_getPtr(self), end);
return; return;
} }
@ -497,7 +499,7 @@ Arg* arg_append(Arg* self, void* new_content, size_t new_size) {
} }
/* copy new content */ /* copy new content */
pika_platform_memcpy(arg_getContent(new_arg) + old_size, new_content, pika_platform_memcpy(arg_getContent(new_arg) + old_size, new_content,
new_size); new_size);
if (self != new_arg) { if (self != new_arg) {
arg_deinit(self); arg_deinit(self);
} }
@ -592,7 +594,7 @@ PIKA_BOOL arg_isEqual(Arg* self, Arg* other) {
} }
} }
if (0 != pika_platform_memcmp(arg_getContent(self), arg_getContent(other), if (0 != pika_platform_memcmp(arg_getContent(self), arg_getContent(other),
arg_getContentSize(self))) { arg_getContentSize(self))) {
return PIKA_FALSE; return PIKA_FALSE;
} }
return PIKA_TRUE; return PIKA_TRUE;

2
test/python/str_issue1.py
View File

@ -1,5 +1,5 @@
def is_include(included_data, data): #判断一个字符串是否存在于另外一个字符串中 def is_include(included_data, data): #判断一个字符串是否存在于另外一个字符串中
if str(type(data)) == "<class 'str'>" and str(type(included_data)) == "<class 'str'>": if type(data) == str and type(included_data) == str:
print('type assert passed') print('type assert passed')
data_length = len(data) data_length = len(data)
included_data_length = len(included_data) included_data_length = len(included_data)