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

+added an 'mb_keys_of_coll' function, which gets indices of a list or all keys of a dict.

Browse Source
This commit is contained in:
Wang Renxin 2017-06-02 16:06:33 +08:00
parent 8576bfd6c2
commit 3359a224e3
4 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,3 +1,6 @@
Jun. 2 2017
Added an mb_keys_of_coll function
May. 24 2017
Fixed a memory leak when applying GC on a forked environment

BIN
MY-BASIC Quick Reference.pdf
View File

Binary file not shown.

80
core/my_basic.c
View File

@ -502,6 +502,12 @@ typedef struct _dict_it_t {
unsigned curr_bucket;
_ls_node_t* curr_node;
} _dict_it_t;
typedef struct _keys_helper_t {
mb_value_t* keys;
int size;
int index;
} _keys_helper_t;
#endif /* MB_ENABLE_COLLECTION_LIB */
typedef struct _label_t {
@ -1742,6 +1748,7 @@ static bool_t _assign_with_it(_object_t* tgt, _object_t* src);
static int _clone_to_list(void* data, void* extra, _list_t* coll);
static int _clone_to_dict(void* data, void* extra, _dict_t* coll);
static int _copy_list_to_array(void* data, void* extra, _array_helper_t* h);
static int _copy_keys_to_value_array(void* data, void* extra, _keys_helper_t* h);
#endif /* MB_ENABLE_COLLECTION_LIB */
#ifdef MB_ENABLE_CLASS
@ -7724,6 +7731,25 @@ static int _copy_list_to_array(void* data, void* extra, _array_helper_t* h) {
return 1;
}
/* Copy all keys of a dictionary to a value array */
static int _copy_keys_to_value_array(void* data, void* extra, _keys_helper_t* h) {
_object_t* obj = 0;
mb_value_t val;
mb_unrefvar(data);
mb_assert(extra && h);
if(h->index >= h->size)
return 1;
obj = (_object_t*)extra;
mb_make_nil(val);
_internal_object_to_public_value(obj, &val);
h->keys[h->index++] = val;
return 1;
}
#endif /* MB_ENABLE_COLLECTION_LIB */
#ifdef MB_ENABLE_CLASS
@ -9875,7 +9901,7 @@ static int _create_internal_object_from_public_value(mb_value_t* pbl, _object_t*
_public_value_to_internal_object(pbl, *itn);
if((*itn)->type == _DT_STRING) {
(*itn)->is_ref = false;
(*itn)->data.string = mb_strdup((*itn)->data.string, 0);
(*itn)->data.string = mb_strdup((*itn)->data.string, strlen((*itn)->data.string) + 1);
}
return result;
@ -12753,6 +12779,58 @@ _exit:
return result;
}
/* Get all keys of a collection */
int mb_keys_of_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_value_t* keys, int c) {
int result = MB_FUNC_OK;
_object_t ocoll;
#ifdef MB_ENABLE_COLLECTION_LIB
_list_t* lst = 0;
_dict_t* dct = 0;
int i = 0;
_keys_helper_t helper;
#endif /* MB_ENABLE_COLLECTION_LIB */
if(!s) {
result = MB_FUNC_ERR;
goto _exit;
}
_MAKE_NIL(&ocoll);
#ifdef MB_ENABLE_COLLECTION_LIB
switch(coll.type) {
case MB_DT_LIST:
lst = (_list_t*)coll.value.list;
for(i = 0; i < c && i < (int)lst->count; ++i) {
mb_make_int(keys[i], i);
}
break;
case MB_DT_DICT:
dct = (_dict_t*)coll.value.dict;
helper.keys = keys;
helper.size = c;
helper.index = 0;
_HT_FOREACH(dct->dict, _do_nothing_on_object, _copy_keys_to_value_array, &helper);
break;
default:
_handle_error_on_obj(s, SE_RN_COLLECTION_EXPECTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
break;
}
#else /* MB_ENABLE_COLLECTION_LIB */
mb_unrefvar(coll);
mb_unrefvar(keys);
mb_unrefvar(c);
_handle_error_on_obj(s, SE_CM_NOT_SUPPORTED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
#endif /* MB_ENABLE_COLLECTION_LIB */
_exit:
return result;
}
/* Create a referenced usertype value */
int mb_make_ref_value(struct mb_interpreter_t* s, void* val, mb_value_t* out, mb_dtor_func_t un, mb_clone_func_t cl, mb_hash_func_t hs, mb_cmp_func_t cp, mb_fmt_func_t ft) {
#ifdef MB_ENABLE_USERTYPE_REF

1
core/my_basic.h
View File

@ -634,6 +634,7 @@ MBAPI int mb_get_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_
MBAPI int mb_set_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_value_t idx, mb_value_t val);
MBAPI int mb_remove_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_value_t idx);
MBAPI int mb_count_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, int* c);
MBAPI int mb_keys_of_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_value_t* keys, int c);
MBAPI int mb_make_ref_value(struct mb_interpreter_t* s, void* val, mb_value_t* out, mb_dtor_func_t un, mb_clone_func_t cl, mb_hash_func_t hs/* = NULL*/, mb_cmp_func_t cp/* = NULL*/, mb_fmt_func_t ft/* = NULL*/);
MBAPI int mb_get_ref_value(struct mb_interpreter_t* s, void** l, mb_value_t val, void** out);
MBAPI int mb_ref_value(struct mb_interpreter_t* s, void** l, mb_value_t val);