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

*improved variable argument list processing with lambda; *fixed a wrong variable argument list processing issue.

Browse Source
This commit is contained in:
Wang Renxin 2016-06-21 11:19:38 +08:00 committed by GitHub
parent e24c99ee8a
commit 9d0a15dee6
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/my_basic.c
View File

@ -13988,6 +13988,10 @@ static int _core_def(mb_interpreter_t* s, void** l) {
if(!routine->func.basic.parameters) if(!routine->func.basic.parameters)
routine->func.basic.parameters = _ls_create(); routine->func.basic.parameters = _ls_create();
_ls_pushback(routine->func.basic.parameters, (void*)&_VAR_ARGS); _ls_pushback(routine->func.basic.parameters, (void*)&_VAR_ARGS);
ast = ast->next;
obj = (_object_t*)ast->data;
break;
} }
ast = ast->next; ast = ast->next;
@ -14330,10 +14334,20 @@ static int _core_lambda(mb_interpreter_t* s, void** l) {
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
void* v = 0; void* v = 0;
_mb_check_mark(mb_get_var(s, l, &v), result, _error);
if(!routine->func.lambda.parameters) if(!routine->func.lambda.parameters)
routine->func.lambda.parameters = _ls_create(); routine->func.lambda.parameters = _ls_create();
ast = (_ls_node_t*)*l;
if(ast && _IS_FUNC(ast->data, _core_args)) {
_ls_pushback(routine->func.lambda.parameters, (void*)&_VAR_ARGS);
ast = ast->next;
*l = ast;
break;
}
_mb_check_mark(mb_get_var(s, l, &v), result, _error);
if(!v || ((_object_t*)v)->type != _DT_VAR) { if(!v || ((_object_t*)v)->type != _DT_VAR) {
_handle_error_on_obj(s, SE_RN_INVALID_LAMBDA, s->source_file, DON2(l), MB_FUNC_ERR, _error, result); _handle_error_on_obj(s, SE_RN_INVALID_LAMBDA, s->source_file, DON2(l), MB_FUNC_ERR, _error, result);
} }