From d4eb934eca87100512e6844683d33761b4fe5670 Mon Sep 17 00:00:00 2001 From: lyon Date: Sat, 20 Nov 2021 09:33:38 +0800 Subject: [PATCH] type_ is ok --- port/linux/package/pikascript/PikaStdLib.py | 2 +- .../PikaStdLib/PikaStdLib_SysObj.c | 3 +-- port/linux/test/pikaMain-test.cpp | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/port/linux/package/pikascript/PikaStdLib.py b/port/linux/package/pikascript/PikaStdLib.py index 994c6a1fa..03f9f3dfd 100644 --- a/port/linux/package/pikascript/PikaStdLib.py +++ b/port/linux/package/pikascript/PikaStdLib.py @@ -13,7 +13,7 @@ class MemChecker(BaseObj): class SysObj(BaseObj): - def type(argPath: str): + def type(arg: any): pass def remove(argPath: str): diff --git a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c index 77fcf0cb6..6458ea5d0 100644 --- a/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c +++ b/port/linux/package/pikascript/pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c @@ -16,8 +16,7 @@ void PikaStdLib_SysObj_remove(PikaObj* self, char* argPath) { } } -void PikaStdLib_SysObj_type(PikaObj* self, char* argPath) { - Arg* arg = obj_getArg(self, argPath); +void PikaStdLib_SysObj_type(PikaObj* self, Arg* arg) { if (NULL == arg) { obj_setSysOut(self, "[error] type: arg no found."); obj_setErrorCode(self, 1); diff --git a/port/linux/test/pikaMain-test.cpp b/port/linux/test/pikaMain-test.cpp index bab762d7b..8bfec0ebb 100644 --- a/port/linux/test/pikaMain-test.cpp +++ b/port/linux/test/pikaMain-test.cpp @@ -85,6 +85,27 @@ TEST(pikaMain, int_float_convert) { EXPECT_FLOAT_EQ(b, 1.3); EXPECT_FLOAT_EQ(b_i, 1); + /* deinit */ + obj_deinit(globals); + obj_deinit(pikaMain); + EXPECT_EQ(pikaMemNow(), 0); +} + +TEST(pikaMain, type_) { + /* init */ + pikaMemInfo.heapUsedMax = 0; + PikaObj* pikaMain = newRootObj((char*)"pikaMain", New_PikaMain); + /* run */ + Parameters* globals = + obj_runDirect(pikaMain, (char*) + "type(1)\n" + "b = 1.4\n" + "type(b)\n" + ); + /* collect */ + + /* assert */ + /* deinit */ obj_deinit(globals); obj_deinit(pikaMain);