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

*fixed a string assignment issue with class member.

Browse Source
This commit is contained in:
Wang Renxin 2018-03-11 12:32:58 +08:00
parent 35944a5565
commit 48403dc1a0
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,3 +1,6 @@
Mar. 11 2018
Fixed a string assignment issue with class member
Mar. 9 2018 Mar. 9 2018
Fixed a GC bug with ranged FOR loop Fixed a GC bug with ranged FOR loop
Fixed a stepping bug in the IF statement Fixed a stepping bug in the IF statement

15
core/my_basic.c
View File

@ -15304,7 +15304,6 @@ static int _core_let(mb_interpreter_t* s, void** l) {
unsigned arr_idx = 0; unsigned arr_idx = 0;
bool_t literally = false; bool_t literally = false;
_object_t* val = 0; _object_t* val = 0;
bool_t freed = false;
#ifdef MB_ENABLE_COLLECTION_LIB #ifdef MB_ENABLE_COLLECTION_LIB
int_t idx = 0; int_t idx = 0;
mb_value_t key; mb_value_t key;
@ -15428,15 +15427,9 @@ static int _core_let(mb_interpreter_t* s, void** l) {
} }
#endif /* MB_ENABLE_COLLECTION_LIB */ #endif /* MB_ENABLE_COLLECTION_LIB */
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
if(evar && evar->pathing && evar->data->type == _DT_STRING && !(var->data->type == _DT_STRING && evar->data->data.string != var->data->data.string)) {
_dispose_object(evar->data);
evar = 0;
freed = true;
}
_proc_extra_var: _proc_extra_var:
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
if(!freed) _dispose_object(var->data);
_dispose_object(var->data);
var->data->type = val->type; var->data->type = val->type;
#ifdef MB_ENABLE_COLLECTION_LIB #ifdef MB_ENABLE_COLLECTION_LIB
if(val->type == _DT_LIST_IT || val->type == _DT_DICT_IT) if(val->type == _DT_LIST_IT || val->type == _DT_DICT_IT)
@ -15464,8 +15457,10 @@ _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) if(var->data->type == _DT_STRING) {
var->data->is_ref = true; var->data->data.string = mb_strdup(var->data->data.string, strlen(var->data->data.string) + 1);
var->data->is_ref = false;
}
var = evar; var = evar;
evar = 0; evar = 0;
refc++; refc++;