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

*refactored code.

Browse Source
This commit is contained in:
paladin-t 2016-03-11 11:09:28 +08:00
parent 20677b49d3
commit 9e922cb521
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/my_basic.c
View File

@ -1194,6 +1194,7 @@ static char _get_priority(mb_func_t op1, mb_func_t op2);
static int _get_priority_index(mb_func_t op); static int _get_priority_index(mb_func_t op);
static _object_t* _operate_operand(mb_interpreter_t* s, _object_t* optr, _object_t* opnd1, _object_t* opnd2, int* status); static _object_t* _operate_operand(mb_interpreter_t* s, _object_t* optr, _object_t* opnd1, _object_t* opnd2, int* status);
static bool_t _is_expression_terminal(mb_interpreter_t* s, _object_t* obj); static bool_t _is_expression_terminal(mb_interpreter_t* s, _object_t* obj);
static bool_t _is_unexpected_calc_type(mb_interpreter_t* s, _object_t* obj);
static int _calc_expression(mb_interpreter_t* s, _ls_node_t** l, _object_t** val); static int _calc_expression(mb_interpreter_t* s, _ls_node_t** l, _object_t** val);
static _ls_node_t* _push_var_args(mb_interpreter_t* s); static _ls_node_t* _push_var_args(mb_interpreter_t* s);
static void _pop_var_args(mb_interpreter_t* s, _ls_node_t* last_var_args); static void _pop_var_args(mb_interpreter_t* s, _ls_node_t* last_var_args);
@ -3193,6 +3194,25 @@ static bool_t _is_expression_terminal(mb_interpreter_t* s, _object_t* obj) {
return result; return result;
} }
static bool_t _is_unexpected_calc_type(mb_interpreter_t* s, _object_t* obj) {
/* Determine whether an object is an unexpected calculation result */
mb_assert(s && obj);
return !obj || (
(obj->type == _DT_FUNC) ||
(obj->type == _DT_LABEL) ||
#ifdef MB_ENABLE_LAMBDA
(obj->type == _DT_OUTER_SCOPE) ||
#endif /* MB_ENABLE_LAMBDA */
(obj->type == _DT_SEP) ||
#ifdef MB_ENABLE_SOURCE_TRACE
(obj->type == _DT_PREV_IMPORT) ||
(obj->type == _DT_POST_IMPORT) ||
#endif /* MB_ENABLE_SOURCE_TRACE */
(obj->type == _DT_EOS)
);
}
static int _calc_expression(mb_interpreter_t* s, _ls_node_t** l, _object_t** val) { static int _calc_expression(mb_interpreter_t* s, _ls_node_t** l, _object_t** val) {
/* Calculate an expression */ /* Calculate an expression */
int result = 0; int result = 0;
@ -3563,7 +3583,7 @@ _var:
r = _operate_operand(s, theta, a, b, &result); r = _operate_operand(s, theta, a, b, &result);
if(!r) { if(!r) {
_ls_clear(optr); _ls_clear(optr);
_handle_error_on_obj(s, SE_RN_OPERATION_FAILED, s->source_file, DON(errn), MB_FUNC_ERR, _error, result); _handle_error_on_obj(s, SE_RN_OPERATION_FAILED, s->source_file, errn ? DON(errn) : DON(ast), MB_FUNC_ERR, _error, result);
} }
_ls_pushback(opnd, r); _ls_pushback(opnd, r);
_ls_pushback(garbage, r); _ls_pushback(garbage, r);
@ -3580,24 +3600,8 @@ _var:
} }
c = (_object_t*)(_ls_popback(opnd)); c = (_object_t*)(_ls_popback(opnd));
if(!c || !(c->type == _DT_NIL || c->type == _DT_UNKNOWN || c->type == _DT_TYPE || if(_is_unexpected_calc_type(s, c)) {
c->type == _DT_INT || c->type == _DT_REAL || c->type == _DT_STRING ||
#ifdef MB_ENABLE_COLLECTION_LIB
c->type == _DT_LIST || c->type == _DT_LIST_IT || c->type == _DT_DICT || c->type == _DT_DICT_IT ||
#endif /* MB_ENABLE_COLLECTION_LIB */
#ifdef MB_ENABLE_CLASS
c->type == _DT_CLASS ||
#endif /* MB_ENABLE_CLASS */
c->type == _DT_ROUTINE ||
c->type == _DT_VAR || c->type == _DT_USERTYPE ||
#ifdef MB_ENABLE_USERTYPE_REF
c->type == _DT_USERTYPE_REF ||
#endif /* MB_ENABLE_USERTYPE_REF */
c->type == _DT_ARRAY)
) {
_handle_error_on_obj(s, SE_RN_INVALID_DATA_TYPE, s->source_file, DON(ast), MB_FUNC_ERR, _error, result); _handle_error_on_obj(s, SE_RN_INVALID_DATA_TYPE, s->source_file, DON(ast), MB_FUNC_ERR, _error, result);
goto _error;
} }
if(c->type == _DT_VAR) { if(c->type == _DT_VAR) {
(*val)->type = c->data.variable->data->type; (*val)->type = c->data.variable->data->type;