From 97688e16d70824f623d2a3eb73cea92f792c4520 Mon Sep 17 00:00:00 2001 From: lyon Date: Sun, 30 Jan 2022 17:37:21 +0800 Subject: [PATCH] collect Stds to StdLib --- package/PikaStdLib/PikaStdData_List.c | 2 +- package/PikaStdLib/PikaStdTask.py | 19 +++++++------------ .../PikaDebuger_Debuger.c | 1 - .../PikaStdData_Dict.c | 0 .../PikaStdData_List.c | 0 .../PikaStdData_String.c | 0 .../PikaStdTask.py | 0 .../PikaStdTask_Task.c | 0 port/linux/pkg-push.sh | 8 ++++---- 9 files changed, 12 insertions(+), 18 deletions(-) rename port/linux/package/pikascript/pikascript-lib/{PikaDebug => PikaStdLib}/PikaDebuger_Debuger.c (97%) rename port/linux/package/pikascript/pikascript-lib/{PikaStdData => PikaStdLib}/PikaStdData_Dict.c (100%) rename port/linux/package/pikascript/pikascript-lib/{PikaStdData => PikaStdLib}/PikaStdData_List.c (100%) rename port/linux/package/pikascript/pikascript-lib/{PikaStdData => PikaStdLib}/PikaStdData_String.c (100%) rename port/linux/package/pikascript/pikascript-lib/{PikaStdTask => PikaStdLib}/PikaStdTask.py (100%) rename port/linux/package/pikascript/pikascript-lib/{PikaStdTask => PikaStdLib}/PikaStdTask_Task.c (100%) diff --git a/package/PikaStdLib/PikaStdData_List.c b/package/PikaStdLib/PikaStdData_List.c index 27e43d093..e3786828f 100644 --- a/package/PikaStdLib/PikaStdData_List.c +++ b/package/PikaStdLib/PikaStdData_List.c @@ -60,4 +60,4 @@ Arg* PikaStdData_List___get__(PikaObj* self) { void PikaStdData_List___set__(PikaObj* self) { PikaStdData_List_set(self, obj_getArg(self, "__val"), obj_getInt(self, "__key")); -} \ No newline at end of file +} diff --git a/package/PikaStdLib/PikaStdTask.py b/package/PikaStdLib/PikaStdTask.py index ea19b9272..55be5346b 100644 --- a/package/PikaStdLib/PikaStdTask.py +++ b/package/PikaStdLib/PikaStdTask.py @@ -3,35 +3,30 @@ import PikaStdData class Task(TinyObj): - calls = PikaStdData.List() + 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 - # regist a function to be called always def call_always(fun_todo: any): pass - - # regist a function to be called when fun_when() return 'True' + def call_when(fun_todo: any, fun_when: any): pass - # regist a function to be called periodically def call_period_ms(fun_todo: any, period_ms: int): pass - # run all registed function once def run_once(): pass - # run all registed function forever def run_forever(): pass - # run all registed function until time is up - def run_until_ms(until_ms: int): - pass - - # need be overried to supply the system tick def platformGetTick(): pass diff --git a/port/linux/package/pikascript/pikascript-lib/PikaDebug/PikaDebuger_Debuger.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c similarity index 97% rename from port/linux/package/pikascript/pikascript-lib/PikaDebug/PikaDebuger_Debuger.c rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c index 1a72cddf8..7fa55b748 100644 --- a/port/linux/package/pikascript/pikascript-lib/PikaDebug/PikaDebuger_Debuger.c +++ b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c @@ -1,4 +1,3 @@ -#include "PikaDebug_Debuger.h" #include "PikaVM.h" #include "dataStrs.h" diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_Dict.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_Dict.c rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_Dict.c diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_List.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_List.c rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_List.c diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_String.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/PikaStdData/PikaStdData_String.c rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdData_String.c diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask.py b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdTask.py similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask.py rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdTask.py diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask_Task.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdTask_Task.c similarity index 100% rename from port/linux/package/pikascript/pikascript-lib/PikaStdTask/PikaStdTask_Task.c rename to port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdTask_Task.c diff --git a/port/linux/pkg-push.sh b/port/linux/pkg-push.sh index a48b28013..52b59283f 100644 --- a/port/linux/pkg-push.sh +++ b/port/linux/pkg-push.sh @@ -1,6 +1,6 @@ pkg=$1 -cp package/pikascript/pikascript-lib/$pkg ../../package/ -r -cp package/pikascript/$pkg.py ../../package/$pkg/ -git add package/pikascript/pikascript-lib/$pkg +cp package/pikascript/pikascript-lib/PikaStdLib ../../package/ -r +cp package/pikascript/$pkg.py ../../package/PikaStdLib/ +git add package/pikascript/pikascript-lib/PikaStdLib git add package/pikascript/$pkg.py -git add ../../package/$pkg +git add ../../package/PikaStdLib