Changeset 4203f71 for src/tests/rational.c

Timestamp:

May 16, 2017, 10:47:34 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:

02153feb, 9c951e3

Parents:

fae2cf8 (diff), 22634b2 (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/tests/rational.c (modified) (3 diffs)

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 18:10:28 2017
-// Update Count     : 57
+// Last Modified On : Mon May 15 21:32:22 2017
+// Update Count     : 64
 // 
 
@@ -23 +23 @@
 void ?{}( int * this, zero_t ) { *this = 0; }
 void ?{}( int * this, one_t ) { *this = 1; }
+double convert( int i ) { return (double)i; }
+int convert( double d ) { return (int)d; }
 
 int main() {
@@ -57 +59 @@
         sout | a / b | endl;
 
-//      sout | "conversion" | endl;
-//      a = (Rational(int)){ 3, 4 };
-//      sout | widen( a ) | endl;
-//      a = (Rational(int)){ 1, 7 };
-//      sout | widen( a ) | endl;
-//      a = (Rational(int)){ 355, 113 };
-//      sout | widen( a ) | endl;
-//      sout | narrow( 0.75, 4 ) | endl;
-//      sout | narrow( 0.14285714285714, 16 ) | endl;
-//      sout | narrow( 3.14159265358979, 256 ) | endl;
+        sout | "conversion" | endl;
+        a = (Rational(int)){ 3, 4 };
+        sout | widen( a ) | endl;
+        a = (Rational(int)){ 1, 7 };
+        sout | widen( a ) | endl;
+        a = (Rational(int)){ 355, 113 };
+        sout | widen( a ) | endl;
+        sout | narrow( 0.75, 4 ) | endl;
+        sout | narrow( 0.14285714285714, 16 ) | endl;
+        sout | narrow( 3.14159265358979, 256 ) | endl;
 
         sout | "decompose" | endl;