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

*fixed a wrong dereferencing bug with referenced type hashing and comparison; *fixed an invalid lambda bug with gc.

Browse Source
This commit is contained in:
paladin-t 2016-02-03 14:46:01 +08:00
parent b086bf8436
commit 06b42e270e
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,5 +1,7 @@
Feb. 3 2016 Feb. 3 2016
Fixed a memory leak with sub routine when assigning it as upvalue Fixed a wrong dereferencing bug with referenced type hashing and comparison
Fixed an invalid lambda bug with GC
Fixed a memory leak with sub routine when assigning it as an upvalue
Feb. 2 2016 Feb. 2 2016
Optimized list sorting function by using merge sorting Optimized list sorting function by using merge sorting

17
core/my_basic.c
View File

@ -2393,7 +2393,7 @@ unsigned int _ht_hash_intptr(void* ht, void* d) {
unsigned int _ht_hash_ref(void* ht, void* d) { unsigned int _ht_hash_ref(void* ht, void* d) {
unsigned int result = 0; unsigned int result = 0;
_ht_node_t* self = (_ht_node_t*)ht; _ht_node_t* self = (_ht_node_t*)ht;
_ref_t* ref = *(_ref_t**)d; _ref_t* ref = (_ref_t*)d;
mb_assert(ht); mb_assert(ht);
@ -2495,8 +2495,8 @@ int _ht_cmp_intptr(void* d1, void* d2) {
} }
int _ht_cmp_ref(void* d1, void* d2) { int _ht_cmp_ref(void* d1, void* d2) {
_ref_t* r1 = *(_ref_t**)d1; _ref_t* r1 = (_ref_t*)d1;
_ref_t* r2 = *(_ref_t**)d2; _ref_t* r2 = (_ref_t*)d2;
intptr_t i = (intptr_t)r1 - (intptr_t)r2; intptr_t i = (intptr_t)r1 - (intptr_t)r2;
int result = 0; int result = 0;
@ -5254,6 +5254,15 @@ int _gc_add_reachable(void* data, void* extra, void* ht) {
break; break;
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
#ifdef MB_ENABLE_LAMBDA
case _DT_ROUTINE:
if(obj->data.routine->type == _IT_LAMBDA) {
if(!_ht_find(htable, &obj->data.routine->func.lambda.ref))
_ht_set_or_insert(htable, &obj->data.routine->func.lambda.ref, obj->data.routine);
}
break;
#endif /* MB_ENABLE_LAMBDA */
default: /* Do nothing */ default: /* Do nothing */
break; break;
} }
@ -6946,6 +6955,8 @@ _routine_t* _clone_routine(_routine_t* sub, void* c, bool_t toupval) {
#ifdef MB_ENABLE_LAMBDA #ifdef MB_ENABLE_LAMBDA
if(toupval || sub->type == _IT_LAMBDA) if(toupval || sub->type == _IT_LAMBDA)
result = sub; result = sub;
#else /* MB_ENABLE_LAMBDA */
mb_unrefvar(toupval);
#endif /* MB_ENABLE_LAMBDA */ #endif /* MB_ENABLE_LAMBDA */
if(!result) { if(!result) {

BIN
output/my_basic.exe
View File

Binary file not shown.