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

*minor bugfix with iterable.

Browse Source
This commit is contained in:
Wang Renxin 2017-07-04 15:42:13 +08:00
parent 3fd45e45fd
commit 321d11ee2a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/my_basic.c
View File

@ -311,9 +311,11 @@ MBCONST static const char* const _ERR_DESC[] = {
"Empty collection", "Empty collection",
"List expected", "List expected",
"Collection expected", "Collection expected",
"Collection or iterator or class expected", "Collection or iterator expected",
"Iterator expected", "Iterator expected",
"Invalid iterator", "Invalid iterator",
"Invalid iterator usage",
"Iterable expected",
"Referenced usertype expected", "Referenced usertype expected",
"Referenced type expected", "Referenced type expected",
"Reference count overflow", "Reference count overflow",
@ -3936,6 +3938,11 @@ _var:
case _DT_DICT: case _DT_DICT:
mb_make_nil(key); mb_make_nil(key);
_mb_check_exit(mb_pop_value(s, (void**)l, &key), _error); _mb_check_exit(mb_pop_value(s, (void**)l, &key), _error);
#ifdef MB_ENABLE_COLLECTION_LIB
if(key.type == MB_DT_LIST_IT || key.type == MB_DT_DICT_IT) {
_handle_error_on_obj(s, SE_RN_INVALID_ITERATOR_USAGE, s->source_file, TON(l), MB_FUNC_ERR, _error, result);
}
#endif /* MB_ENABLE_COLLECTION_LIB */
if(!_find_dict(ocoll->data.dict, &key, &ret)) { if(!_find_dict(ocoll->data.dict, &key, &ret)) {
_handle_error_on_obj(s, SE_RN_CANNOT_FIND_WITH_GIVEN_INDEX, s->source_file, TON(l), MB_FUNC_ERR, _error, result); _handle_error_on_obj(s, SE_RN_CANNOT_FIND_WITH_GIVEN_INDEX, s->source_file, TON(l), MB_FUNC_ERR, _error, result);
} }
@ -10714,7 +10721,7 @@ static int _execute_ranged_for_loop(mb_interpreter_t* s, _ls_node_t** l, _var_t*
break; break;
default: default:
_handle_error_on_obj(s, SE_RN_COLLECTION_EXPECTED, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_ITERABLE_EXPECTED, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
break; break;
} }
@ -17110,7 +17117,7 @@ static int _std_get(mb_interpreter_t* s, void** l) {
break; break;
case MB_DT_DICT_IT: case MB_DT_DICT_IT:
_public_value_to_internal_object(&ov, &obj); _public_value_to_internal_object(&ov, &obj);
if(obj.data.dict_it && obj.data.dict_it->curr_node && obj.data.dict_it->curr_node->extra) { if(obj.data.dict_it && obj.data.dict_it->curr_node && obj.data.dict_it->curr_node != _INVALID_DICT_IT && obj.data.dict_it->curr_node->extra) {
_internal_object_to_public_value((_object_t*)obj.data.dict_it->curr_node->extra, &ret); _internal_object_to_public_value((_object_t*)obj.data.dict_it->curr_node->extra, &ret);
} else { } else {
_handle_error_on_obj(s, SE_RN_INVALID_ITERATOR, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_INVALID_ITERATOR, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
@ -17132,7 +17139,7 @@ static int _std_get(mb_interpreter_t* s, void** l) {
break; break;
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
default: default:
_handle_error_on_obj(s, SE_RN_COLLECTION_OR_ITERATOR_OR_CLASS_EXPECTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_COLLECTION_OR_ITERATOR_EXPECTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
break; break;
} }

4
core/my_basic.h
View File

@ -464,9 +464,11 @@ typedef enum mb_error_e {
SE_RN_EMPTY_COLLECTION, SE_RN_EMPTY_COLLECTION,
SE_RN_LIST_EXPECTED, SE_RN_LIST_EXPECTED,
SE_RN_COLLECTION_EXPECTED, SE_RN_COLLECTION_EXPECTED,
SE_RN_COLLECTION_OR_ITERATOR_OR_CLASS_EXPECTED, SE_RN_COLLECTION_OR_ITERATOR_EXPECTED,
SE_RN_ITERATOR_EXPECTED, SE_RN_ITERATOR_EXPECTED,
SE_RN_INVALID_ITERATOR, SE_RN_INVALID_ITERATOR,
SE_RN_INVALID_ITERATOR_USAGE,
SE_RN_ITERABLE_EXPECTED,
SE_RN_REFERENCED_USERTYPE_EXPECTED, SE_RN_REFERENCED_USERTYPE_EXPECTED,
SE_RN_REFERENCED_TYPE_EXPECTED, SE_RN_REFERENCED_TYPE_EXPECTED,
SE_RN_REFERENCE_COUNT_OVERFLOW, SE_RN_REFERENCE_COUNT_OVERFLOW,