Changes in src/libcfa/rational.c [53a6c2a:7bc4e6b]

File:

• src/libcfa/rational.c (modified) (6 diffs)

src/libcfa/rational.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// rational.c -- 
-// 
+//
+// rational.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 16 18:35:36 2017
-// Update Count     : 150
-// 
+// Last Modified On : Wed Aug 23 22:38:48 2017
+// Update Count     : 154
+//
 
 #include "rational"
@@ -34 +34 @@
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-static RationalImpl simplify( RationalImpl * n, RationalImpl * d ) {
-        if ( *d == (RationalImpl){0} ) {
+static RationalImpl simplify( RationalImpl & n, RationalImpl & d ) {
+        if ( d == (RationalImpl){0} ) {
                 serr | "Invalid rational number construction: denominator cannot be equal to 0." | endl;
                 exit( EXIT_FAILURE );
         } // exit
-        if ( *d < (RationalImpl){0} ) { *d = -*d; *n = -*n; } // move sign to numerator
-        return gcd( abs( *n ), *d );                                            // simplify
+        if ( d < (RationalImpl){0} ) { d = -d; n = -n; }        // move sign to numerator
+        return gcd( abs( n ), d );                                                      // simplify
 } // Rationalnumber::simplify
 
@@ -47 +47 @@
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r ) {
+void ?{}( Rational(RationalImpl) & r ) {
         r{ (RationalImpl){0}, (RationalImpl){1} };
 } // rational
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, RationalImpl n ) {
+void ?{}( Rational(RationalImpl) & r, RationalImpl n ) {
         r{ n, (RationalImpl){1} };
 } // rational
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d ) {
-        RationalImpl t = simplify( &n, &d );                            // simplify
-        r->numerator = n / t;
-        r->denominator = d / t;
+void ?{}( Rational(RationalImpl) & r, RationalImpl n, RationalImpl d ) {
+        RationalImpl t = simplify( n, d );                                      // simplify
+        r.numerator = n / t;
+        r.denominator = d / t;
 } // rational
 
@@ -77 +77 @@
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src ) {
-        return *dest = src.[ numerator, denominator ];
+[ RationalImpl, RationalImpl ] ?=?( & [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src ) {
+        return dest = src.[ numerator, denominator ];
 }
 
@@ -95 +95 @@
 RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d ) {
         RationalImpl prev = r.denominator;
-        RationalImpl t = simplify( &r.numerator, &d );                  // simplify
+        RationalImpl t = simplify( r.numerator, d );                    // simplify
         r.numerator = r.numerator / t;
         r.denominator = d / t;
@@ -228 +228 @@
 
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
-forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
-istype * ?|?( istype * is, Rational(RationalImpl) * r ) {
+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) );
-        r->numerator /= t;
-        r->denominator /= t;
+        is | r.numerator | r.denominator;
+        t = simplify( r.numerator, r.denominator );
+        r.numerator /= t;
+        r.denominator /= t;
         return is;
 } // ?|?