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

Merge pull request #14904 from s-hadinger/global_contains 

Berry add global.contains()
This commit is contained in:
s-hadinger 2022-02-18 22:40:24 +01:00 committed by GitHub
parent 202f83b4ff d00fc8702d
commit f77bedfe08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libesp32/berry/generate/be_fixed_global.h
View File

@ -1,14 +1,15 @@
#include "be_constobj.h"
static be_define_const_map_slots(m_libglobal_map) {
{ be_const_key(member, -1), be_const_func(m_findglobal) },
{ be_const_key(setmember, 0), be_const_func(m_setglobal) },
{ be_const_key(contains, -1), be_const_func(m_contains) },
{ be_const_key(setmember, -1), be_const_func(m_setglobal) },
{ be_const_key(_X28_X29, -1), be_const_func(m_globals) },
{ be_const_key(member, -1), be_const_func(m_findglobal) },
};
static be_define_const_map(
m_libglobal_map,
3
4
);
static be_define_const_module(

14
lib/libesp32/berry/src/be_globallib.c
View File

@ -42,6 +42,18 @@ static int m_globals(bvm *vm)
be_return(vm);
}
static int m_contains(bvm *vm)
{
int top = be_top(vm);
if (top >= 1 && be_isstring(vm, 1)) {
const char * name = be_tostring(vm, 1);
int idx = be_global_find(vm, be_newstr(vm, name));
be_pushbool(vm, idx > -1);
be_return(vm);
}
be_return_nil(vm);
}
static int m_findglobal(bvm *vm)
{
int top = be_top(vm);
@ -67,6 +79,7 @@ static int m_setglobal(bvm *vm)
#if !BE_USE_PRECOMPILED_OBJECT
be_native_module_attr_table(global) {
be_native_module_function("()", m_globals),
be_native_module_function("contains", m_contains),
be_native_module_function("member", m_findglobal),
be_native_module_function("setmember", m_setglobal),
};
@ -76,6 +89,7 @@ be_define_native_module(global, NULL);
/* @const_object_info_begin
module global (scope: global, depend: BE_USE_GLOBAL_MODULE) {
(), func(m_globals)
contains, func(m_contains)
member, func(m_findglobal)
setmember, func(m_setglobal)
}