Changeset d36c117 for src/tests

Timestamp:

May 15, 2017, 12:04:49 PM (9 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:

9c951e3

Parents:

ce8c12f (diff), fae2cf8 (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 references

Location:

src/tests

Files:

• .expect/concurrent/sched-int-wait.txt (modified) (1 diff)
• .expect/gmp.txt (added)
• .expect/rational.txt (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• gmp.c (added)
• rational.c (modified) (3 diffs)
• sched-int-wait.c (modified) (2 diffs)

src/tests/.expect/concurrent/sched-int-wait.txt

@@ +1 @@
+Starting
+Done

src/tests/.expect/rational.txt

@@ -17 +17 @@
 3/1
 4/3
-conversion
-0.75
-0.142857142857143
-3.14159292035398
-3/4
-1/7
-355/113
 decompose
 more tests

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Feb 16 15:27:50 2017
-## Update Count     : 41
+## Last Modified On : Sun May 14 14:43:48 2017
+## Update Count     : 42
 ###############################################################################
 
@@ -90 +90 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
+gmp : gmp.c
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
+
 memberCtors-ERR1: memberCtors.c
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -709 +709 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
+gmp : gmp.c
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
+
 memberCtors-ERR1: memberCtors.c
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May  2 22:11:05 2017
-// Update Count     : 41
+// Last Modified On : Sun May 14 18:10:28 2017
+// Update Count     : 57
 // 
 
+#include <rational>
 #include <limits>
-#include <rational>
+#include <stdlib>
 #include <fstream>
+
+// UNNECESSARY, FIX ME
+void ?{}( int * this ) { *this = 0; }
+void ?{}( int * this, zero_t ) { *this = 0; }
+void ?{}( int * this, one_t ) { *this = 1; }
 
 int main() {
         sout | "constructor" | endl;
-        Rational a = { 3 }, b = { 4 }, c;
+        Rational(int) a = { 3 }, b = { 4 }, c;
         sout | a | b | c | endl;
-        a = (Rational){ 4, 8 };
-        b = (Rational){ 5, 7 };
+
+        a = (Rational(int)){ 4, 8 };
+        b = (Rational(int)){ 5, 7 };
         sout | a | b | endl;
-        a = (Rational){ -2, -3 };
-        b = (Rational){ 3, -2 };
+        a = (Rational(int)){ -2, -3 };
+        b = (Rational(int)){ 3, -2 };
         sout | a | b | endl;
-        a = (Rational){ -2, 3 };
-        b = (Rational){ 3, 2 };
+        a = (Rational(int)){ -2, 3 };
+        b = (Rational(int)){ 3, 2 };
         sout | a | b | endl;
 
         sout | "logical" | endl;
-        a = (Rational){ -2 };
-        b = (Rational){ -3, 2 };
+        a = (Rational(int)){ -2 };
+        b = (Rational(int)){ -3, 2 };
         sout | a | b | endl;
 //      sout | a == 1 | endl; // FIX ME
@@ -50 +57 @@
         sout | a / b | endl;
 
-        sout | "conversion" | endl;
-        a = (Rational){ 3, 4 };
-        sout | widen( a ) | endl;
-        a = (Rational){ 1, 7 };
-        sout | widen( a ) | endl;
-        a = (Rational){ 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;
-        RationalImpl n, d;
+        int n, d;
 //      [n, d] = a;
 //      sout | a | n | d | endl;
 
         sout | "more tests" | endl;
-        Rational x = { 1, 2 }, y = { 2 };
+        Rational(int) x = { 1, 2 }, y = { 2 };
         sout | x - y | endl;
         sout | x > y | endl;
@@ -73 +80 @@
         sout | y | denominator( y, -2 ) | y | endl;
 
-        Rational z = { 0, 5 };
+        Rational(int) z = { 0, 5 };
         sout | z | endl;
 
         sout | x | numerator( x, 0 ) | x | endl;
 
-        x = (Rational){ 1, MAX } + (Rational){ 1, MAX };
+        x = (Rational(int)){ 1, MAX } + (Rational(int)){ 1, MAX };
         sout | x | endl;
-        x = (Rational){ 3, MAX } + (Rational){ 2, MAX };
+        x = (Rational(int)){ 3, MAX } + (Rational(int)){ 2, MAX };
         sout | x | endl;
 

src/tests/sched-int-wait.c

@@ -113 +113 @@
         waiter_left = 4;
         processor p;
+        sout | "Starting" | endl;
         {
                 Signaler  e;
@@ -122 +123 @@
                 }
         }
+        sout | "Done" | endl;
 }