From 8f1c86f5504de4f6216f23891f62cacb53fcfa15 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sun, 5 Jun 2022 14:20:08 +0200 Subject: [PATCH] fixed several old test files --- compiler/test/arithmetic/aggregates.p8 | 36 ---- compiler/test/arithmetic/builtins.p8 | 237 +------------------------ compiler/test/arithmetic/div.p8 | 2 +- compiler/test/arithmetic/minus.p8 | 2 +- compiler/test/arithmetic/mult.p8 | 2 +- compiler/test/arithmetic/plus.p8 | 2 +- 6 files changed, 9 insertions(+), 272 deletions(-) diff --git a/compiler/test/arithmetic/aggregates.p8 b/compiler/test/arithmetic/aggregates.p8 index a7afc5089..13a085a02 100644 --- a/compiler/test/arithmetic/aggregates.p8 +++ b/compiler/test/arithmetic/aggregates.p8 @@ -29,42 +29,6 @@ main { length=string.length(name) if length!=3 txt.print("error strlen2\n") - ; MAX - ub = max(ubarr) - if ub!=199 txt.print("error max1\n") - bb = max(barr) - if bb!=99 txt.print("error max2\n") - uw = max(uwarr) - if uw!=4444 txt.print("error max3\n") - ww = max(warr) - if ww!=999 txt.print("error max4\n") - ff = max(farr) - if ff!=999.9 txt.print("error max5\n") - - ; MIN - ub = min(ubarr) - if ub!=0 txt.print("error min1\n") - bb = min(barr) - if bb!=-122 txt.print("error min2\n") - uw = min(uwarr) - if uw!=0 txt.print("error min3\n") - ww = min(warr) - if ww!=-4444 txt.print("error min4\n") - ff = min(farr) - if ff!=-4444.4 txt.print("error min5\n") - - ; SUM - uw = sum(ubarr) - if uw!=420 txt.print("error sum1\n") - ww = sum(barr) - if ww!=-101 txt.print("error sum2\n") - uw = sum(uwarr) - if uw!=6665 txt.print("error sum3\n") - ww = sum(warr) - if ww!=-4223 txt.print("error sum4\n") - ff = sum(farr) - if ff!=-4222.4 txt.print("error sum5\n") - ; ANY ub = any(ubarr) if ub==0 txt.print("error any1\n") diff --git a/compiler/test/arithmetic/builtins.p8 b/compiler/test/arithmetic/builtins.p8 index b7dd85875..5dcb54bf7 100644 --- a/compiler/test/arithmetic/builtins.p8 +++ b/compiler/test/arithmetic/builtins.p8 @@ -339,79 +339,23 @@ main { txt.nl() bb = -100 - bb = abs(bb) + bb = abs(bb) as byte txt.print_b(bb) txt.nl() bb = -100 - bb = zero+abs(bb)*1+zero + bb = zero+(abs(bb) as byte)*1+zero txt.print_b(bb) txt.nl() ww = -1000 - ww = abs(ww) + ww = abs(ww) as word txt.print_w(ww) txt.nl() ww = -1000 - ww = zero+abs(ww)*1+zero + ww = zero+(abs(ww) as word)*1+zero txt.print_w(ww) txt.nl() - - ub = min(ubarr) - txt.print_ub(ub) - txt.nl() - ub = zero+min(ubarr)*1+zero - txt.print_ub(ub) - txt.nl() - - bb = min(barr) - txt.print_b(bb) - txt.nl() - bb = zero+min(barr)*1+zero - txt.print_b(bb) - txt.nl() - - uw = min(uwarr) - txt.print_uw(uw) - txt.nl() - uw = zero+min(uwarr)*1+zero - txt.print_uw(uw) - txt.nl() - - ww = min(warr) - txt.print_w(ww) - txt.nl() - ww = zero+min(warr)*1+zero - txt.print_w(ww) - txt.nl() - - ub = max(ubarr) - txt.print_ub(ub) - txt.nl() - ub = zero+max(ubarr)*1+zero - txt.print_ub(ub) - txt.nl() - - bb = max(barr) - txt.print_b(bb) - txt.nl() - bb = zero+max(barr)*1+zero - txt.print_b(bb) - txt.nl() - - uw = max(uwarr) - txt.print_uw(uw) - txt.nl() - uw = zero+max(uwarr)*1+zero - txt.print_uw(uw) - txt.nl() - - ww = max(warr) - txt.print_w(ww) - txt.nl() - ww = zero+max(warr)*1+zero - txt.print_w(ww) - txt.nl() - + ub = any(ubarr) txt.print_ub(ub) txt.nl() @@ -468,35 +412,6 @@ main { txt.print_ub(ub) txt.nl() - - uw = sum(ubarr) - txt.print_uw(uw) - txt.nl() - uw = zero+sum(ubarr)*1+zero - txt.print_uw(uw) - txt.nl() - - ww = sum(barr) - txt.print_w(ww) - txt.nl() - ww = zero+sum(barr)*1+zero - txt.print_w(ww) - txt.nl() - - uw = sum(uwarr) - txt.print_uw(uw) - txt.nl() - uw = zero+sum(uwarr)*1+zero - txt.print_uw(uw) - txt.nl() - - ww = sum(warr) - txt.print_w(ww) - txt.nl() - ww = zero+sum(warr)*1+zero - txt.print_w(ww) - txt.nl() - sort(ubarr) sort(barr) sort(uwarr) @@ -520,114 +435,6 @@ main { float fl float fzero=0.0 - fl = -9.9 - fl = abs(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+abs(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 9.9 - fl = atan(fl) - floats.print_f(fl) - txt.nl() - fl = 9.9 - fl = fzero+atan(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = -9.9 - fl = ceil(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+ceil(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = -9.9 - fl = cos(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+cos(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = -9.9 - fl = sin(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+sin(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 9.9 - fl = tan(fl) - floats.print_f(fl) - txt.nl() - fl = 9.9 - fl = fzero+tan(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 3.1415927 - fl = deg(fl) - floats.print_f(fl) - txt.nl() - fl = 3.1415927 - fl = fzero+deg(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 90 - fl = rad(fl) - floats.print_f(fl) - txt.nl() - fl = 90 - fl = fzero+rad(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = -9.9 - fl = floor(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+floor(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 3.1415927 - fl = ln(fl) - floats.print_f(fl) - txt.nl() - fl = 3.1415927 - fl = fzero+ln(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = 3.1415927 - fl = log2(fl) - floats.print_f(fl) - txt.nl() - fl = 3.1415927 - fl = fzero+log2(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = -9.9 - fl = round(fl) - floats.print_f(fl) - txt.nl() - fl = -9.9 - fl = fzero+round(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - fl = -9.9 bb = sgn(fl) txt.print_b(bb) @@ -637,22 +444,6 @@ main { txt.print_b(bb) txt.nl() - fl = 3.1415927 - fl = sqrt(fl) - floats.print_f(fl) - txt.nl() - fl = 3.1415927 - fl = fzero+sqrt(fl)*1.0+fzero - floats.print_f(fl) - txt.nl() - - fl = rndf() - floats.print_f(fl) - txt.nl() - fl = fzero+rndf()*1.0+fzero - floats.print_f(fl) - txt.nl() - swap(fl, fzero) swap(fzero, fl) @@ -675,24 +466,6 @@ main { txt.chrout(',') } txt.nl() - fl = max(flarr) - floats.print_f(fl) - txt.nl() - fl = fzero+max(flarr)*1.0+fzero - floats.print_f(fl) - txt.nl() - fl = min(flarr) - floats.print_f(fl) - txt.nl() - fl = fzero+min(flarr)*1.0+fzero - floats.print_f(fl) - txt.nl() - fl = sum(flarr) - floats.print_f(fl) - txt.nl() - fl = fzero+sum(flarr)*1.0+fzero - floats.print_f(fl) - txt.nl() test_stack.test() } diff --git a/compiler/test/arithmetic/div.p8 b/compiler/test/arithmetic/div.p8 index 28573758f..00672e782 100644 --- a/compiler/test/arithmetic/div.p8 +++ b/compiler/test/arithmetic/div.p8 @@ -87,7 +87,7 @@ main { sub div_float(float a1, float a2, float c) { float r = a1/a2 - if abs(r-c)<0.00001 + if floats.fabs(r-c)<0.00001 txt.print(" ok ") else txt.print("err! ") diff --git a/compiler/test/arithmetic/minus.p8 b/compiler/test/arithmetic/minus.p8 index 8ca1d7f8a..99a0b2fb7 100644 --- a/compiler/test/arithmetic/minus.p8 +++ b/compiler/test/arithmetic/minus.p8 @@ -98,7 +98,7 @@ main { sub minus_float(float a1, float a2, float c) { float r = a1-a2 - if abs(r-c)<0.00001 + if floats.fabs(r-c)<0.00001 txt.print(" ok ") else { txt.print("err! ") diff --git a/compiler/test/arithmetic/mult.p8 b/compiler/test/arithmetic/mult.p8 index d12c07e1a..615cb3f07 100644 --- a/compiler/test/arithmetic/mult.p8 +++ b/compiler/test/arithmetic/mult.p8 @@ -89,7 +89,7 @@ main { sub mul_float(float a1, float a2, float c) { float r = a1*a2 - if abs(r-c)<0.00001 + if floats.fabs(r-c)<0.00001 txt.print(" ok ") else txt.print("err! ") diff --git a/compiler/test/arithmetic/plus.p8 b/compiler/test/arithmetic/plus.p8 index d7a6788de..103eb0c47 100644 --- a/compiler/test/arithmetic/plus.p8 +++ b/compiler/test/arithmetic/plus.p8 @@ -93,7 +93,7 @@ main { sub plus_float(float a1, float a2, float c) { float r = a1+a2 - if abs(r-c)<0.00001 + if floats.fabs(r-c)<0.00001 txt.print(" ok ") else txt.print("err! ")