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

*fixed an accessing issue with upvalues.

Browse Source
This commit is contained in:
Wang Renxin 2017-11-13 11:34:33 +08:00
parent 48816291e4
commit ceb91305a3
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,3 +1,6 @@
Nov. 13 2017
Fixed an accessing issue with upvalues
Nov. 10 2017 Nov. 10 2017
Fixed a GC bug with dictionary Fixed a GC bug with dictionary
Fixed a bug with overlapped lambda scopes Fixed a bug with overlapped lambda scopes

15
core/my_basic.c
View File

@ -8731,7 +8731,6 @@ static void _mark_upvalue(mb_interpreter_t* s, _lambda_t* lambda, _object_t* obj
static void _try_mark_upvalue(mb_interpreter_t* s, _routine_t* r, _object_t* obj) { static void _try_mark_upvalue(mb_interpreter_t* s, _routine_t* r, _object_t* obj) {
_lambda_t* lambda = 0; _lambda_t* lambda = 0;
_ls_node_t* node = 0; _ls_node_t* node = 0;
_object_t* inner = 0;
mb_assert(s && r && obj); mb_assert(s && r && obj);
mb_assert(r->type == MB_RT_LAMBDA); mb_assert(r->type == MB_RT_LAMBDA);
@ -8741,13 +8740,7 @@ static void _try_mark_upvalue(mb_interpreter_t* s, _routine_t* r, _object_t* obj
switch(obj->type) { switch(obj->type) {
case _DT_VAR: case _DT_VAR:
node = _ht_find(lambda->scope->var_dict, obj->data.variable->name); node = _ht_find(lambda->scope->var_dict, obj->data.variable->name);
if(node && node->data) { if(!node || !node->data) {
/* Use variables in the inner scope */
inner = (_object_t*)node->data;
obj->type = _DT_VAR;
obj->data = inner->data;
obj->is_ref = true;
} else {
/* Mark upvalues referencing outer scope chain */ /* Mark upvalues referencing outer scope chain */
_mark_upvalue(s, lambda, obj, obj->data.variable->name); _mark_upvalue(s, lambda, obj, obj->data.variable->name);
} }
@ -8852,9 +8845,7 @@ static int _fill_with_upvalue(void* data, void* extra, _upvalue_scope_tuple_t* t
switch(aobj->type) { switch(aobj->type) {
case _DT_VAR: case _DT_VAR:
if(!strcmp(aobj->data.variable->name, ovar->data.variable->name)) { if(!strcmp(aobj->data.variable->name, ovar->data.variable->name)) {
aobj->type = _DT_VAR; aobj->data.variable->pathing = true;
aobj->data = ovar->data;
aobj->is_ref = true;
} }
break; break;
@ -15165,6 +15156,8 @@ _proc_extra_var:
} }
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
if(evar && evar->pathing) { if(evar && evar->pathing) {
if(var->data->type == _DT_STRING)
var->data->is_ref = true;
var = evar; var = evar;
evar = 0; evar = 0;
refc++; refc++;