Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-02-05 17:28:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

transfer after get Res

Browse Source
This commit is contained in:
lyon 2021-09-04 13:28:39 +08:00
parent c34a849b7b
commit 48e01e8f97
3 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/package/pikascript/pikascript-core/PikaInvoke.c
View File

@ -156,24 +156,6 @@ char *getTypeVal(Args *buffs, char *typeToken)
return strsGetLastToken(buffs, typeToken, ':'); return strsGetLastToken(buffs, typeToken, ':');
} }
static void transferReturnVal(PikaObj *self, char *returnType, char *returnName, Args *args)
{
if (strEqu("->int", returnType))
{
int returnVal = args_getInt(args, "return");
obj_setInt(self, returnName, returnVal);
}
if (strEqu("->float", returnType))
{
float returnVal = args_getFloat(args, "return");
obj_setFloat(self, returnName, returnVal);
}
if (strEqu("->str", returnType))
{
char *returnVal = args_getStr(args, "return");
obj_setStr(self, returnName, returnVal);
}
}
static Args *getArgsByNameMatch(PikaObj *self, char *typeList, char *argList) static Args *getArgsByNameMatch(PikaObj *self, char *typeList, char *argList)
{ {
@ -392,6 +374,7 @@ Args *obj_invoke(PikaObj *self, char *cmd)
/* get return type */ /* get return type */
char *returnType = strsGetLastToken(buffs, methodDec, ')'); char *returnType = strsGetLastToken(buffs, methodDec, ')');
/* get args */ /* get args */
args = getArgsBySentence(self, typeList, argList); args = getArgsBySentence(self, typeList, argList);
if (NULL == args) if (NULL == args)
@ -406,12 +389,17 @@ Args *obj_invoke(PikaObj *self, char *cmd)
/* run method */ /* run method */
methodPtr(methodHostObj, args); methodPtr(methodHostObj, args);
/* transfer return type */
args_setStr(res, "returnType", returnType);
/* transfer return */ /* transfer return */
args_copyArgByName(args, "return", res);
/* transfer return name */
if (strIsContain(methodToken, '=')) if (strIsContain(methodToken, '='))
{ {
char *returnName = strsGetFirstToken(buffs, methodToken, '='); char *returnName = strsGetFirstToken(buffs, methodToken, '=');
transferReturnVal(self, returnType, returnName, args); args_setStr(res, "returnName", returnName);
} }
/* transfer sysOut */ /* transfer sysOut */
char *sysOut = obj_getSysOut(methodHostObj); char *sysOut = obj_getSysOut(methodHostObj);
if (NULL != sysOut) if (NULL != sysOut)

45
src/package/pikascript/pikascript-core/PikaObj.c
View File

@ -486,15 +486,56 @@ exit:
return res; return res;
} }
Args *obj_runDirect(PikaObj *self, char *cmd) static void transferReturnVal(PikaObj *self, char *returnType, char *returnName, Args *args)
{
if (strEqu("->int", returnType))
{
int returnVal = args_getInt(args, "return");
obj_setInt(self, returnName, returnVal);
}
if (strEqu("->float", returnType))
{
float returnVal = args_getFloat(args, "return");
obj_setFloat(self, returnName, returnVal);
}
if (strEqu("->str", returnType))
{
char *returnVal = args_getStr(args, "return");
obj_setStr(self, returnName, returnVal);
}
}
Args *getRes(PikaObj *self, char *cmd)
{ {
if (strIsContain(cmd, '(') && strIsContain(cmd, ')')) if (strIsContain(cmd, '(') && strIsContain(cmd, ')'))
{ {
return obj_invoke(self, cmd); return obj_invoke(self, cmd);
} }
Args *res = New_args(NULL); }
Args *obj_runDirect(PikaObj *self, char *cmd)
{
Args *buffs = New_strBuff();
Args *res = NULL;
res = getRes(self, cmd);
/* transfer return */
if (strIsContain(cmd, '='))
{
char *returnType = args_getStr(res, "returnType");
char *returnName = args_getStr(res, "returnName");
transferReturnVal(self, returnType, returnName, res);
}
if (NULL == res)
{
res = New_args(NULL);
args_setErrorCode(res, 1); args_setErrorCode(res, 1);
args_setSysOut(res, "[error] solve script format faild!"); args_setSysOut(res, "[error] solve script format faild!");
}
exit:
args_deinit(buffs);
return res; return res;
} }

16
src/test/block-test.cpp
View File

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