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

+added a hash and compare must come together error.

Browse Source
This commit is contained in:
Wang Renxin 2016-07-11 13:14:09 +08:00 committed by GitHub
parent 4ad40cd169
commit 5243b54a4a
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/my_basic.c
View File

@ -268,6 +268,7 @@ static const char* _ERR_DESC[] = {
"Class expected", "Class expected",
"Duplicate class", "Duplicate class",
"Wrong meta class", "Wrong meta class",
"HASH and COMPARE must come together",
"Cannot change ME", "Cannot change ME",
"Invalid lambda", "Invalid lambda",
"List expected", "List expected",
@ -1667,6 +1668,7 @@ static int _unlink_meta_instance(void* data, void* extra, _class_t* derived);
static int _clone_clsss_field(void* data, void* extra, void* n); static int _clone_clsss_field(void* data, void* extra, void* n);
static bool_t _clone_class_meta_link(_class_t* meta, void* n, void* ret); static bool_t _clone_class_meta_link(_class_t* meta, void* n, void* ret);
static int _search_class_meta_function(mb_interpreter_t* s, _class_t* instance, const char* n, _routine_t** f); static int _search_class_meta_function(mb_interpreter_t* s, _class_t* instance, const char* n, _routine_t** f);
static int _search_class_hash_and_compare_functions(mb_interpreter_t* s, _class_t* instance);
static bool_t _is_a_class(_class_t* instance, void* m, void* ret); static bool_t _is_a_class(_class_t* instance, void* m, void* ret);
static bool_t _add_class_meta_reachable(_class_t* meta, void* ht, void* ret); static bool_t _add_class_meta_reachable(_class_t* meta, void* ht, void* ret);
#ifdef MB_ENABLE_COLLECTION_LIB #ifdef MB_ENABLE_COLLECTION_LIB
@ -7591,6 +7593,23 @@ static int _search_class_meta_function(mb_interpreter_t* s, _class_t* instance,
return 0; return 0;
} }
/* Search for the HASH and COMPARE meta function for a class */
static int _search_class_hash_and_compare_functions(mb_interpreter_t* s, _class_t* instance) {
mb_assert(s && instance);
_search_class_meta_function(s, instance, _CLASS_HASH_FUNC, &instance->hash);
_search_class_meta_function(s, instance, _CLASS_COMPARE_FUNC, &instance->compare);
if(instance->hash && instance->compare) {
return MB_FUNC_OK;
} else {
instance->hash = 0;
instance->compare = 0;
return MB_FUNC_WARNING;
}
}
/* Detect whether a class instance is inherited from another */ /* Detect whether a class instance is inherited from another */
static bool_t _is_a_class(_class_t* instance, void* m, void* ret) { static bool_t _is_a_class(_class_t* instance, void* m, void* ret) {
_class_t* meta = (_class_t*)m; _class_t* meta = (_class_t*)m;
@ -8750,8 +8769,9 @@ static int _clone_object(mb_interpreter_t* s, _object_t* obj, _object_t* tgt, bo
tgt->data.instance->created_from = obj->data.instance->created_from; tgt->data.instance->created_from = obj->data.instance->created_from;
_push_scope_by_class(s, tgt->data.instance->scope); _push_scope_by_class(s, tgt->data.instance->scope);
_traverse_class(obj->data.instance, _clone_clsss_field, _clone_class_meta_link, _META_LIST_MAX_DEPTH, false, tgt->data.instance, 0); _traverse_class(obj->data.instance, _clone_clsss_field, _clone_class_meta_link, _META_LIST_MAX_DEPTH, false, tgt->data.instance, 0);
_search_class_meta_function(s, tgt->data.instance, _CLASS_HASH_FUNC, &tgt->data.instance->hash); if(_search_class_hash_and_compare_functions(s, tgt->data.instance) != MB_FUNC_OK) {
_search_class_meta_function(s, tgt->data.instance, _CLASS_COMPARE_FUNC, &tgt->data.instance->compare); mb_assert(0 && "Impossible.");
}
tgt->data.instance->userdata = obj->data.instance->userdata; tgt->data.instance->userdata = obj->data.instance->userdata;
_pop_scope(s, false); _pop_scope(s, false);
} else { } else {
@ -14337,8 +14357,9 @@ static int _core_class(mb_interpreter_t* s, void** l) {
_pop_scope(s, false); _pop_scope(s, false);
/* Search for meta functions */ /* Search for meta functions */
_search_class_meta_function(s, instance, _CLASS_HASH_FUNC, &instance->hash); if(_search_class_hash_and_compare_functions(s, instance) != MB_FUNC_OK) {
_search_class_meta_function(s, instance, _CLASS_COMPARE_FUNC, &instance->compare); _handle_error_on_obj(s, SE_RN_HASH_AND_COMPARE_MUST_COME_TOGETHER, s->source_file, DON(ast), MB_FUNC_WARNING, _exit, result);
}
/* Finished */ /* Finished */
if(ast) { if(ast) {