This commit is contained in:
lyon 2021-09-04 16:03:25 +08:00
parent af89ef41ed
commit e985f9f0ad
4 changed files with 27 additions and 15 deletions

View File

@ -10,7 +10,8 @@
"request": "launch",
"program": "${workspaceFolder}/../build/src/test/pikascript_test",
"args": [
"--gtest_filter=object_test.test4"
// "--gtest_filter=object_test.test4"
"--gtest_filter=block.assert1"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",

View File

@ -538,9 +538,22 @@ Args *obj_runDirect(PikaObj *self, char *cmd)
{
Args *buffs = New_strBuff();
Args *res = NULL;
/* get right cmd */
char *right = getRightCmd(buffs, cmd);
/* get res from right cmd */
res = getRightRes(self, right);
/* check res */
if (NULL == res)
{
res = New_args(NULL);
args_setErrorCode(res, 1);
args_setSysOut(res, "[error] solve script format faild!");
goto exit;
}
/* transfer return */
if (strIsContain(cmd, '='))
{
@ -550,12 +563,6 @@ Args *obj_runDirect(PikaObj *self, char *cmd)
transferReturnVal(self, returnType, returnName, res);
}
if (NULL == res)
{
res = New_args(NULL);
args_setErrorCode(res, 1);
args_setSysOut(res, "[error] solve script format faild!");
}
exit:
args_deinit(buffs);
return res;

View File

@ -67,6 +67,10 @@ char *args_getBuff(Args *self, int32_t size)
char *args_getStr(Args *self, char *name)
{
if (NULL == self)
{
return NULL;
}
Arg *arg = args_getArg(self, name);
if (NULL == arg)
{

View File

@ -36,13 +36,13 @@ TEST(block, pop)
EXPECT_EQ(pikaMemNow(), 0);
}
// TEST(block, assert1)
// {
// PikaObj *block = block_init();
// block_setAssert(block, (char *)"1");
// int res = block_checkAssert(block);
// ASSERT_EQ(1, res);
// block_deinit(block);
// }
TEST(block, assert1)
{
PikaObj *block = block_init();
block_setAssert(block, (char *)"1");
int res = block_checkAssert(block);
ASSERT_EQ(1, res);
block_deinit(block);
}
void block_pushLine(PikaObj *self, char *line);