From 1c44ece6bb9b559f978a5e8b64240be35f9298b1 Mon Sep 17 00:00:00 2001 From: GUNJ JOSHI Date: Fri, 2 Aug 2024 01:16:34 +0530 Subject: [PATCH 1/2] feat: add ll_d in math/base/napi/binary --- .../@stdlib/math/base/napi/binary/README.md | 63 +++++++++++++++++++ .../include/stdlib/math/base/napi/binary.h | 45 +++++++++++++ .../@stdlib/math/base/napi/binary/src/main.c | 62 ++++++++++++++++++ 3 files changed, 170 insertions(+) diff --git a/lib/node_modules/@stdlib/math/base/napi/binary/README.md b/lib/node_modules/@stdlib/math/base/napi/binary/README.md index 5d90d947668..54c2a24b26f 100644 --- a/lib/node_modules/@stdlib/math/base/napi/binary/README.md +++ b/lib/node_modules/@stdlib/math/base/napi/binary/README.md @@ -555,6 +555,46 @@ The function accepts the following arguments: void stdlib_math_base_napi_ci_c( napi_env env, napi_callback_info info, stdlib_complex64_t (*fcn)( stdlib_complex64_t, int32_t ) ); ``` +#### stdlib_math_base_napi_ll_d( env, info, fcn ) + +Invokes a binary function accepting signed 64-bit integers and returning a double-precision floating-point number. + +```c +#include +#include + +// ... + +static double fcn( const int64_t x, const int64_t y ) { + // ... +} + +// ... + +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +napi_value addon( napi_env env, napi_callback_info info ) { + return stdlib_math_base_napi_ll_d( env, info, fcn ); +} + +// ... +``` + +The function accepts the following arguments: + +- **env**: `[in] napi_env` environment under which the function is invoked. +- **info**: `[in] napi_callback_info` callback data. +- **fcn**: `[in] double (*fcn)( int64_t, int64_t )` binary function. + +```c +void stdlib_math_base_napi_ll_d( napi_env env, napi_callback_info info, double (*fcn)( int64_t, int64_t ) ); +``` + #### STDLIB_MATH_BASE_NAPI_MODULE_DD_D( fcn ) Macro for registering a Node-API module exporting an interface for invoking a binary function accepting and returning double-precision floating-point numbers. @@ -897,6 +937,29 @@ The macro expects the following arguments: When used, this macro should be used **instead of** `NAPI_MODULE`. The macro includes `NAPI_MODULE`, thus ensuring Node-API module registration. +#### STDLIB_MATH_BASE_NAPI_MODULE_LL_D( fcn ) + +Macro for registering a Node-API module exporting an interface for invoking a binary function accepting signed 64-bit integers and returning a double-precision floating-point number. + +```c +#include + +static double fcn( const int64_t x, const int64_t y ) { + // ... +} + +// ... + +// Register a Node-API module: +STDLIB_MATH_BASE_NAPI_MODULE_II_D( fcn ); +``` + +The macro expects the following arguments: + +- **fcn**: `double (*fcn)( int64_t, int64_t )` binary function. + +When used, this macro should be used **instead of** `NAPI_MODULE`. The macro includes `NAPI_MODULE`, thus ensuring Node-API module registration. + diff --git a/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h b/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h index b6d095e75c1..dc8412a62fd 100644 --- a/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h +++ b/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h @@ -570,6 +570,46 @@ }; \ NAPI_MODULE( NODE_GYP_MODULE_NAME, stdlib_math_base_napi_cf_c_init ) +/** +* Macro for registering a Node-API module exporting an interface invoking a binary function accepting signed 64-bit integers and returning a double-precision floating-point number. +* +* @param fcn binary function +* +* @example +* static double fcn( const int_64 x, const int_64 y ) { +* // ... +* } +* +* // ... +* +* // Register a Node-API module: +* STDLIB_MATH_BASE_NAPI_MODULE_LL_D( fcn ); +*/ +#define STDLIB_MATH_BASE_NAPI_MODULE_LL_D( fcn ) \ + static napi_value stdlib_math_base_napi_ll_d_wrapper( \ + napi_env env, \ + napi_callback_info info \ + ) { \ + return stdlib_math_base_napi_ll_d( env, info, fcn ); \ + }; \ + static napi_value stdlib_math_base_napi_ll_d_init( \ + napi_env env, \ + napi_value exports \ + ) { \ + napi_value fcn; \ + napi_status status = napi_create_function( \ + env, \ + "exports", \ + NAPI_AUTO_LENGTH, \ + stdlib_math_base_napi_ll_d_wrapper, \ + NULL, \ + &fcn \ + ); \ + assert( status == napi_ok ); \ + return fcn; \ + }; \ + NAPI_MODULE( NODE_GYP_MODULE_NAME, stdlib_math_base_napi_ll_d_init ) + /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. */ @@ -637,6 +677,11 @@ napi_value stdlib_math_base_napi_zd_z( napi_env env, napi_callback_info info, st */ napi_value stdlib_math_base_napi_cf_c( napi_env env, napi_callback_info info, stdlib_complex64_t (*fcn)( stdlib_complex64_t, float ) ); +/** +* Invokes a binary function accepting signed 64-bit integers and returning a double-precision floating-point number. +*/ +napi_value stdlib_math_base_napi_ll_d( napi_env env, napi_callback_info info, double (*fcn)( int64_t, int64_t ) ); + #ifdef __cplusplus } #endif diff --git a/lib/node_modules/@stdlib/math/base/napi/binary/src/main.c b/lib/node_modules/@stdlib/math/base/napi/binary/src/main.c index 5443df55cfe..8a308393295 100644 --- a/lib/node_modules/@stdlib/math/base/napi/binary/src/main.c +++ b/lib/node_modules/@stdlib/math/base/napi/binary/src/main.c @@ -1185,3 +1185,65 @@ napi_value stdlib_math_base_napi_cf_c( napi_env env, napi_callback_info info, st return obj; } + +/** +* Invokes a binary function accepting signed 64-bit integers and returning a double-precision floating-point number. +* +* ## Notes +* +* - This function expects that the callback `info` argument provides access to the following JavaScript arguments: +* +* - `x`: input value. +* - `y`: input value. +* +* @param env environment under which the function is invoked +* @param info callback data +* @param fcn binary function +* @return function return value as a Node-API double-precision floating-point number +*/ +napi_value stdlib_math_base_napi_ll_d( napi_env env, napi_callback_info info, double (*fcn)( int64_t, int64_t ) ) { + napi_status status; + + size_t argc = 2; + napi_value argv[ 2 ]; + status = napi_get_cb_info( env, info, &argc, argv, NULL, NULL ); + assert( status == napi_ok ); + + if ( argc < 2 ) { + status = napi_throw_error( env, NULL, "invalid invocation. Must provide two numbers." ); + assert( status == napi_ok ); + return NULL; + } + + napi_valuetype vtype0; + status = napi_typeof( env, argv[ 0 ], &vtype0 ); + assert( status == napi_ok ); + if ( vtype0 != napi_number ) { + status = napi_throw_type_error( env, NULL, "invalid argument. First argument must be a number." ); + assert( status == napi_ok ); + return NULL; + } + + napi_valuetype vtype1; + status = napi_typeof( env, argv[ 1 ], &vtype1 ); + assert( status == napi_ok ); + if ( vtype1 != napi_number ) { + status = napi_throw_type_error( env, NULL, "invalid argument. Second argument must be a number." ); + assert( status == napi_ok ); + return NULL; + } + + int64_t x; + status = napi_get_value_int64( env, argv[ 0 ], &x ); + assert( status == napi_ok ); + + int64_t y; + status = napi_get_value_int64( env, argv[ 1 ], &y ); + assert( status == napi_ok ); + + napi_value v; + status = napi_create_double( env, fcn( x, y ), &v ); + assert( status == napi_ok ); + + return v; +} From 05badeecd647b3bce50336bf79332f5269429d69 Mon Sep 17 00:00:00 2001 From: Athan Date: Thu, 1 Aug 2024 13:48:15 -0700 Subject: [PATCH 2/2] Apply suggestions from code review Signed-off-by: Athan --- .../base/napi/binary/include/stdlib/math/base/napi/binary.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h b/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h index dc8412a62fd..15a4e281776 100644 --- a/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h +++ b/lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h @@ -576,6 +576,8 @@ * @param fcn binary function * * @example +* #include +* * static double fcn( const int_64 x, const int_64 y ) { * // ... * }