mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-07-21 00:58:10 -07:00
JS: Backport³ and more additions & fixes (#3961)
* JS: Fix file select for fbt launch js_app * JS: badusb: Add numpad keys Co-authored-by: oldip <oldip@users.noreply.github.com> * JS: badusb: Layout support * JS: badusb: altPrint() and altPrintln() Co-authored-by: oldip <oldip@users.noreply.github.com> * JS: badusb: quit() * JS: serial: readAny() * JS: serial: end() * JS: serial: Auto disable expansion service * JS: storage: Add example script * JS: gui: text_input: Fix NULL ptr when no prop given * JS: gui: text_input: Default text props Co-authored-by: xMasterX <xMasterX@users.noreply.github.com> * JS: gui: byte_input Co-authored-by: xMasterX <xMasterX@users.noreply.github.com> * JS: gui: file_picker * JS: gui: viewDispatcher.currentView * JS: gui: view.hasProperty() * JS: gui: Add some missing typedefs comments * JS: globals: Fix toString() with negative numbers * JS: globals: parseInt() Co-authored-by: Spooks4576 <Spooks4576@users.noreply.github.com> * JS: globals: toUpperCase() and toLowerCase() Co-authored-by: Spooks4576 <Spooks4576@users.noreply.github.com> * JS: globals: Add some missing typedefs * JS: Add example for string functions Co-authored-by: Spooks4576 <Spooks4576@users.noreply.github.com> * JS: globals: __dirpath and __filepath Co-authored-by: jamisonderek <jamisonderek@users.noreply.github.com> * JS: globals: load() typedef missing scope param * JS: Add interactive REPL script example * JS: Add missing icon for file picker * JS: Rename to __filename and __dirname * JS: Move toUpperCase() and toLowerCase() to string class * JS: parseInt() refactor * JS: Typedef base param for parseInt() * Revert "JS: gui: view.hasProperty()" This reverts commit 1967ec06d4f2e9cafc4e18384ad370f7a7c44468. * JS: Move toString() to Number class * JS: Fix duplicate plugin files in plugins, `requires` is used to determine which app to distribute the .fal under `apps_data/appid/plugins` * JS: math: Missing typedefs, use camelCase * JS: badusb: layoutPath is optional in typedef * Fix ASS scoping * Rename mjs term prop type value * Change load() description * Enlarge buffers in default prop assign * More checks for default data/text size * Make PVS happy * Fix icon symbol * Update types for JS SDK * toString() was moved to number class Co-authored-by: oldip <oldip@users.noreply.github.com> Co-authored-by: xMasterX <xMasterX@users.noreply.github.com> Co-authored-by: Spooks4576 <Spooks4576@users.noreply.github.com> Co-authored-by: jamisonderek <jamisonderek@users.noreply.github.com> Co-authored-by: hedger <hedger@users.noreply.github.com> Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -452,6 +452,12 @@ static int getprop_builtin_string(
|
||||
} else if(strcmp(name, "slice") == 0) {
|
||||
*res = mjs_mk_foreign_func(mjs, (mjs_func_ptr_t)mjs_string_slice);
|
||||
return 1;
|
||||
} else if(strcmp(name, "toUpperCase") == 0) {
|
||||
*res = mjs_mk_foreign_func(mjs, (mjs_func_ptr_t)mjs_string_to_upper_case);
|
||||
return 1;
|
||||
} else if(strcmp(name, "toLowerCase") == 0) {
|
||||
*res = mjs_mk_foreign_func(mjs, (mjs_func_ptr_t)mjs_string_to_lower_case);
|
||||
return 1;
|
||||
} else if(isnum) {
|
||||
/*
|
||||
* string subscript: return a new one-byte string if the index
|
||||
@@ -469,6 +475,22 @@ static int getprop_builtin_string(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int getprop_builtin_number(
|
||||
struct mjs* mjs,
|
||||
mjs_val_t val,
|
||||
const char* name,
|
||||
size_t name_len,
|
||||
mjs_val_t* res) {
|
||||
if(strcmp(name, "toString") == 0) {
|
||||
*res = mjs_mk_foreign_func(mjs, (mjs_func_ptr_t)mjs_number_to_string);
|
||||
return 1;
|
||||
}
|
||||
|
||||
(void)val;
|
||||
(void)name_len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int getprop_builtin_array(
|
||||
struct mjs* mjs,
|
||||
mjs_val_t val,
|
||||
@@ -583,6 +605,8 @@ static int getprop_builtin(struct mjs* mjs, mjs_val_t val, mjs_val_t name, mjs_v
|
||||
} else if(s != NULL && n == 5 && strncmp(s, "apply", n) == 0) {
|
||||
*res = mjs_mk_foreign_func(mjs, (mjs_func_ptr_t)mjs_apply_);
|
||||
handled = 1;
|
||||
} else if(mjs_is_number(val)) {
|
||||
handled = getprop_builtin_number(mjs, val, s, n, res);
|
||||
} else if(mjs_is_array(val)) {
|
||||
handled = getprop_builtin_array(mjs, val, s, n, res);
|
||||
} else if(mjs_is_foreign(val)) {
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "mjs_core.h"
|
||||
#include "mjs_internal.h"
|
||||
#include "mjs_primitive.h"
|
||||
#include "mjs_string_public.h"
|
||||
#include "mjs_util.h"
|
||||
|
||||
mjs_val_t mjs_mk_null(void) {
|
||||
return MJS_NULL;
|
||||
@@ -158,3 +160,31 @@ MJS_PRIVATE void mjs_op_isnan(struct mjs* mjs) {
|
||||
|
||||
mjs_return(mjs, ret);
|
||||
}
|
||||
|
||||
MJS_PRIVATE void mjs_number_to_string(struct mjs* mjs) {
|
||||
mjs_val_t ret = MJS_UNDEFINED;
|
||||
mjs_val_t base_v = MJS_UNDEFINED;
|
||||
int32_t base = 10;
|
||||
int32_t num;
|
||||
|
||||
/* get number from `this` */
|
||||
if(!mjs_check_arg(mjs, -1 /*this*/, "this", MJS_TYPE_NUMBER, NULL)) {
|
||||
goto clean;
|
||||
}
|
||||
num = mjs_get_int32(mjs, mjs->vals.this_obj);
|
||||
|
||||
if(mjs_nargs(mjs) >= 1) {
|
||||
/* get base from arg 0 */
|
||||
if(!mjs_check_arg(mjs, 0, "base", MJS_TYPE_NUMBER, &base_v)) {
|
||||
goto clean;
|
||||
}
|
||||
base = mjs_get_int(mjs, base_v);
|
||||
}
|
||||
|
||||
char tmp_str[] = "-2147483648";
|
||||
itoa(num, tmp_str, base);
|
||||
ret = mjs_mk_string(mjs, tmp_str, ~0, true);
|
||||
|
||||
clean:
|
||||
mjs_return(mjs, ret);
|
||||
}
|
||||
|
||||
@@ -34,6 +34,11 @@ MJS_PRIVATE void* get_ptr(mjs_val_t v);
|
||||
*/
|
||||
MJS_PRIVATE void mjs_op_isnan(struct mjs* mjs);
|
||||
|
||||
/*
|
||||
* Implementation for JS Number.toString()
|
||||
*/
|
||||
MJS_PRIVATE void mjs_number_to_string(struct mjs* mjs);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
@@ -286,6 +286,41 @@ MJS_PRIVATE mjs_val_t s_concat(struct mjs* mjs, mjs_val_t a, mjs_val_t b) {
|
||||
return res;
|
||||
}
|
||||
|
||||
MJS_PRIVATE void mjs_string_to_case(struct mjs* mjs, bool upper) {
|
||||
mjs_val_t ret = MJS_UNDEFINED;
|
||||
size_t size;
|
||||
const char* s = NULL;
|
||||
|
||||
/* get string from `this` */
|
||||
if(!mjs_check_arg(mjs, -1 /*this*/, "this", MJS_TYPE_STRING, NULL)) {
|
||||
goto clean;
|
||||
}
|
||||
s = mjs_get_string(mjs, &mjs->vals.this_obj, &size);
|
||||
|
||||
if(size == 0) {
|
||||
ret = mjs_mk_string(mjs, "", 0, 1);
|
||||
goto clean;
|
||||
}
|
||||
|
||||
char* tmp = malloc(size);
|
||||
for(size_t i = 0; i < size; i++) {
|
||||
tmp[i] = upper ? toupper(s[i]) : tolower(s[i]);
|
||||
}
|
||||
ret = mjs_mk_string(mjs, tmp, size, 1);
|
||||
free(tmp);
|
||||
|
||||
clean:
|
||||
mjs_return(mjs, ret);
|
||||
}
|
||||
|
||||
MJS_PRIVATE void mjs_string_to_lower_case(struct mjs* mjs) {
|
||||
mjs_string_to_case(mjs, false);
|
||||
}
|
||||
|
||||
MJS_PRIVATE void mjs_string_to_upper_case(struct mjs* mjs) {
|
||||
mjs_string_to_case(mjs, true);
|
||||
}
|
||||
|
||||
MJS_PRIVATE void mjs_string_slice(struct mjs* mjs) {
|
||||
int nargs = mjs_nargs(mjs);
|
||||
mjs_val_t ret = mjs_mk_number(mjs, 0);
|
||||
|
||||
@@ -33,6 +33,8 @@ MJS_PRIVATE void embed_string(
|
||||
|
||||
MJS_PRIVATE void mjs_mkstr(struct mjs* mjs);
|
||||
|
||||
MJS_PRIVATE void mjs_string_to_lower_case(struct mjs* mjs);
|
||||
MJS_PRIVATE void mjs_string_to_upper_case(struct mjs* mjs);
|
||||
MJS_PRIVATE void mjs_string_slice(struct mjs* mjs);
|
||||
MJS_PRIVATE void mjs_string_index_of(struct mjs* mjs);
|
||||
MJS_PRIVATE void mjs_string_char_code_at(struct mjs* mjs);
|
||||
|
||||
Reference in New Issue
Block a user