Changeset f00b2c2c

Timestamp:

Feb 9, 2020, 8:56:01 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d231700

Parents:

8c9da33

Message:

defined rational constructor from 0 [fixes #117]

Files:

• libcfa/src/rational.cfa (modified) (2 diffs)
• tests/.expect/rational.txt (modified) (1 diff)
• tests/rational.cfa (modified) (5 diffs)

libcfa/src/rational.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 18:12:08 2019
-// Update Count     : 184
+// Last Modified On : Sat Feb  8 17:56:36 2020
+// Update Count     : 187
 //
 
@@ -56 +56 @@
         } // rational
 
+        void ?{}( Rational(RationalImpl) & r, zero_t ) {
+                r{ (RationalImpl){0}, (RationalImpl){1} };
+        } // rational
+
+        void ?{}( Rational(RationalImpl) & r, one_t ) {
+                r{ (RationalImpl){1}, (RationalImpl){1} };
+        } // rational
 
         // getter for numerator/denominator

tests/.expect/rational.txt

@@ -1 +1 @@
 constructor
-3/1 4/1 0/1
+3/1 4/1 0/1 0/1 1/1
 1/2 5/7
 2/3 -3/2

tests/rational.cfa

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