From ff944ef8f6cf3f3817423907cf446a7e3b07e9bb Mon Sep 17 00:00:00 2001 From: Wang Renxin Date: Tue, 4 Jul 2017 16:41:01 +0800 Subject: [PATCH] *refactored. --- core/my_basic.c | 8 ++------ core/my_basic.h | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/my_basic.c b/core/my_basic.c index f167afb..591fead 100755 --- a/core/my_basic.c +++ b/core/my_basic.c @@ -314,7 +314,6 @@ MBCONST static const char* const _ERR_DESC[] = { "Collection or iterator expected", "Iterator expected", "Invalid iterator", - "Invalid iterator usage", "Iterable expected", "Referenced usertype expected", "Referenced type expected", @@ -3938,11 +3937,6 @@ _var: case _DT_DICT: mb_make_nil(key); _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)) { _handle_error_on_obj(s, SE_RN_CANNOT_FIND_WITH_GIVEN_INDEX, s->source_file, TON(l), MB_FUNC_ERR, _error, result); } @@ -7603,6 +7597,8 @@ static bool_t _find_dict(_dict_t* coll, mb_value_t* val, mb_value_t* oval) { mb_assert(coll && val); + if(val->type == MB_DT_LIST_IT || val->type == MB_DT_DICT_IT) + return false; _create_internal_object_from_public_value(val, &oarg); result = _ht_find(coll->dict, oarg); _destroy_object(oarg, 0); diff --git a/core/my_basic.h b/core/my_basic.h index 3138ec9..b237421 100755 --- a/core/my_basic.h +++ b/core/my_basic.h @@ -467,7 +467,6 @@ typedef enum mb_error_e { SE_RN_COLLECTION_OR_ITERATOR_EXPECTED, SE_RN_ITERATOR_EXPECTED, SE_RN_INVALID_ITERATOR, - SE_RN_INVALID_ITERATOR_USAGE, SE_RN_ITERABLE_EXPECTED, SE_RN_REFERENCED_USERTYPE_EXPECTED, SE_RN_REFERENCED_TYPE_EXPECTED,