mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14859 from s-hadinger/berry_instance_func 

Berry instance variables are never methods
This commit is contained in:
s-hadinger 2022-02-15 17:47:29 +01:00 committed by GitHub
parent c074573f09 5f64dc38e0
commit 05ac7ba4f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libesp32/berry/src/be_vm.c
View File

@ -904,7 +904,11 @@ newframe: /* a new call frame */
if (var_isinstance(a) && var_isstr(b)) { if (var_isinstance(a) && var_isstr(b)) {
binstance *obj = var_toobj(a); binstance *obj = var_toobj(a);
bstring *attr = var_tostr(b); bstring *attr = var_tostr(b);
if (!be_instance_setmember(vm, obj, attr, c)) { bvalue result = *c;
if (var_isfunction(&result)) {
var_markstatic(&result);
}
if (!be_instance_setmember(vm, obj, attr, &result)) {
reg = vm->reg; reg = vm->reg;
vm_error(vm, "attribute_error", vm_error(vm, "attribute_error",
"class '%s' cannot assign to attribute '%s'", "class '%s' cannot assign to attribute '%s'",