Changeset 933f32f for libcfa/src/rational.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• libcfa/src/rational.cfa (modified) (9 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 : Sun Dec 23 22:56:49 2018
-// Update Count     : 170
+// Last Modified On : Thu Mar 28 17:33:03 2019
+// Update Count     : 181
 //
 
@@ -35 +35 @@
         static RationalImpl simplify( RationalImpl & n, RationalImpl & d ) {
                 if ( d == (RationalImpl){0} ) {
-                        serr | "Invalid rational number construction: denominator cannot be equal to 0.";
-                        exit( EXIT_FAILURE );
+                        abort( "Invalid rational number construction: denominator cannot be equal to 0.\n" );
                 } // exit
                 if ( d < (RationalImpl){0} ) { d = -d; n = -n; } // move sign to numerator
@@ -54 +53 @@
         void ?{}( Rational(RationalImpl) & r, RationalImpl n, RationalImpl d ) {
                 RationalImpl t = simplify( n, d );                              // simplify
-                r.numerator = n / t;
-                r.denominator = d / t;
+                r.[numerator, denominator] = [n / t, d / t];
         } // rational
 
@@ -78 +76 @@
                 RationalImpl prev = r.numerator;
                 RationalImpl t = gcd( abs( n ), r.denominator ); // simplify
-                r.numerator = n / t;
-                r.denominator = r.denominator / t;
+                r.[numerator, denominator] = [n / t, r.denominator / t];
                 return prev;
         } // numerator
@@ -86 +83 @@
                 RationalImpl prev = r.denominator;
                 RationalImpl t = simplify( r.numerator, d );    // simplify
-                r.numerator = r.numerator / t;
-                r.denominator = d / t;
+                r.[numerator, denominator] = [r.numerator / t, d / t];
                 return prev;
         } // denominator
@@ -120 +116 @@
 
         Rational(RationalImpl) +?( Rational(RationalImpl) r ) {
-                Rational(RationalImpl) t = { r.numerator, r.denominator };
-                return t;
+                return (Rational(RationalImpl)){ r.numerator, r.denominator };
         } // +?
 
         Rational(RationalImpl) -?( Rational(RationalImpl) r ) {
-                Rational(RationalImpl) t = { -r.numerator, r.denominator };
-                return t;
+                return (Rational(RationalImpl)){ -r.numerator, r.denominator };
         } // -?
 
         Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
                 if ( l.denominator == r.denominator ) {                 // special case
-                        Rational(RationalImpl) t = { l.numerator + r.numerator, l.denominator };
-                        return t;
+                        return (Rational(RationalImpl)){ l.numerator + r.numerator, l.denominator };
                 } else {
-                        Rational(RationalImpl) t = { l.numerator * r.denominator + l.denominator * r.numerator, l.denominator * r.denominator };
-                        return t;
+                        return (Rational(RationalImpl)){ l.numerator * r.denominator + l.denominator * r.numerator, l.denominator * r.denominator };
                 } // if
         } // ?+?
@@ -141 +133 @@
         Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
                 if ( l.denominator == r.denominator ) {                 // special case
-                        Rational(RationalImpl) t = { l.numerator - r.numerator, l.denominator };
-                        return t;
+                        return (Rational(RationalImpl)){ l.numerator - r.numerator, l.denominator };
                 } else {
-                        Rational(RationalImpl) t = { l.numerator * r.denominator - l.denominator * r.numerator, l.denominator * r.denominator };
-                        return t;
+                        return (Rational(RationalImpl)){ l.numerator * r.denominator - l.denominator * r.numerator, l.denominator * r.denominator };
                 } // if
         } // ?-?
 
         Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
-                Rational(RationalImpl) t = { l.numerator * r.numerator, l.denominator * r.denominator };
-                return t;
+                return (Rational(RationalImpl)){ l.numerator * r.numerator, l.denominator * r.denominator };
         } // ?*?
 
         Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
                 if ( r.numerator < (RationalImpl){0} ) {
-                        r.numerator = -r.numerator;
-                        r.denominator = -r.denominator;
+                        r.[numerator, denominator] = [-r.numerator, -r.denominator];
                 } // if
-                Rational(RationalImpl) t = { l.numerator * r.denominator, l.denominator * r.numerator };
-                return t;
+                return (Rational(RationalImpl)){ l.numerator * r.denominator, l.denominator * r.numerator };
         } // ?/?
 
@@ -167 +154 @@
         forall( dtype istype | istream( istype ) | { istype & ?|?( istype &, RationalImpl & ); } )
         istype & ?|?( istype & is, Rational(RationalImpl) & r ) {
-                RationalImpl t;
                 is | r.numerator | r.denominator;
-                t = simplify( r.numerator, r.denominator );
+                RationalImpl t = simplify( r.numerator, r.denominator );
                 r.numerator /= t;
                 r.denominator /= t;
@@ -185 +171 @@
         } // distribution
 } // distribution
+
+forall( otype RationalImpl | arithmetic( RationalImpl ) | { RationalImpl ?\?( RationalImpl, unsigned long ); } )
+Rational(RationalImpl) ?\?( Rational(RationalImpl) x, long int y ) {
+        if ( y < 0 ) {
+                return (Rational(RationalImpl)){ x.denominator \ -y, x.numerator \ -y };
+        } else {
+                return (Rational(RationalImpl)){ x.numerator \ y, x.denominator \ y };
+        } // if
+}
 
 // conversion