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

*fixed a wrong context processing bug when evaluating a routine manually, thanks to Diederik for pointing it out.

Browse Source
This commit is contained in:
Wang Renxin 2017-05-07 14:13:09 +08:00
parent 38c7908bc7
commit 6dce8f749d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,3 +1,6 @@
May. 7 2017
Fixed a wrong context processing bug when evaluating a routine manually, thanks to Diederik for pointing it out
May. 6 2017 May. 6 2017
Added a tobe returned parameter to the mb_eval_routine function Added a tobe returned parameter to the mb_eval_routine function

8
core/my_basic.c
View File

@ -12936,7 +12936,9 @@ _exit:
/* Evaluate a sub routine */ /* Evaluate a sub routine */
int mb_eval_routine(struct mb_interpreter_t* s, void** l, mb_value_t val, mb_value_t* args, unsigned argc, mb_value_t* ret) { int mb_eval_routine(struct mb_interpreter_t* s, void** l, mb_value_t val, mb_value_t* args, unsigned argc, mb_value_t* ret) {
int result = MB_FUNC_OK; int result = MB_FUNC_OK;
_running_context_t* running = 0;
_object_t obj; _object_t obj;
_ls_node_t* ast = 0;
if(!s || !l) { if(!s || !l) {
result = MB_FUNC_ERR; result = MB_FUNC_ERR;
@ -12944,16 +12946,18 @@ int mb_eval_routine(struct mb_interpreter_t* s, void** l, mb_value_t val, mb_val
goto _exit; goto _exit;
} }
running = s->running_context;
if(val.type != MB_DT_ROUTINE) { if(val.type != MB_DT_ROUTINE) {
_handle_error_on_obj(s, SE_RN_ROUTINE_EXPECTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_ROUTINE_EXPECTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
} }
_MAKE_NIL(&obj); _MAKE_NIL(&obj);
_public_value_to_internal_object(&val, &obj); _public_value_to_internal_object(&val, &obj);
result = _eval_routine(s, (_ls_node_t**)l, args, argc, obj.data.routine, _has_routine_fun_arg, _pop_routine_fun_arg); ast = (_ls_node_t*)(*l);
result = _eval_routine(s, &ast, args, argc, obj.data.routine, _has_routine_fun_arg, _pop_routine_fun_arg);
if(ret) { if(ret) {
_running_context_t* running = s->running_context;
_assign_public_value(ret, &running->intermediate_value); _assign_public_value(ret, &running->intermediate_value);
_MAKE_NIL(&obj); _MAKE_NIL(&obj);
_public_value_to_internal_object(ret, &obj); _public_value_to_internal_object(ret, &obj);