Changes in tests/rational.cfa [f00b2c2c:0087e0e]

File:

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

tests/rational.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  8 18:46:23 2020
-// Update Count     : 86
+// Last Modified On : Wed Mar 27 07:37:17 2019
+// Update Count     : 80
 //
 
@@ -19 +19 @@
 #include <fstream.hfa>
 
-typedef Rational(int) RatInt;
-double convert( int i ) { return (double)i; }                   // used by narrow/widen
+double convert( int i ) { return (double)i; }
 int convert( double d ) { return (int)d; }
 
 int main() {
         sout | "constructor";
-        RatInt a = { 3 }, b = { 4 }, c, d = 0, e = 1;
-        sout | a | b | c | d | e;
+        Rational(int) a = { 3 }, b = { 4 }, c;
+        sout | a | b | c;
 
-        a = (RatInt){ 4, 8 };
-        b = (RatInt){ 5, 7 };
+        a = (Rational(int)){ 4, 8 };
+        b = (Rational(int)){ 5, 7 };
         sout | a | b;
-        a = (RatInt){ -2, -3 };
-        b = (RatInt){ 3, -2 };
+        a = (Rational(int)){ -2, -3 };
+        b = (Rational(int)){ 3, -2 };
         sout | a | b;
-        a = (RatInt){ -2, 3 };
-        b = (RatInt){ 3, 2 };
+        a = (Rational(int)){ -2, 3 };
+        b = (Rational(int)){ 3, 2 };
         sout | a | b;
 
         sout | "logical";
-        a = (RatInt){ -2 };
-        b = (RatInt){ -3, 2 };
+        a = (Rational(int)){ -2 };
+        b = (Rational(int)){ -3, 2 };
         sout | a | b;
 //      sout | a == 1; // FIX ME
@@ -59 +58 @@
 
         sout | "conversion";
-        a = (RatInt){ 3, 4 };
+        a = (Rational(int)){ 3, 4 };
         sout | widen( a );
-        a = (RatInt){ 1, 7 };
+        a = (Rational(int)){ 1, 7 };
         sout | widen( a );
-        a = (RatInt){ 355, 113 };
+        a = (Rational(int)){ 355, 113 };
         sout | widen( a );
         sout | narrow( 0.75, 4 );
@@ -75 +74 @@
 
         sout | "more tests";
-        RatInt x = { 1, 2 }, y = { 2 };
+        Rational(int) x = { 1, 2 }, y = { 2 };
         sout | x - y;
         sout | x > y;
@@ -81 +80 @@
         sout | y | denominator( y, -2 ) | y;
 
-        RatInt z = { 0, 5 };
+        Rational(int) z = { 0, 5 };
         sout | z;
 
         sout | x | numerator( x, 0 ) | x;
 
-        x = (RatInt){ 1, MAX } + (RatInt){ 1, MAX };
+        x = (Rational(int)){ 1, MAX } + (Rational(int)){ 1, MAX };
         sout | x;
-        x = (RatInt){ 3, MAX } + (RatInt){ 2, MAX };
+        x = (Rational(int)){ 3, MAX } + (Rational(int)){ 2, MAX };
         sout | x;