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

Merge pull request #13803 from s-hadinger/berry_renumber_types 

Berry renumber internal types to allow for extensions
This commit is contained in:
s-hadinger 2021-11-26 08:55:50 +01:00 committed by GitHub
parent 21476fbd3d ba09129398
commit 9f28529d37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/Berry/src/be_gc.h
View File

@ -10,8 +10,6 @@
#include "be_object.h" #include "be_object.h"
#define BE_GCOBJECT BE_STRING
#define gc_object(o) cast(bgcobject*, o) #define gc_object(o) cast(bgcobject*, o)
#define gc_cast(o, t, T) ((o) && (o)->type == (t) ? (T*)(o) : NULL) #define gc_cast(o, t, T) ((o) && (o)->type == (t) ? (T*)(o) : NULL)
#define cast_proto(o) gc_cast(o, BE_PROTO, bproto) #define cast_proto(o) gc_cast(o, BE_PROTO, bproto)

20
lib/libesp32/Berry/src/be_object.h
View File

@ -19,14 +19,18 @@
#define BE_COMPTR 5 /* common pointer */ #define BE_COMPTR 5 /* common pointer */
#define BE_INDEX 6 /* index for instance variable, previously BE_INT */ #define BE_INDEX 6 /* index for instance variable, previously BE_INT */
#define BE_FUNCTION 7 #define BE_FUNCTION 7
#define BE_STRING 8 /* from this type can be gced, see BE_GCOBJECT */
#define BE_CLASS 9 #define BE_GCOBJECT 16 /* from this type can be gced */
#define BE_INSTANCE 10
#define BE_PROTO 11 #define BE_STRING 16
#define BE_LIST 12 #define BE_CLASS 17
#define BE_MAP 13 #define BE_INSTANCE 18
#define BE_MODULE 14 #define BE_PROTO 19
#define BE_COMOBJ 15 /* common object */ #define BE_LIST 20
#define BE_MAP 21
#define BE_MODULE 22
#define BE_COMOBJ 23 /* common object */
#define BE_NTVFUNC ((0 << 5) | BE_FUNCTION) #define BE_NTVFUNC ((0 << 5) | BE_FUNCTION)
#define BE_CLOSURE ((1 << 5) | BE_FUNCTION) #define BE_CLOSURE ((1 << 5) | BE_FUNCTION)
#define BE_NTVCLOS ((2 << 5) | BE_FUNCTION) #define BE_NTVCLOS ((2 << 5) | BE_FUNCTION)