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

fix ci error of Task

Browse Source
This commit is contained in:
lyon 2022-01-23 21:50:05 +08:00
parent f33093ee0d
commit 0d71929d8d
5 changed files with 459 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
package/PikaStdTask/PikaStdTask_Task.c
View File

@ -56,10 +56,129 @@ void PikaStdTask_Task_call_period_ms(PikaObj* self,
}
void PikaStdTask_Task_run_once(PikaObj* self) {
obj_run(self, "platformGetTick()");
/* Python
if calls_period.len() > 0:
platformGetTick()
*/
pikaVM_runAsm(self,
"B0\n"
"1 RUN calls_period.len\n"
"1 NUM 0\n"
"0 OPT >\n"
"0 JEZ 1\n"
"B1\n"
"0 RUN platformGetTick\n"
"B0\n");
/* transfer the tick to pikaMain */
obj_setInt(__pikaMain, "__tick", obj_getInt(self, "tick"));
/* Python
len = __calls_always.len()
for i in range(0, len):
if len == 0:
break
todo = __calls_always[i]
todo()
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_always.len\n"
"0 OUT len\n"
"B0\n"
"2 NUM 0\n"
"2 REF len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __calls_always\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B1\n"
"0 RUN todo\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
/* Python
__len = __calls_when.len()
for i in range(0, __len):
if __len == 0:
break
when = __assert_when[i]
if when():
todo = __calls_when[i]
todo()
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_when.len\n"
"0 OUT __len\n"
"B0\n"
"2 NUM 0\n"
"2 REF __len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF __len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __assert_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT when\n"
"B1\n"
"0 RUN when\n"
"0 JEZ 1\n"
"B2\n"
"1 REF __calls_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B2\n"
"0 RUN todo\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
/* Python
__len = __calls_period.len()
for i in range(0, __len):
if __len == 0:
@ -132,65 +251,6 @@ void PikaStdTask_Task_run_once(PikaObj* self) {
"B0\n"
"0 DEL _l0\n"
"B0 \n");
/* Python
__len = __calls_when.len()
for i in range(0, __len):
if __len == 0:
break
when = __assert_when[i]
if when():
todo = __calls_when[i]
todo()
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_when.len\n"
"0 OUT __len\n"
"B0\n"
"2 NUM 0\n"
"2 REF __len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF __len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __assert_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT when\n"
"B1\n"
"0 RUN when\n"
"0 JEZ 1\n"
"B2\n"
"1 REF __calls_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B2\n"
"0 RUN todo\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
}
void PikaStdTask_Task_run_always(PikaObj* self) {

11
port/linux/package/pikascript/PikaStdTask.py
View File

@ -1,10 +1,15 @@
from PikaObj import *
import PikaStdData
class Task(TinyObj):
calls_always = PikaStdData.List()
calls_when = PikaStdData.List()
assert_when = PikaStdData.List()
calls_period = PikaStdData.List()
assert_period = PikaStdData.List()
time_period = PikaStdData.List()
def __init__():
pass
@ -14,8 +19,14 @@ class Task(TinyObj):
def call_when(fun_todo: any, fun_when: any):
pass
def call_period_ms(fun_todo: any, period_ms: int):
pass
def run_once():
pass
def run_always():
pass
def platformGetTick():
pass

32
port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask.py Normal file
View File

@ -0,0 +1,32 @@
from PikaObj import *
import PikaStdData
class Task(TinyObj):
calls_always = PikaStdData.List()
calls_when = PikaStdData.List()
assert_when = PikaStdData.List()
calls_period = PikaStdData.List()
assert_period = PikaStdData.List()
time_period = PikaStdData.List()
def __init__():
pass
def call_always(fun_todo: any):
pass
def call_when(fun_todo: any, fun_when: any):
pass
def call_period_ms(fun_todo: any, period_ms: int):
pass
def run_once():
pass
def run_always():
pass
def platformGetTick():
pass

251
port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask_Task.c
View File

@ -5,11 +5,20 @@
extern PikaObj* __pikaMain;
void PikaStdTask_Task___init__(PikaObj* self) {
pikaVM_runAsm(self,
"B0\n0 RUN calls_always.__init__\n0 RUN "
"calls_when.__init__\n0 RUN assert_when.__init__\n");
"B0\n"
"0 RUN calls_always.__init__\n"
"0 RUN calls_when.__init__\n"
"0 RUN assert_when.__init__\n"
"0 RUN calls_period.__init__\n"
"0 RUN assert_period.__init__\n"
"0 RUN time_period.__init__\n");
obj_setPtr(__pikaMain, "__calls_always", obj_getPtr(self, "calls_always"));
obj_setPtr(__pikaMain, "__calls_when", obj_getPtr(self, "calls_when"));
obj_setPtr(__pikaMain, "__assert_when", obj_getPtr(self, "assert_when"));
obj_setPtr(__pikaMain, "__calls_period", obj_getPtr(self, "calls_period"));
obj_setPtr(__pikaMain, "__assert_period",
obj_getPtr(self, "assert_period"));
obj_setPtr(__pikaMain, "__time_period", obj_getPtr(self, "time_period"));
}
void PikaStdTask_Task_call_always(PikaObj* self, Arg* fun_todo) {
@ -21,24 +30,227 @@ void PikaStdTask_Task_call_when(PikaObj* self, Arg* fun_todo, Arg* fun_when) {
obj_setArg(self, "fun_todo", fun_todo);
obj_setArg(self, "fun_when", fun_when);
pikaVM_runAsm(self,
"B0\n1 REF fun_todo\n0 RUN calls_when.append\nB0\n1 REF "
"fun_when\n0 RUN assert_when.append\n");
"B0\n"
"1 REF fun_todo\n"
"0 RUN calls_when.append\n"
"B0\n"
"1 REF fun_when\n"
"0 RUN assert_when.append\n");
}
void PikaStdTask_Task_call_period_ms(PikaObj* self,
Arg* fun_todo,
int period_ms) {
obj_setArg(self, "fun_todo", fun_todo);
obj_setInt(self, "period_ms", period_ms);
pikaVM_runAsm(self,
"B0\n"
"1 REF fun_todo\n"
"0 RUN calls_period.append\n"
"B0\n"
"1 REF period_ms\n"
"0 RUN assert_period.append\n"
"B0\n"
"1 REF 0\n"
"0 RUN time_period.append\n");
}
void PikaStdTask_Task_run_once(PikaObj* self) {
/* reference the calls_always in __pikaMain */
pikaVM_runAsm(
__pikaMain,
"B0\n1 REF __calls_always\n0 RUN iter\n0 OUT _l0\nB0\n0 RUN "
"_l0.__next__\n0 OUT fun_todo\n0 EST fun_todo\n0 JEZ 2\nB1\n0 RUN "
"fun_todo\nB0\n0 JMP -1\nB0\n0 DEL _l0\nB0\n0 RUN __calls_when.len\n0 "
"OUT len\nB0\n2 NUM 0\n2 REF len\n1 RUN range\n0 RUN iter\n0 OUT "
"_l0\n0 REF _r1\n0 REF _r2\n0 REF _r3\n0 OUT _l0.a1\n0 OUT _l0.a2\n0 "
"OUT _l0.a3\nB0\n0 RUN _l0.__next__\n0 OUT i\n0 EST i\n0 JEZ 2\nB1\n1 "
"REF len\n1 NUM 0\n0 OPT ==\n0 JEZ 1\nB2\n0 BRK\nB1\n1 REF "
"__assert_when\n1 REF i\n0 RUN __get__\n0 OUT when\nB1\n0 RUN when\n0 "
"JEZ 1\nB2\n1 REF __calls_when\n1 REF i\n0 RUN __get__\n0 OUT "
"todo\nB2\n0 RUN todo\nB0\n0 JMP -1\nB0\n0 DEL _l0\nB0\n");
/* Python
if calls_period.len() > 0:
platformGetTick()
*/
pikaVM_runAsm(self,
"B0\n"
"1 RUN calls_period.len\n"
"1 NUM 0\n"
"0 OPT >\n"
"0 JEZ 1\n"
"B1\n"
"0 RUN platformGetTick\n"
"B0\n");
/* transfer the tick to pikaMain */
obj_setInt(__pikaMain, "__tick", obj_getInt(self, "tick"));
/* Python
len = __calls_always.len()
for i in range(0, len):
if len == 0:
break
todo = __calls_always[i]
todo()
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_always.len\n"
"0 OUT len\n"
"B0\n"
"2 NUM 0\n"
"2 REF len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __calls_always\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B1\n"
"0 RUN todo\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
/* Python
__len = __calls_when.len()
for i in range(0, __len):
if __len == 0:
break
when = __assert_when[i]
if when():
todo = __calls_when[i]
todo()
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_when.len\n"
"0 OUT __len\n"
"B0\n"
"2 NUM 0\n"
"2 REF __len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF __len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __assert_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT when\n"
"B1\n"
"0 RUN when\n"
"0 JEZ 1\n"
"B2\n"
"1 REF __calls_when\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B2\n"
"0 RUN todo\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
/* Python
__len = __calls_period.len()
for i in range(0, __len):
if __len == 0:
break
time = __time_period[i]
if __tick > __time_period[i]:
todo = __calls_period[i]
todo()
__time_period[i] = __tick + __assert_period[i]
*/
pikaVM_runAsm(__pikaMain,
"B0\n"
"0 RUN __calls_period.len\n"
"0 OUT __len\n"
"B0\n"
"2 NUM 0\n"
"2 REF __len\n"
"1 RUN range\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"0 REF _r1\n"
"0 REF _r2\n"
"0 REF _r3\n"
"0 OUT _l0.a1\n"
"0 OUT _l0.a2\n"
"0 OUT _l0.a3\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT i\n"
"0 EST i\n"
"0 JEZ 2\n"
"B1\n"
"1 REF __len\n"
"1 NUM 0\n"
"0 OPT ==\n"
"0 JEZ 1\n"
"B2\n"
"0 BRK\n"
"B1\n"
"1 REF __time_period\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT time\n"
"B1\n"
"1 REF __tick\n"
"2 REF __time_period\n"
"2 REF i\n"
"1 RUN __get__\n"
"0 OPT >\n"
"0 JEZ 1\n"
"B2\n"
"1 REF __calls_period\n"
"1 REF i\n"
"0 RUN __get__\n"
"0 OUT todo\n"
"B2\n"
"0 RUN todo\n"
"B2\n"
"1 REF __time_period\n"
"1 REF i\n"
"2 REF __tick\n"
"3 REF __assert_period\n"
"3 REF i\n"
"2 RUN __get__\n"
"1 OPT +\n"
"1 STR __time_period\n"
"0 RUN __set__\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0 \n");
}
void PikaStdTask_Task_run_always(PikaObj* self) {
@ -46,3 +258,8 @@ void PikaStdTask_Task_run_always(PikaObj* self) {
PikaStdTask_Task_run_once(self);
}
}
void PikaStdTask_Task_platformGetTick(PikaObj* self) {
obj_setErrorCode(self, 1);
obj_setSysOut(self, "[error] platform method need to be override.");
}

143
port/linux/test/parse-test.cpp
View File

@ -1723,9 +1723,9 @@ TEST(parser, __iter__) {
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"0 RUN __iter__\n"
"0 OUT __res\n");
"B0\n"
"0 RUN __iter__\n"
"0 OUT __res\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -1761,23 +1761,23 @@ TEST(parser, for_in_string) {
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"1 STR test\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT b\n"
"0 EST b\n"
"0 JEZ 2\n"
"B1\n"
"0 NUM 1\n"
"0 OUT a\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
"B0\n"
"1 STR test\n"
"0 RUN iter\n"
"0 OUT _l0\n"
"B0\n"
"0 RUN _l0.__next__\n"
"0 OUT b\n"
"0 EST b\n"
"0 JEZ 2\n"
"B1\n"
"0 NUM 1\n"
"0 OUT a\n"
"B0\n"
"0 JMP -1\n"
"B0\n"
"0 DEL _l0\n"
"B0\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -1785,16 +1785,14 @@ TEST(parser, for_in_string) {
TEST(parser, print_ddd) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"print(\"[Info]: in Python config...\")\n";
char* lines = (char*)"print(\"[Info]: in Python config...\")\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"1 STR [Info]: in Python config...\n"
"0 RUN print\n"
);
"B0\n"
"1 STR [Info]: in Python config...\n"
"0 RUN print\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -1802,26 +1800,24 @@ TEST(parser, print_ddd) {
TEST(parser, __get__3) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"a = b[c+d] + e[f*j]\n";
char* lines = (char*)"a = b[c+d] + e[f*j]\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"2 REF b\n"
"3 REF c\n"
"3 REF d\n"
"2 OPT +\n"
"1 RUN __get__\n"
"2 REF e\n"
"3 REF f\n"
"3 REF j\n"
"2 OPT *\n"
"1 RUN __get__\n"
"0 OPT +\n"
"0 OUT a\n"
);
"B0\n"
"2 REF b\n"
"3 REF c\n"
"3 REF d\n"
"2 OPT +\n"
"1 RUN __get__\n"
"2 REF e\n"
"3 REF f\n"
"3 REF j\n"
"2 OPT *\n"
"1 RUN __get__\n"
"0 OPT +\n"
"0 OUT a\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
@ -1829,79 +1825,64 @@ TEST(parser, __get__3) {
TEST(parser, __get__) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"a = b[c]\n";
char* lines = (char*)"a = b[c]\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"1 REF b\n"
"1 REF c\n"
"0 RUN __get__\n"
"0 OUT a\n"
);
"B0\n"
"1 REF b\n"
"1 REF c\n"
"0 RUN __get__\n"
"0 OUT a\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(parser, __get__2) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"a = b[c+d]\n";
char* lines = (char*)"a = b[c+d]\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"1 REF b\n"
"2 REF c\n"
"2 REF d\n"
"1 OPT +\n"
"0 RUN __get__\n"
"0 OUT a\n"
);
"B0\n"
"1 REF b\n"
"2 REF c\n"
"2 REF d\n"
"1 OPT +\n"
"0 RUN __get__\n"
"0 OUT a\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(parser, __set__) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"a[b] = c\n";
char* lines = (char*)"a[b] = c\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);
EXPECT_STREQ(pikaAsm,
"B0\n"
"1 REF a\n"
"1 REF b\n"
"1 REF c\n"
"1 STR a\n"
"0 RUN __set__\n"
);
"B0\n"
"1 REF a\n"
"1 REF b\n"
"1 REF c\n"
"1 STR a\n"
"0 RUN __set__\n");
args_deinit(buffs);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(parser, test__) {
pikaMemInfo.heapUsedMax = 0;
Args* buffs = New_strBuff();
char* lines = (char*)
"len = __calls_when.len()\n"
"for i in range(0, len):\n"
" if len == 0:\n"
" break\n"
" when = __assert_when[i]\n"
" if when():\n"
" todo = __calls_when[i]\n"
" todo()\n"
"\n";
"if calls_period.len() > 0:\n"
" platformGetTick()\n"
"\n";
printf("%s", lines);
char* pikaAsm = Parser_multiLineToAsm(buffs, (char*)lines);
printf("%s", pikaAsm);