Changeset f80e0218 for src/libcfa/rational.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/libcfa/rational.c

@@ -11 +11 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 12 21:26:42 2016
-// Update Count     : 21
+// Last Modified On : Wed May  4 14:16:14 2016
+// Update Count     : 25
 // 
 
@@ -18 +18 @@
 #include "fstream"
 #include "stdlib"
+#include "math"                                                                                 // floor
 
 
@@ -52 +53 @@
 // constructors
 
-Rational rational() {
-    return (Rational){ 0, 1 };
+void ?{}( Rational * r ) {
+    r{ 0, 1 };
 } // rational
 
-Rational rational( long int n ) {
-    return (Rational){ n, 1 };
+void ?{}( Rational * r, long int n ) {
+    r{ n, 1 };
 } // rational
 
-Rational rational( long int n, long int d ) {
+void ?{}( Rational * r, long int n, long int d ) {
     long int t = simplify( &n, &d );                                    // simplify
-    return (Rational){ n / t, d / t };
+    r->numerator = n / t;
+        r->denominator = d / t;
 } // rational
 
@@ -171 +173 @@
 Rational narrow( double f, long int md ) {
         if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
-                Rational t = rational( f, 1 );                                  // truncate fraction
-                return t;
+                return (Rational){ f, 1};                                               // truncate fraction
         } // if
 
@@ -198 +199 @@
                 k[2] = x * k[1] + k[0]; k[0] = k[1]; k[1] = k[2];
         } // for
-        Rational t = rational( neg ? -h[1] : h[1], k[1] );
-        return t;
+        return (Rational){ neg ? -h[1] : h[1], k[1] };
 } // narrow