Stop using namespace types

1 files changed, 25 insertions, 55 deletions

diff --git a/builtins/nums.c b/builtins/nums.c
index 557e98c0..3f924ac3 100644
--- a/builtins/nums.c
+++ b/builtins/nums.c
@@ -46,41 +46,26 @@ public double Num64__mod(double num, double modulus) {
     return (result < 0) != (modulus < 0) ? result + modulus : result; 
 }
 
+public double Num64__nan(CORD tag) {
+    return nan(CORD_to_const_char_star(tag));
+}
+
 public bool Num64__isinf(double n) { return isinf(n); }
 public bool Num64__finite(double n) { return finite(n); }
 public bool Num64__isnan(double n) { return isnan(n); }
 
-public Num64_namespace_t Num64 = {
-    .type=(TypeInfo){
-        .size=sizeof(double),
-        .align=__alignof__(double),
-        .tag=CustomInfo,
-        .CustomInfo={
-            .compare=(void*)Num64__compare,
-            .equal=(void*)Num64__equal,
-            .as_str=(void*)Num64__as_str,
-        },
+public TypeInfo Num64 = {
+    .size=sizeof(double),
+    .align=__alignof__(double),
+    .tag=CustomInfo,
+    .CustomInfo={
+        .compare=(void*)Num64__compare,
+        .equal=(void*)Num64__equal,
+        .as_str=(void*)Num64__as_str,
     },
-    .NaN=NAN, ._2_sqrt_pi=M_2_SQRTPI, .e=M_E, .half_pi=M_PI_2, .inf=1./0., .inverse_half_pi=M_2_PI,
-    .inverse_pi=M_1_PI, .ln10=M_LN10, .ln2=M_LN2, .log2e=M_LOG2E, .pi=M_PI, .quarter_pi=M_PI_4,
-    .sqrt2=M_SQRT2, .sqrt_half=M_SQRT1_2, .tau=2.*M_PI,
-    .random=drand48,
-    .finite=Num64__finite,
-    .isinf=Num64__isinf,
-    .isnan=Num64__isnan,
-    .atan2=atan2, .copysign=copysign, .dist=fdim, .hypot=hypot, .maxmag=fmaxmag, .minmag=fminmag,
-    .mod=Num64__mod, .nextafter=nextafter, .pow=pow, .remainder=remainder,
-    .abs=fabs, .acos=acos, .acosh=acosh, .asin=asin, .asinh=asinh, .atan=atan, .atanh=atanh,
-    .cbrt=cbrt, .ceil=ceil, .cos=cos, .cosh=cosh, .erf=erf, .erfc=erfc, .exp=exp,
-    .exp10=exp10, .exp2=exp2, .expm1=expm1, .floor=floor, .j0=j0, .j1=j1, .log=log,
-    .log10=log10, .log1p=log1p, .log2=log2, .logb=logb, .nextdown=nextdown, .nextup=nextup,
-    .rint=rint, .round=round, .roundeven=roundeven, .significand=significand, .sin=sin,
-    .sinh=sinh, .sqrt=sqrt, .tan=tan, .tanh=tanh, .tgamma=tgamma, .trunc=trunc, .y0=y0, .y1=y1,
-    .format=Num64__format,
-    .scientific=Num64__scientific,
 };
 
-public CORD Num32__as_str(float *f, bool colorize, const TypeInfo *type) { 
+public CORD Num32__as_str(const float *f, bool colorize, const TypeInfo *type) { 
     (void)type;
     if (!f) return "Num32";
     CORD c;
@@ -116,38 +101,23 @@ public float Num32__random(void) {
     return (float)drand48(); 
 }
 
+public float Num32__nan(CORD tag) {
+    return nanf(CORD_to_const_char_star(tag));
+}
+
 public bool Num32__isinf(float n) { return isinf(n); }
 public bool Num32__finite(float n) { return finite(n); }
 public bool Num32__isnan(float n) { return isnan(n); }
 
-public Num32_namespace_t Num32 = {
-    .type=(TypeInfo){
-        .size=sizeof(float),
-        .align=__alignof__(float),
-        .tag=CustomInfo,
-        .CustomInfo={
-            .compare=(void*)Num32__compare,
-            .equal=(void*)Num32__equal,
-            .as_str=(void*)Num32__as_str,
-        },
+public TypeInfo Num32 = {
+    .size=sizeof(float),
+    .align=__alignof__(float),
+    .tag=CustomInfo,
+    .CustomInfo={
+        .compare=(void*)Num32__compare,
+        .equal=(void*)Num32__equal,
+        .as_str=(void*)Num32__as_str,
     },
-    .NaN=NAN, ._2_sqrt_pi=M_2_SQRTPI, .e=M_E, .half_pi=M_PI_2, .inf=1./0., .inverse_half_pi=M_2_PI,
-    .inverse_pi=M_1_PI, .ln10=M_LN10, .ln2=M_LN2, .log2e=M_LOG2E, .pi=M_PI, .quarter_pi=M_PI_4,
-    .sqrt2=M_SQRT2, .sqrt_half=M_SQRT1_2, .tau=2.*M_PI,
-    .random=Num32__random,
-    .finite=Num32__finite,
-    .isinf=Num32__isinf,
-    .isnan=Num32__isnan,
-    .atan2=atan2f, .copysign=copysignf, .dist=fdimf, .hypot=hypotf, .maxmag=fmaxmagf, .minmag=fminmagf,
-    .mod=Num32__mod, .nextafter=nextafterf, .pow=powf, .remainder=remainderf,
-    .abs=fabsf, .acos=acosf, .acosh=acoshf, .asin=asinf, .asinh=asinhf, .atan=atanf, .atanh=atanhf,
-    .cbrt=cbrtf, .ceil=ceilf, .cos=cosf, .cosh=coshf, .erf=erff, .erfc=erfcf, .exp=expf,
-    .exp10=exp10f, .exp2=exp2f, .expm1=expm1f, .floor=floorf, .j0=j0f, .j1=j1f, .log=logf,
-    .log10=log10f, .log1p=log1pf, .log2=log2f, .logb=logbf, .nextdown=nextdownf, .nextup=nextupf,
-    .rint=rintf, .round=roundf, .roundeven=roundevenf, .significand=significandf, .sin=sinf,
-    .sinh=sinhf, .sqrt=sqrtf, .tan=tanf, .tanh=tanhf, .tgamma=tgammaf, .trunc=truncf, .y0=y0f, .y1=y1f,
-    .format=Num32__format,
-    .scientific=Num32__scientific,
 };
 
 // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0