Changeset eb182b0 for src/tests

Timestamp:

May 23, 2017, 9:55:37 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

27dde72

Parents:

547e9b7 (diff), 935315d (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:software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/64/gmp.txt (moved) (moved from src/tests/.expect/gmp.txt ) (2 diffs)
• .expect/complex.txt (added)
• complex.c (added)
• gmp.c (modified) (5 diffs)
• tuplePolymorphism.c (modified) (3 diffs)

src/tests/.expect/64/gmp.txt

@@ -4 +4 @@
 conversions
 y:97
+y:12345678901234567890123456789
 y:3
 y:-3
@@ -24 +25 @@
 z:150000000000000000000
 z:16666666666666666666
+16666666666666666666, 2 16666666666666666666, 2
 x:16666666666666666666 y:2
 

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 14:46:50 2017
-// Update Count     : 530
+// Last Modified On : Mon May 22 09:05:09 2017
+// Update Count     : 538
 // 
 
 #include <gmp>
 
-int main() {
+int main( void ) {
         sout | "constructors" | endl;
         short int si = 3;
@@ -25 +25 @@
         sout | "conversions" | endl;
         y = 'a';
+        sout | "y:" | y | endl;
+        y = "12345678901234567890123456789";
         sout | "y:" | y | endl;
         y = si;
@@ -62 +64 @@
         z = x / 3;
         sout | "z:" | z | endl;
+        sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
         [ x, y ] = div( x, 3 );
         sout | "x:" | x | "y:" | y | endl;
-//      sout | div( x, 3 ) | x / 3 | "," | x % 3 | endl;
 
         sout | endl;
@@ -72 +74 @@
         fn = (Int){0}; fn1 = fn;                                                        // 1st case
         sout | (int)0 | fn | endl;
-        fn = (Int){1}; fn2 = fn1; fn1 = fn;                                     // 2nd case
+        fn = 1; fn2 = fn1; fn1 = fn;                                            // 2nd case
         sout | 1 | fn | endl;
-        for ( int i = 2; i <= 200; i += 1 ) {
+        for ( unsigned int i = 2; i <= 200; i += 1 ) {
                 fn = fn1 + fn2; fn2 = fn1; fn1 = fn;                    // general case
                 sout | i | fn | endl;
@@ -83 +85 @@
         sout | "Factorial Numbers" | endl;
         Int fact;
-        fact = (Int){1};                                                                        // 1st case
+        fact = 1;                                                                                       // 1st case
         sout | (int)0 | fact | endl;
-        for ( int i = 1; i <= 40; i += 1 ) {
+        for ( unsigned int i = 1; i <= 40; i += 1 ) {
                 fact = fact * i;                                                                // general case
                 sout | i | fact | endl;

src/tests/tuplePolymorphism.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Nov 16 10:38:00 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 16 10:39:18 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu May 18 18:05:12 2017
+// Update Count     : 4
 //
 
 // packed is needed so that structs are not passed with the same alignment as function arguments
 __attribute__((packed)) struct A {
-  double x;
-  char y;
-  double z;
+        double x;
+        char y;
+        double z;
 };
 
 __attribute__((packed)) struct B {
-  long long x;
-  char y;
-  long long z;
+        long long x;
+        char y;
+        long long z;
 };
 
@@ -39 +39 @@
 
 int main() {
-  int x1 = 123, x3 = 456;
-  double x2 = 999.123;
+        int x1 = 123, x3 = 456;
+        double x2 = 999.123;
 
-  int i1 = 111, i3 = 222;
-  double i2 = 333;
+        int i1 = 111, i3 = 222;
+        double i2 = 333;
 
-  int d1 = 555, d3 = 444;
-  double d2 = 666;
+        int d1 = 555, d3 = 444;
+        double d2 = 666;
 
 
-  [i1, i2, i3] = ([x1, (int)x2, x3]) + ([9, 2, 3]);
-  [d1, d2, d3] = ([x1, x2, x3]) + ([9, 2, 3]);
-  printf("%d %g %d\n", i1, i2, i3);
-  printf("%d %g %d\n", d1, d2, d3);
+        [i1, i2, i3] = ([x1, (int)x2, x3]) + ([9, 2, 3]);
+        [d1, d2, d3] = ([x1, x2, x3]) + ([9, 2, 3]);
+        printf("%d %g %d\n", i1, i2, i3);
+        printf("%d %g %d\n", d1, d2, d3);
 
-  [double, double, double] zzz;
-  zzz = [x1, x2, x3];
-  printf("%g %g %g\n", zzz);
-  [x1, x2, x3] = zzz+zzz;
-  printf("%d %g %d\n", x1, x2, x3);
+        [double, double, double] zzz;
+        zzz = [x1, x2, x3];
+        printf("%g %g %g\n", zzz);
+        [x1, x2, x3] = zzz+zzz;
+        printf("%d %g %d\n", x1, x2, x3);
 
-  // ensure non-matching assertions are specialized correctly
-  g((A){ 1.21, 'x', 10.21}, (B){ 1111LL, 'v', 54385938LL });
+        // ensure non-matching assertions are specialized correctly
+        g((A){ 1.21, 'x', 10.21}, (B){ 1111LL, 'v', 54385938LL });
 }
 
@@ -73 +73 @@
 // tab-width: 4 //
 // End: //
-