mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-10-15 00:08:47 +03:00
parent 2f102e61a9
commit 4b9b1769f7
54 changed files with 1357 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/mjs/mjs_core.c
View File

@@ -103,6 +103,7 @@ struct mjs* mjs_create(void* context) {
sizeof(struct mjs_object),
MJS_OBJECT_ARENA_SIZE,
MJS_OBJECT_ARENA_INC_SIZE);
mjs->object_arena.destructor = mjs_obj_destructor;
gc_arena_init(
&mjs->property_arena,
sizeof(struct mjs_property),

17
lib/mjs/mjs_object.c
View File

@@ -9,6 +9,7 @@
#include "mjs_primitive.h"
#include "mjs_string.h"
#include "mjs_util.h"
#include "furi.h"
#include "common/mg_str.h"
@@ -20,6 +21,19 @@ MJS_PRIVATE mjs_val_t mjs_object_to_value(struct mjs_object* o) {
}
}
MJS_PRIVATE void mjs_obj_destructor(struct mjs* mjs, void* cell) {
struct mjs_object* obj = cell;
mjs_val_t obj_val = mjs_object_to_value(obj);
struct mjs_property* destructor = mjs_get_own_property(
mjs, obj_val, MJS_DESTRUCTOR_PROP_NAME, strlen(MJS_DESTRUCTOR_PROP_NAME));
if(!destructor) return;
if(!mjs_is_foreign(destructor->value)) return;
mjs_custom_obj_destructor_t destructor_fn = mjs_get_ptr(mjs, destructor->value);
if(destructor_fn) destructor_fn(mjs, obj_val);
}
MJS_PRIVATE struct mjs_object* get_object_struct(mjs_val_t v) {
struct mjs_object* ret = NULL;
if(mjs_is_null(v)) {
@@ -293,7 +307,8 @@ mjs_val_t
* start from the end so the constructed object more closely resembles
* the definition.
*/
while(def->name != NULL) def++;
while(def->name != NULL)
def++;
for(def--; def >= defs; def--) {
mjs_val_t v = MJS_UNDEFINED;
const char* ptr = (const char*)base + def->offset;

5
lib/mjs/mjs_object.h
View File

@@ -50,6 +50,11 @@ MJS_PRIVATE mjs_err_t mjs_set_internal(
*/
MJS_PRIVATE void mjs_op_create_object(struct mjs* mjs);
/*
* Cell destructor for object arena
*/
MJS_PRIVATE void mjs_obj_destructor(struct mjs* mjs, void* cell);
#define MJS_PROTO_PROP_NAME "__p" /* Make it < 5 chars */
#if defined(__cplusplus)

8
lib/mjs/mjs_object_public.h
View File

@@ -119,6 +119,14 @@ int mjs_del(struct mjs* mjs, mjs_val_t obj, const char* name, size_t len);
*/
mjs_val_t mjs_next(struct mjs* mjs, mjs_val_t obj, mjs_val_t* iterator);
typedef void (*mjs_custom_obj_destructor_t)(struct mjs* mjs, mjs_val_t object);
/*
* Destructor property name. If set, must be a foreign pointer to a function
* that will be called just before the object is freed.
*/
#define MJS_DESTRUCTOR_PROP_NAME "__d"
#if defined(__cplusplus)
}
#endif /* __cplusplus */