Refactor to use stdlib complex number APIs

Author: kgryte

lib/node_modules/@stdlib/math/base/napi/binary/README.md

@@ -188,15 +188,27 @@ void stdlib_math_base_napi_ff_f( napi_env env, napi_callback_info info, float (*
 Invokes a binary function accepting and returning double-precision complex floating-point numbers.
 
 ```c
+#include "stdlib/complex/float64.h"
+#include "stdlib/complex/reim.h"
 #include <node_api.h>
-#include <complex.h>
 
 // ...
 
-static double complex add( const double complex x, const double complex y ) {
-    double re = creal( x ) + creal( y );
-    double im = cimag( x ) + cimag( y );
-    return re + im*I;
+static stdlib_complex128_t add( const stdlib_complex128_t x, const stdlib_complex128_t y ) {
+    double xre;
+    double xim;
+    double yre;
+    double yim;
+    double re;
+    double im;
+
+    stdlib_reim( x, &xre, &xim );
+    stdlib_reim( y, &yre, &yim );
+
+    re = xre + yre;
+    im = xim + yim;
+
+    return stdlib_complex128( re, im );
 }
 
 // ...
@@ -219,26 +231,38 @@ 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 complex (*fcn)( double complex, double complex )` binary function.
+-   **fcn**: `[in] stdlib_complex128_t (*fcn)( stdlib_complex128_t, stdlib_complex128_t )` binary function.
 
 ```c
-void stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, double complex (*fcn)( double complex, double complex ) );
+void stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, stdlib_complex128_t (*fcn)( stdlib_complex128_t, stdlib_complex128_t ) );
 ```
 
 #### stdlib_math_base_napi_cc_c( env, info, fcn )
 
 Invokes a binary function accepting and returning single-precision complex floating-point numbers.
 
 ```c
+#include "stdlib/complex/float64.h"
+#include "stdlib/complex/reim.h"
 #include <node_api.h>
-#include <complex.h>
 
 // ...
 
-static float complex add( const float complex x, const float complex y ) {
-    float re = crealf( x ) + crealf( y );
-    float im = cimagf( x ) + cimagf( y );
-    return re + im*I;
+static stdlib_complex64_t add( const stdlib_complex64_t x, const stdlib_complex64_t y ) {
+    float xre;
+    float xim;
+    float yre;
+    float yim;
+    float re;
+    float im;
+
+    stdlib_reimf( x, &xre, &xim );
+    stdlib_reimf( y, &yre, &yim );
+
+    re = xre + yre;
+    im = xim + yim;
+
+    return stdlib_complex64( re, im );
 }
 
 // ...
@@ -261,10 +285,10 @@ 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] float complex (*fcn)( float complex, float complex )` binary function.
+-   **fcn**: `[in] stdlib_complex64_t (*fcn)( stdlib_complex64_t, stdlib_complex64_t )` binary function.
 
 ```c
-void stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, float complex (*fcn)( float complex, float complex ) );
+void stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, stdlib_complex64_t (*fcn)( stdlib_complex64_t, stdlib_complex64_t ) );
 ```
 
 #### STDLIB_MATH_BASE_NAPI_MODULE_DD_D( fcn )
@@ -314,12 +338,24 @@ When used, this macro should be used **instead of** `NAPI_MODULE`. The macro inc
 Macro for registering a Node-API module exporting an interface for invoking a binary function accepting and returning double-precision complex floating-point numbers.
 
 ```c
-#include <complex.h>
+#include "stdlib/complex/float64.h"
+#include "stdlib/complex/reim.h"
 
-static double complex add( const double complex x, const double complex y ) {
-    double re = creal( x ) + creal( y );
-    double im = cimag( x ) + cimag( y );
-    return re + im*I;
+static stdlib_complex128_t add( const stdlib_complex128_t x, const stdlib_complex128_t y ) {
+    double xre;
+    double xim;
+    double yre;
+    double yim;
+    double re;
+    double im;
+
+    stdlib_reim( x, &xre, &xim );
+    stdlib_reim( y, &yre, &yim );
+
+    re = xre + yre;
+    im = xim + yim;
+
+    return stdlib_complex128( re, im );
 }
 
 // ...
@@ -330,7 +366,7 @@ STDLIB_MATH_BASE_NAPI_MODULE_ZZ_Z( add );
 
 The macro expects the following arguments:
 
--   **fcn**: `double complex (*fcn)( double complex, double complex )` binary function.
+-   **fcn**: `stdlib_complex128_t (*fcn)( stdlib_complex128_t, stdlib_complex128_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.
 
@@ -339,12 +375,24 @@ When used, this macro should be used **instead of** `NAPI_MODULE`. The macro inc
 Macro for registering a Node-API module exporting an interface for invoking a binary function accepting and returning single-precision complex floating-point numbers.
 
 ```c
-#include <complex.h>
+#include "stdlib/complex/float32.h"
+#include "stdlib/complex/reimf.h"
+
+static stdlib_complex64_t add( const stdlib_complex64_t x, const stdlib_complex64_t y ) {
+    float xre;
+    float xim;
+    float yre;
+    float yim;
+    float re;
+    float im;
+
+    stdlib_reimf( x, &xre, &xim );
+    stdlib_reimf( y, &yre, &yim );
+
+    re = xre + yre;
+    im = xim + yim;
 
-static float complex add( const float complex x, const float complex y ) {
-    float re = crealf( x ) + crealf( y );
-    float im = cimagf( x ) + cimagf( y );
-    return re + im*I;
+    return stdlib_complex64( re, im );
 }
 
 // ...
@@ -355,7 +403,7 @@ STDLIB_MATH_BASE_NAPI_MODULE_CC_C( add );
 
 The macro expects the following arguments:
 
--   **fcn**: `float complex (*fcn)( float complex, float complex )` binary function.
+-   **fcn**: `stdlib_complex64_t (*fcn)( stdlib_complex64_t, stdlib_complex64_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.
 

lib/node_modules/@stdlib/math/base/napi/binary/include/stdlib/math/base/napi/binary.h

@@ -19,9 +19,10 @@
 #ifndef STDLIB_MATH_BASE_NAPI_BINARY_H
 #define STDLIB_MATH_BASE_NAPI_BINARY_H
 
+#include "stdlib/complex/float32.h"
+#include "stdlib/complex/float64.h"
 #include <node_api.h>
 #include <assert.h>
-#include <complex.h>
 
 /**
 * Macro for registering a Node-API module exporting an interface invoking a binary function accepting and returning double-precision floating-point numbers.
@@ -109,12 +110,24 @@
 * @param fcn   binary function
 *
 * @example
-* #include <complex.h>
+* #include "stdlib/complex/float64.h"
+* #include "stdlib/complex/reim.h"
 *
-* static double complex add( const double complex x, const double complex y ) {
-*     double re = creal( x ) + creal( y );
-*     double im = cimag( x ) + cimag( y );
-*     return re + im*I;
+* static stdlib_complex128_t add( const stdlib_complex128_t x, const stdlib_complex128_t y ) {
+*     double xre;
+*     double xim;
+*     double yre;
+*     double yim;
+*     double re;
+*     double im;
+*
+*     stdlib_reim( x, &xre, &xim );
+*     stdlib_reim( y, &yre, &yim );
+*
+*     re = xre + yre;
+*     im = xim + yim;
+*
+*     return stdlib_complex128( re, im );
 * }
 *
 * // ...
@@ -153,12 +166,24 @@
 * @param fcn   binary function
 *
 * @example
-* #include <complex.h>
+* #include "stdlib/complex/float32.h"
+* #include "stdlib/complex/reimf.h"
+*
+* static stdlib_complex64_t add( const stdlib_complex64_t x, const stdlib_complex64_t y ) {
+*     float xre;
+*     float xim;
+*     float yre;
+*     float yim;
+*     float re;
+*     float im;
+*
+*     stdlib_reimf( x, &xre, &xim );
+*     stdlib_reimf( y, &yre, &yim );
+*
+*     re = xre + yre;
+*     im = xim + yim;
 *
-* static float complex add( const float complex x, const float complex y ) {
-*     float re = crealf( x ) + crealf( y );
-*     float im = cimagf( x ) + cimagf( y );
-*     return re + im*I;
+*     return stdlib_complex64( re, im );
 * }
 *
 * // ...
@@ -211,12 +236,12 @@ napi_value stdlib_math_base_napi_ff_f( napi_env env, napi_callback_info info, fl
 /**
 * Invokes a binary function accepting and returning double-precision complex floating-point numbers.
 */
-napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, double complex (*fcn)( double complex, double complex ) );
+napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, stdlib_complex128_t (*fcn)( stdlib_complex128_t, stdlib_complex128_t ) );
 
 /**
 * Invokes a binary function accepting and returning single-precision complex floating-point numbers.
 */
-napi_value stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, float complex (*fcn)( float complex, float complex ) );
+napi_value stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, stdlib_complex64_t (*fcn)( stdlib_complex64_t, stdlib_complex64_t ) );
 
 #ifdef __cplusplus
 }

lib/node_modules/@stdlib/math/base/napi/binary/src/main.c

@@ -17,6 +17,10 @@
 */
 
 #include "stdlib/math/base/napi/binary.h"
+#include "stdlib/complex/float64.h"
+#include "stdlib/complex/float32.h"
+#include "stdlib/complex/reim.h"
+#include "stdlib/complex/reimf.h"
 #include <node_api.h>
 #include <stdint.h>
 #include <assert.h>
@@ -162,7 +166,7 @@ napi_value stdlib_math_base_napi_ff_f( napi_env env, napi_callback_info info, fl
 * @param fcn    binary function
 * @return       function return value as a Node-API complex-like object
 */
-napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, double complex (*fcn)( double complex, double complex ) ) {
+napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, stdlib_complex128_t (*fcn)( stdlib_complex128_t, stdlib_complex128_t ) ) {
 	napi_status status;
 
 	size_t argc = 2;
@@ -277,21 +281,24 @@ napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, do
 	status = napi_get_value_double( env, yim, &im1 );
 	assert( status == napi_ok );
 
-	double complex v = fcn( re0 + im0*I, re1 + im1*I );
+	stdlib_complex128_t v = fcn( stdlib_complex128( re0, im0 ), stdlib_complex128( re1, im1 ) );
+	double re;
+	double im;
+	stdlib_reim( v, &re, &im );
 
 	napi_value obj;
 	status = napi_create_object( env, &obj );
 	assert( status == napi_ok );
 
 	napi_value vre;
-	status = napi_create_double( env, creal( v ), &vre );
+	status = napi_create_double( env, re, &vre );
 	assert( status == napi_ok );
 
 	status = napi_set_named_property( env, obj, "re", vre );
 	assert( status == napi_ok );
 
 	napi_value vim;
-	status = napi_create_double( env, cimag( v ), &vim );
+	status = napi_create_double( env, im, &vim );
 	assert( status == napi_ok );
 
 	status = napi_set_named_property( env, obj, "im", vim );
@@ -315,7 +322,7 @@ napi_value stdlib_math_base_napi_zz_z( napi_env env, napi_callback_info info, do
 * @param fcn    binary function
 * @return       function return value as a Node-API complex-like object
 */
-napi_value stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, float complex (*fcn)( float complex, float complex ) ) {
+napi_value stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, stdlib_complex64_t (*fcn)( stdlib_complex64_t, stdlib_complex64_t ) ) {
 	napi_status status;
 
 	size_t argc = 2;
@@ -430,21 +437,24 @@ napi_value stdlib_math_base_napi_cc_c( napi_env env, napi_callback_info info, fl
 	status = napi_get_value_double( env, yim, &im1 );
 	assert( status == napi_ok );
 
-	float complex v = fcn( (float)re0 + (float)im0*I, (float)re1 + (float)im1*I );
+	stdlib_complex64_t v = fcn( stdlib_complex64( (float)re0, (float)im0 ), stdlib_complex64( (float)re1, (float)im1 ) );
+	float re;
+	float im;
+	stdlib_reimf( v, &re, &im );
 
 	napi_value obj;
 	status = napi_create_object( env, &obj );
 	assert( status == napi_ok );
 
 	napi_value vre;
-	status = napi_create_double( env, (double)crealf( v ), &vre );
+	status = napi_create_double( env, (double)re, &vre );
 	assert( status == napi_ok );
 
 	status = napi_set_named_property( env, obj, "re", vre );
 	assert( status == napi_ok );
 
 	napi_value vim;
-	status = napi_create_double( env, (double)cimagf( v ), &vim );
+	status = napi_create_double( env, (double)im, &vim );
 	assert( status == napi_ok );
 
 	status = napi_set_named_property( env, obj, "im", vim );