quinn-os/my-basic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*should handle single line struct properly.

Browse Source
This commit is contained in:
Wang Renxin 2017-11-07 19:31:31 +08:00
parent 01b4b2e00e
commit ec89b18d4d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/my_basic.c
View File

@ -1917,6 +1917,7 @@ static int _execute_normal_for_loop(mb_interpreter_t* s, _ls_node_t** l, _var_t*
static int _execute_ranged_for_loop(mb_interpreter_t* s, _ls_node_t** l, _var_t* var_loop); static int _execute_ranged_for_loop(mb_interpreter_t* s, _ls_node_t** l, _var_t* var_loop);
#endif /* MB_ENABLE_COLLECTION_LIB */ #endif /* MB_ENABLE_COLLECTION_LIB */
static int _skip_to(mb_interpreter_t* s, _ls_node_t** l, mb_func_t f, _data_e t); static int _skip_to(mb_interpreter_t* s, _ls_node_t** l, mb_func_t f, _data_e t);
static bool_t _skip_single_line_struct(_ls_node_t** ast, mb_func_t func);
static int _skip_if_chunk(mb_interpreter_t* s, _ls_node_t** l); static int _skip_if_chunk(mb_interpreter_t* s, _ls_node_t** l);
static int _skip_struct(mb_interpreter_t* s, _ls_node_t** l, mb_func_t open_func, mb_func_t post_open_func, mb_func_t close_func); static int _skip_struct(mb_interpreter_t* s, _ls_node_t** l, mb_func_t open_func, mb_func_t post_open_func, mb_func_t close_func);
static bool_t _multiline_statement(mb_interpreter_t* s); static bool_t _multiline_statement(mb_interpreter_t* s);
@ -11178,6 +11179,20 @@ _exit:
return result; return result;
} }
/* Skip single line structure */
static bool_t _skip_single_line_struct(_ls_node_t** ast, mb_func_t func) {
_ls_node_t* post = *ast;
while(post && !_IS_EOS(post->data))
post = post->next;
if(post && post->prev && !_IS_FUNC(post->prev->data, func)) {
*ast = post;
return true;
}
return false;
}
/* Skip current IF execution flow to next chunk */ /* Skip current IF execution flow to next chunk */
static int _skip_if_chunk(mb_interpreter_t* s, _ls_node_t** l) { static int _skip_if_chunk(mb_interpreter_t* s, _ls_node_t** l) {
int result = MB_FUNC_OK; int result = MB_FUNC_OK;
@ -11200,6 +11215,8 @@ static int _skip_if_chunk(mb_interpreter_t* s, _ls_node_t** l) {
*l = ast; *l = ast;
ast = ast->next; ast = ast->next;
if(ast && _IS_FUNC((_object_t*)ast->data, _core_if)) { if(ast && _IS_FUNC((_object_t*)ast->data, _core_if)) {
if(_skip_single_line_struct(&ast, _core_then))
continue;
if(++nested > sizeof(mask) * 8) { if(++nested > sizeof(mask) * 8) {
_handle_error_on_obj(s, SE_RN_NESTED_TOO_DEEP, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_NESTED_TOO_DEEP, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
} }
@ -11243,14 +11260,8 @@ static int _skip_struct(mb_interpreter_t* s, _ls_node_t** l, mb_func_t open_func
obj = (_object_t*)ast->data; obj = (_object_t*)ast->data;
if(_IS_FUNC(obj, open_func)) { if(_IS_FUNC(obj, open_func)) {
if(post_open_func) { if(post_open_func) {
_ls_node_t* post = ast; if(_skip_single_line_struct(&ast, post_open_func))
while(post && !_IS_EOS(post->data))
post = post->next;
if(post && post->prev && !_IS_FUNC(post->prev->data, post_open_func)) {
ast = post;
continue; continue;
}
} }
++count; ++count;
} else if(_IS_FUNC(obj, close_func) && _IS_EOS(obj_prev)) { } else if(_IS_FUNC(obj, close_func) && _IS_EOS(obj_prev)) {