Changes in tests/rational.cfa [d30804a:541dbc09]

File:

• tests/rational.cfa (modified) (6 diffs)

tests/rational.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 20 18:13:40 2021
-// Update Count     : 107
+// Last Modified On : Mon Jun  5 22:58:09 2023
+// Update Count     : 108
 //
 
@@ -19 +19 @@
 #include <fstream.hfa>
 
-typedef Rational(int) RatInt;
+typedef rational(int) rat_int;
 double convert( int i ) { return (double)i; }                   // used by narrow/widen
 int convert( double d ) { return (int)d; }
@@ -25 +25 @@
 int main() {
         sout | "constructor";
-        RatInt a = { 3 }, b = { 4 }, c, d = 0, e = 1;
+        rat_int a = { 3 }, b = { 4 }, c, d = 0, e = 1;
         sout | "a : " | a | "b : " | b | "c : " | c | "d : " | d | "e : " | e;
 
-        a = (RatInt){ 4, 8 };
-        b = (RatInt){ 5, 7 };
+        a = (rat_int){ 4, 8 };
+        b = (rat_int){ 5, 7 };
         sout | "a : " | a | "b : " | b;
-        a = (RatInt){ -2, -3 };
-        b = (RatInt){ 3, -2 };
+        a = (rat_int){ -2, -3 };
+        b = (rat_int){ 3, -2 };
         sout | "a : " | a | "b : " | b;
-        a = (RatInt){ -2, 3 };
-        b = (RatInt){ 3, 2 };
+        a = (rat_int){ -2, 3 };
+        b = (rat_int){ 3, 2 };
         sout | "a : " | a | "b : " | b;
         sout | nl;
 
         sout | "comparison";
-        a = (RatInt){ -2 };
-        b = (RatInt){ -3, 2 };
+        a = (rat_int){ -2 };
+        b = (rat_int){ -3, 2 };
         sout | "a : " | a | "b : " | b;
-        sout | "a == 0 : " | a == (Rational(int)){0}; // FIX ME
-        sout | "a == 1 : " | a == (Rational(int)){1}; // FIX ME
+        sout | "a == 0 : " | a == (rational(int)){0}; // FIX ME
+        sout | "a == 1 : " | a == (rational(int)){1}; // FIX ME
         sout | "a != 0 : " | a != 0;
         sout | "! a : " | ! a;
@@ -73 +73 @@
 
         sout | "conversion";
-        a = (RatInt){ 3, 4 };
+        a = (rat_int){ 3, 4 };
         sout | widen( a );
-        a = (RatInt){ 1, 7 };
+        a = (rat_int){ 1, 7 };
         sout | widen( a );
-        a = (RatInt){ 355, 113 };
+        a = (rat_int){ 355, 113 };
         sout | widen( a );
         sout | narrow( 0.75, 4 );
@@ -90 +90 @@
 
         sout | "more tests";
-        RatInt x = { 1, 2 }, y = { 2 };
+        rat_int x = { 1, 2 }, y = { 2 };
         sout | x - y;
         sout | x > y;
@@ -96 +96 @@
         sout | y | denominator( y, -2 ) | y;
 
-        RatInt z = { 0, 5 };
+        rat_int z = { 0, 5 };
         sout | z;
 
         sout | x | numerator( x, 0 ) | x;
 
-        x = (RatInt){ 1, MAX } + (RatInt){ 1, MAX };
+        x = (rat_int){ 1, MAX } + (rat_int){ 1, MAX };
         sout | x;
-        x = (RatInt){ 3, MAX } + (RatInt){ 2, MAX };
+        x = (rat_int){ 3, MAX } + (rat_int){ 2, MAX };
         sout | x;