Changeset f676b84 for src/libcfa/rational.c

Timestamp:

Aug 25, 2017, 10:47:42 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

19a9822, 6b224a52, f22b7aef

Parents:

ddf8a29 (diff), 3eab308c (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/rational.c

@@ -10 +10 @@
 // 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
 //
 
@@ -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
 
@@ -58 +58 @@
 forall( otype RationalImpl | arithmetic( RationalImpl ) )
 void ?{}( Rational(RationalImpl) & r, RationalImpl n, RationalImpl d ) {
-        RationalImpl t = simplify( &n, &d );                            // simplify
+        RationalImpl t = simplify( n, d );                                      // simplify
         r.numerator = n / t;
         r.denominator = d / t;
@@ -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;
 } // ?|?