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

use line_handler for pikaScriptShell

Browse Source
This commit is contained in:
lyon 2022-01-28 00:03:49 +08:00
parent eeb6949713
commit 92dd8379d2
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/PikaObj.c
View File

@ -553,9 +553,10 @@ static void __clearBuff(char* buff, int size) {
}
}
volatile uint8_t is_in_block = 0;
void pikaScriptShell(PikaObj* self) {
void obj_shellLineProcess(PikaObj* self, __obj_shellLineHandler_t __lineHandler_fun) {
char rxBuff[PIKA_SHELL_LINE_BUFF_SIZE] = {0};
char *input_line = NULL;
uint8_t is_in_block = 0;
__platform_printf(">>> ");
while (1) {
char inputChar = __platform_getchar();
@ -589,7 +590,10 @@ void pikaScriptShell(PikaObj* self) {
/* go out from block */
if (rxBuff[0] != ' ') {
is_in_block = 0;
obj_run(self, obj_getStr(self, "shell_buff"));
input_line = obj_getStr(self, "shell_buff");
if(SHELL_STATE_EXIT == __lineHandler_fun(self, input_line)){
break;
}
__platform_printf(">>> ");
} else {
__platform_printf("... ");
@ -607,20 +611,33 @@ void pikaScriptShell(PikaObj* self) {
__platform_printf("... ");
continue;
}
/* exit */
if (strEqu("exit()", rxBuff)) {
/* exit pika shell */
input_line = rxBuff;
if(SHELL_STATE_EXIT == __lineHandler_fun(self, input_line)){
break;
}
/* run single line */
obj_run(self, rxBuff);
__platform_printf(">>> ");
__clearBuff(rxBuff, PIKA_SHELL_LINE_BUFF_SIZE);
continue;
}
}
}
static enum shell_state __obj_shellLineHandler_obj_run(PikaObj *self, char *input_line){
/* exit */
if (strEqu("exit()", input_line)) {
/* exit pika shell */
return SHELL_STATE_EXIT;
}
/* run single line */
obj_run(self, input_line);
return SHELL_STATE_CONTINUE;
}
void pikaScriptShell(PikaObj *self){
obj_shellLineProcess(self, __obj_shellLineHandler_obj_run);
}
void obj_setErrorCode(PikaObj* self, int32_t errCode) {
obj_setInt(self, "__errCode", errCode);
}

6
src/PikaObj.h
View File

@ -161,5 +161,11 @@ char* fast_itoa(char* buf, uint32_t val);
/* shell */
void pikaScriptShell(PikaObj *self);
enum shell_state{
SHELL_STATE_CONTINUE,
SHELL_STATE_EXIT
};
typedef enum shell_state (*__obj_shellLineHandler_t)(PikaObj* , char*);
void obj_shellLineProcess(PikaObj* self, __obj_shellLineHandler_t __lineHandler_fun);
#endif

1
src/PikaParser.c
View File

@ -1114,6 +1114,7 @@ char* AST_appandPikaAsm(AST* ast, AST* subAst, Args* outBuffs, char* pikaAsm) {
pikaAsm = strsAppend(buffs, pikaAsm, buff);
}
obj_setInt(ast, "deepth", deepth - 1);
goto exit;
exit:
pikaAsm = strsCopy(outBuffs, pikaAsm);
args_deinit(buffs);