mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-11 07:20:29 -07:00
Code Issues Projects Releases Packages Wiki Activity

complex-float: use CMPLX for constructing complex floats

Browse source 
Works better for edge cases such as x + I*∞, which otherwise would
lead to a complex with NaN real part.
This commit is contained in:
Marius Gerbershagen 2019-08-14 20:41:39 +02:00
parent 327da031cd
commit 57db4c813c
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/c/number.d
View file

@ -539,9 +539,9 @@ ecl_make_complex(cl_object r, cl_object i)
if (!ECL_REAL_TYPE_P(ti)) { ecl_type_error(@'complex', "imaginary part", i, @'real'); }
switch((tr > ti) ? tr : ti) {
#ifdef ECL_COMPLEX_FLOAT
case t_longfloat: return ecl_make_clfloat(ecl_to_long_double(r) + I * ecl_to_long_double(i));
case t_doublefloat: return ecl_make_cdfloat(ecl_to_double(r) + I * ecl_to_double(i));
case t_singlefloat: return ecl_make_csfloat(ecl_to_float(r) + I * ecl_to_float(i));
case t_longfloat: return ecl_make_clfloat(CMPLXL(ecl_to_long_double(r), ecl_to_long_double(i)));
case t_doublefloat: return ecl_make_cdfloat(CMPLX(ecl_to_double(r), ecl_to_double(i)));
case t_singlefloat: return ecl_make_csfloat(CMPLXF(ecl_to_float(r), ecl_to_float(i)));
#else
case t_singlefloat:
c = ecl_alloc_object(t_complex);
@ -599,17 +599,17 @@ ecl_make_complex_float(cl_object r, cl_object i)
case t_singlefloat:
if (ti != tr) { ecl_type_error(@'si::complex-float',"imag part", i, @'single-float'); }
result = ecl_alloc_object(t_csfloat);
ecl_csfloat(result) = ecl_single_float(r) + ecl_single_float(i) * I;
ecl_csfloat(result) = CMPLXF(ecl_single_float(r), ecl_single_float(i));
break;
case t_doublefloat:
if (ti != tr) { ecl_type_error(@'si::complex-float',"imag part", i, @'double-float'); }
result = ecl_alloc_object(t_cdfloat);
ecl_cdfloat(result) = ecl_double_float(r) + ecl_double_float(i) * I;
ecl_cdfloat(result) = CMPLX(ecl_double_float(r), ecl_double_float(i));
break;
case t_longfloat:
if (ti != tr) { ecl_type_error(@'si::complex-float',"imag part", i, @'long-float'); }
result = ecl_alloc_object(t_clfloat);
ecl_clfloat(result) = ecl_long_float(r) + ecl_long_float(i) * I;
ecl_clfloat(result) = CMPLXL(ecl_long_float(r), ecl_long_float(i));
break;
default:
ecl_type_error(@'si::complex-float',"real part", r, @'float');

9
src/h/internal.h
View file

@ -679,6 +679,15 @@ static union {
#ifdef ECL_COMPLEX_FLOAT
#include <complex.h>
#ifndef CMPLXF
# define CMPLXF(x, y) ((float complex)((float)(x) + I * (float)(y)))
#endif
#ifndef CMPLX
# define CMPLX(x, y) ((double complex)((double)(x) + I * (double)(y)))
#endif
#ifndef CMPLXL
# define CMPLXL(x, y) ((long double complex)((long double)(x) + I * (long double)(y)))
#endif
#endif
#ifdef __cplusplus