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

*optimized memory occupation with lambda.

Browse Source
This commit is contained in:
paladin-t 2016-01-12 19:28:41 +08:00
parent 82ddc8c029
commit 686be8e61a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7,6 +7,7 @@ Fixed a multiple disposing bug with string expression calculation
Improved GC with outer scopes of lambda Improved GC with outer scopes of lambda
Fixed some other minor bugs with lambda Fixed some other minor bugs with lambda
Fixed a wrong disposing bug when accessing a collection by brackets Fixed a wrong disposing bug when accessing a collection by brackets
Optimized memory occupation with lambda
Jan. 11 2016 Jan. 11 2016
Fixed a crash bug when a DO-UNTIL statement is the end of a program Fixed a crash bug when a DO-UNTIL statement is the end of a program

17
core/my_basic.c
View File

@ -6234,7 +6234,6 @@ _running_context_t* _init_lambda(mb_interpreter_t* s, _routine_t* routine) {
lambda = &routine->func.lambda; lambda = &routine->func.lambda;
lambda->scope = _create_running_context(true); lambda->scope = _create_running_context(true);
result = _push_scope_by_routine(s, lambda->scope); result = _push_scope_by_routine(s, lambda->scope);
lambda->upvalues = _ht_create(0, _ht_cmp_string, _ht_hash_string, 0);
return result; return result;
} }
@ -6301,6 +6300,8 @@ void _mark_upvalue(mb_interpreter_t* s, _lambda_t* lambda, _object_t* obj, const
_ls_pushback(found_in_scope->refered_lambdas, lambda); _ls_pushback(found_in_scope->refered_lambdas, lambda);
} }
if(!lambda->upvalues)
lambda->upvalues = _ht_create(0, _ht_cmp_string, _ht_hash_string, 0);
_ht_set_or_insert(lambda->upvalues, obj->data.variable->name, obj); _ht_set_or_insert(lambda->upvalues, obj->data.variable->name, obj);
} }
@ -6422,13 +6423,15 @@ int _fill_outer_scope(void* data, void* extra, void* t) {
_upvalue_scope_tuple_t* tuple = (_upvalue_scope_tuple_t*)t; _upvalue_scope_tuple_t* tuple = (_upvalue_scope_tuple_t*)t;
mb_unrefvar(extra); mb_unrefvar(extra);
tuple->filled = _ht_create(0, _ht_cmp_intptr, _ht_hash_intptr, 0); { if(lambda->upvalues) {
tuple->lambda = lambda; tuple->filled = _ht_create(0, _ht_cmp_intptr, _ht_hash_intptr, 0); {
_HT_FOREACH(lambda->upvalues, _do_nothing_on_ht_for_lambda, _fill_with_upvalue, tuple); tuple->lambda = lambda;
tuple->lambda = 0; _HT_FOREACH(lambda->upvalues, _do_nothing_on_ht_for_lambda, _fill_with_upvalue, tuple);
tuple->lambda = 0;
}
_HT_FOREACH(tuple->filled, _do_nothing_on_ht_for_lambda, _remove_filled_upvalue, lambda->upvalues);
_ht_destroy(tuple->filled);
} }
_HT_FOREACH(tuple->filled, _do_nothing_on_ht_for_lambda, _remove_filled_upvalue, lambda->upvalues);
_ht_destroy(tuple->filled);
if(lambda->outer_scope) { if(lambda->outer_scope) {
if(tuple->outer_scope->scope != lambda->outer_scope->scope) if(tuple->outer_scope->scope != lambda->outer_scope->scope)