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

Merge pull request #12389 from s-hadinger/berry_inheritance 

Berry improve inheritance #107
This commit is contained in:
Theo Arends 2021-06-17 09:33:47 +02:00 committed by GitHub
parent 009ea7156c cd99034f79
commit 8a8663b604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/Berry/src/be_class.c
View File

@ -165,6 +165,7 @@ static binstance* newobjself(bvm *vm, bclass *c)
while (v < end) { var_setnil(v); ++v; }
obj->_class = c;
obj->super = NULL;
obj->sub = NULL;
}
return obj;
}
@ -178,6 +179,7 @@ static binstance* newobject(bvm *vm, bclass *c)
be_incrtop(vm); /* protect new objects from GC */
for (c = c->super; c; c = c->super) {
prev->super = newobjself(vm, c);
prev->super->sub = prev;
prev = prev->super;
}
be_stackpop(vm, 1);

3
lib/libesp32/Berry/src/be_class.h
View File

@ -18,11 +18,13 @@
#define be_class_members(cl) ((cl)->members)
#define be_class_super(cl) ((cl)->super)
#define be_class_setsuper(self, sup) ((self)->super = (sup))
#define be_class_setsub(self, sub) ((self)->sub = (sub))
#define be_instance_name(obj) ((obj)->_class->name)
#define be_instance_class(obj) ((obj)->_class)
#define be_instance_members(obj) ((obj)->members)
#define be_instance_member_count(obj) ((obj)->_class->nvar)
#define be_instance_super(obj) ((obj)->super)
#define be_instance_sub(obj) ((obj)->sub)
struct bclass {
bcommon_header;
@ -41,6 +43,7 @@ struct bclass {
struct binstance {
bcommon_header;
struct binstance *super;
struct binstance *sub;
bclass *_class;
bgcobject *gray; /* for gc gray list */
bvalue members[1]; /* members variable data field */

5
lib/libesp32/Berry/src/be_vm.c
View File

@ -779,6 +779,11 @@ newframe: /* a new call frame */
int type = obj_attribute(vm, b, c, a);
reg = vm->reg;
if (basetype(type) == BE_FUNCTION) {
/* check if the object is a superinstance, if so get the lowest possible subclass */
while (obj->sub) {
obj = obj->sub;
}
var_setobj(&self, var_type(&self), obj); /* replace superinstance by lowest subinstance */
a[1] = self;
} else {
vm_error(vm, "attribute_error",