merge ofw dev missing parts

applications/system/js_app/modules/js_math.c

@@ -1,268 +1,313 @@
 #include "../js_modules.h"
 #include "furi_hal_random.h"
+#include <float.h>
 
-#define JS_MATH_PI (double)3.14159265358979323846
-#define JS_MATH_E (double)2.7182818284590452354
+#define JS_MATH_PI ((double)M_PI)
+#define JS_MATH_E ((double)M_E)
+#define JS_MATH_EPSILON ((double)DBL_EPSILON)
+
+#define TAG "JsMath"
 
 static void ret_bad_args(struct mjs* mjs, const char* error) {
     mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "%s", error);
-    mjs_return(mjs, mjs_mk_undefined());
+    mjs_return(mjs, MJS_UNDEFINED);
 }
 
-static bool check_arg_count(struct mjs* mjs, size_t count) {
+static bool check_args(struct mjs* mjs, size_t count) {
     size_t num_args = mjs_nargs(mjs);
     if(num_args != count) {
         ret_bad_args(mjs, "Wrong argument count");
         return false;
     }
+    for(size_t i = 0; i < count; i++) {
+        if(!mjs_is_number(mjs_arg(mjs, i))) {
+            ret_bad_args(mjs, "Wrong argument type");
+            return false;
+        }
+    }
     return true;
 }
 
-void js_math_abs(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+void js_math_is_equal(struct mjs* mjs) {
+    if(!check_args(mjs, 3)) {
+        return;
     }
+
+    double a = mjs_get_double(mjs, mjs_arg(mjs, 0));
+    double b = mjs_get_double(mjs, mjs_arg(mjs, 1));
+    double e = mjs_get_double(mjs, mjs_arg(mjs, 2));
+    double f = fabs(a - b);
+
+    mjs_return(mjs, mjs_mk_boolean(mjs, (f <= e)));
+}
+
+void js_math_abs(struct mjs* mjs) {
+    if(!check_args(mjs, 1)) {
+        return;
+    }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, x < 0 ? mjs_mk_number(mjs, -x) : mjs_arg(mjs, 0));
+
+    mjs_return(mjs, mjs_mk_number(mjs, fabs(x)));
 }
 
 void js_math_acos(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    if(x < -1 || x > 1) {
-        ret_bad_args(mjs, "Invalid input value for Math.acos");
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(x < (double)-1. || x > (double)1.) {
+        ret_bad_args(mjs, "Invalid input value for math.acos");
+        return;
     }
-    mjs_return(mjs, mjs_mk_number(mjs, JS_MATH_PI / (double)2 - atan(x / sqrt(1 - x * x))));
+
+    mjs_return(mjs, mjs_mk_number(mjs, acos(x)));
 }
 
 void js_math_acosh(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    if(x < 1) {
-        ret_bad_args(mjs, "Invalid input value for Math.acosh");
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(x < (double)1.) {
+        ret_bad_args(mjs, "Invalid input value for math.acosh");
+        return;
     }
-    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x - 1))));
+
+    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x - (double)1.))));
 }
 
 void js_math_asin(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, atan(x / sqrt(1 - x * x))));
+
+    mjs_return(mjs, mjs_mk_number(mjs, asin(x)));
 }
 
 void js_math_asinh(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x + 1))));
+
+    mjs_return(mjs, mjs_mk_number(mjs, log(x + sqrt(x * x + (double)1.))));
 }
 
 void js_math_atan(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+
     mjs_return(mjs, mjs_mk_number(mjs, atan(x)));
 }
 
 void js_math_atan2(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
-       !mjs_is_number(mjs_arg(mjs, 1))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 2)) {
+        return;
     }
+
     double y = mjs_get_double(mjs, mjs_arg(mjs, 0));
     double x = mjs_get_double(mjs, mjs_arg(mjs, 1));
+
     mjs_return(mjs, mjs_mk_number(mjs, atan2(y, x)));
 }
 
 void js_math_atanh(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    if(x <= -1 || x >= 1) {
-        ret_bad_args(mjs, "Invalid input value for Math.atanh");
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(x < (double)-1. || x > (double)1.) {
+        ret_bad_args(mjs, "Invalid input value for math.atanh");
+        return;
     }
-    mjs_return(mjs, mjs_mk_number(mjs, (double)0.5 * log((1 + x) / (1 - x))));
+
+    mjs_return(mjs, mjs_mk_number(mjs, (double)0.5 * log(((double)1. + x) / ((double)1. - x))));
 }
 
 void js_math_cbrt(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, pow(x, 1.0 / 3.0)));
+
+    mjs_return(mjs, mjs_mk_number(mjs, cbrt(x)));
 }
 
 void js_math_ceil(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, (int)(x + (double)0.5)));
+    mjs_return(mjs, mjs_mk_number(mjs, ceil(x)));
 }
 
 void js_math_clz32(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     unsigned int x = (unsigned int)mjs_get_int(mjs, mjs_arg(mjs, 0));
     int count = 0;
     while(x) {
         x >>= 1;
         count++;
     }
+
     mjs_return(mjs, mjs_mk_number(mjs, 32 - count));
 }
 
 void js_math_cos(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
+
     mjs_return(mjs, mjs_mk_number(mjs, cos(x)));
 }
 
 void js_math_exp(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    double result = 1;
-    double term = 1;
-    for(int i = 1; i < 100; i++) {
-        term *= x / i;
-        result += term;
-    }
-    mjs_return(mjs, mjs_mk_number(mjs, result));
+
+    mjs_return(mjs, mjs_mk_number(mjs, exp(x)));
 }
 
 void js_math_floor(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, (int)x));
+
+    mjs_return(mjs, mjs_mk_number(mjs, floor(x)));
 }
 
 void js_math_log(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
     if(x <= 0) {
-        ret_bad_args(mjs, "Invalid input value for Math.log");
-        mjs_return(mjs, MJS_UNDEFINED);
+        ret_bad_args(mjs, "Invalid input value for math.log");
+        return;
     }
-    double result = 0;
-    while(x >= JS_MATH_E) {
-        x /= JS_MATH_E;
-        result++;
-    }
-    mjs_return(mjs, mjs_mk_number(mjs, result + log(x)));
+
+    mjs_return(mjs, mjs_mk_number(mjs, log(x)));
 }
 
 void js_math_max(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
-       !mjs_is_number(mjs_arg(mjs, 1))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 2)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
     double y = mjs_get_double(mjs, mjs_arg(mjs, 1));
+
     mjs_return(mjs, mjs_mk_number(mjs, x > y ? x : y));
 }
 
 void js_math_min(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
-       !mjs_is_number(mjs_arg(mjs, 1))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 2)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
     double y = mjs_get_double(mjs, mjs_arg(mjs, 1));
+
     mjs_return(mjs, mjs_mk_number(mjs, x < y ? x : y));
 }
 
 void js_math_pow(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 2) || !mjs_is_number(mjs_arg(mjs, 0)) ||
-       !mjs_is_number(mjs_arg(mjs, 1))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 2)) {
+        return;
     }
+
     double base = mjs_get_double(mjs, mjs_arg(mjs, 0));
     double exponent = mjs_get_double(mjs, mjs_arg(mjs, 1));
-    double result = 1;
-    for(int i = 0; i < exponent; i++) {
-        result *= base;
-    }
-    mjs_return(mjs, mjs_mk_number(mjs, result));
+
+    mjs_return(mjs, mjs_mk_number(mjs, pow(base, exponent)));
 }
 
 void js_math_random(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 0)) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 0)) {
+        return;
     }
+
+    // double clearly provides more bits for entropy then we pack
+    // 32bit should be enough for now, but fix it maybe
     const uint32_t random_val = furi_hal_random_get();
-    double rnd = (double)random_val / FURI_HAL_RANDOM_MAX;
+    double rnd = (double)random_val / (double)FURI_HAL_RANDOM_MAX;
+
     mjs_return(mjs, mjs_mk_number(mjs, rnd));
 }
 
 void js_math_sign(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, x == 0 ? 0 : (x < 0 ? -1 : 1)));
+
+    mjs_return(
+        mjs,
+        mjs_mk_number(
+            mjs, fabs(x) <= JS_MATH_EPSILON ? 0 : (x < (double)0. ? (double)-1.0 : (double)1.0)));
 }
 
 void js_math_sin(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    double result = x;
-    double term = x;
-    for(int i = 1; i < 10; i++) {
-        term *= -x * x / ((2 * i) * (2 * i + 1));
-        result += term;
-    }
-    mjs_return(mjs, mjs_mk_number(mjs, result));
+
+    mjs_return(mjs, mjs_mk_number(mjs, sin(x)));
 }
 
 void js_math_sqrt(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    if(x < 0) {
-        ret_bad_args(mjs, "Invalid input value for Math.sqrt");
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(x < (double)0.) {
+        ret_bad_args(mjs, "Invalid input value for math.sqrt");
+        return;
     }
-    double result = 1;
-    while(result * result < x) {
-        result += (double)0.001;
-    }
-    mjs_return(mjs, mjs_mk_number(mjs, result));
+
+    mjs_return(mjs, mjs_mk_number(mjs, sqrt(x)));
 }
 
 void js_math_trunc(struct mjs* mjs) {
-    if(!check_arg_count(mjs, 1) || !mjs_is_number(mjs_arg(mjs, 0))) {
-        mjs_return(mjs, MJS_UNDEFINED);
+    if(!check_args(mjs, 1)) {
+        return;
     }
+
     double x = mjs_get_double(mjs, mjs_arg(mjs, 0));
-    mjs_return(mjs, mjs_mk_number(mjs, x < 0 ? ceil(x) : floor(x)));
+
+    mjs_return(mjs, mjs_mk_number(mjs, x < (double)0. ? ceil(x) : floor(x)));
 }
 
 static void* js_math_create(struct mjs* mjs, mjs_val_t* object) {
     mjs_val_t math_obj = mjs_mk_object(mjs);
+    mjs_set(mjs, math_obj, "is_equal", ~0, MJS_MK_FN(js_math_is_equal));
     mjs_set(mjs, math_obj, "abs", ~0, MJS_MK_FN(js_math_abs));
     mjs_set(mjs, math_obj, "acos", ~0, MJS_MK_FN(js_math_acos));
     mjs_set(mjs, math_obj, "acosh", ~0, MJS_MK_FN(js_math_acosh));
@@ -288,6 +333,7 @@ static void* js_math_create(struct mjs* mjs, mjs_val_t* object) {
     mjs_set(mjs, math_obj, "trunc", ~0, MJS_MK_FN(js_math_trunc));
     mjs_set(mjs, math_obj, "PI", ~0, mjs_mk_number(mjs, JS_MATH_PI));
     mjs_set(mjs, math_obj, "E", ~0, mjs_mk_number(mjs, JS_MATH_E));
+    mjs_set(mjs, math_obj, "EPSILON", ~0, mjs_mk_number(mjs, JS_MATH_EPSILON));
     *object = math_obj;
     return (void*)1;
 }
@@ -306,4 +352,4 @@ static const FlipperAppPluginDescriptor plugin_descriptor = {
 
 const FlipperAppPluginDescriptor* js_math_ep(void) {
     return &plugin_descriptor;
-}
+}