Changeset f676b84 for src/tests

Timestamp:

Aug 25, 2017, 10:47:42 AM (8 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

Location:

src/tests

Files:

• .expect/fstream_test.txt (added)
• .expect/gmp.txt (moved) (moved from src/tests/.expect/64/gmp.txt ) (1 diff)
• .in/fstream_test.txt (added)
• .in/gmp.txt (added)
• fstream_test.c (modified) (2 diffs)
• gmp.c (modified) (2 diffs)
• io.c (modified) (2 diffs)
• rational.c (modified) (2 diffs)
• test.py (modified) (1 diff)
• vector/vector_test.c (modified) (2 diffs)

src/tests/.expect/gmp.txt

@@ -27 +27 @@
 16666666666666666666, 2 16666666666666666666, 2
 x:16666666666666666666 y:2
+
+12345678901234567890123456789 12345678901234567890123456789 12345678901234567890123456789
 
 Fibonacci Numbers

src/tests/fstream_test.c

@@ -7 +7 @@
 // fstream_test.c -- 
 //
-// Author           : Richard C. Bilson
+// Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May  2 15:25:54 2016
-// Update Count     : 61
+// Last Modified On : Thu Aug 24 11:30:26 2017
+// Update Count     : 65
 //
 
@@ -19 +19 @@
         int nombre;
         sout | "Entrez un nombre, s'il vous plaît:" | endl;
-        sin  | &nombre;
-        sout | "Vous avez entré" | nombre | "stocké à l'adresse" | &nombre | endl;
-        sout | "nombre" | nombre | "est"
-                 | (nombre > 0 ? "plus grand que" : nombre == 0 ? "égal à" : "moins de")
-                 | "zéro" | endl;
+        sin  | nombre;
+        sout | "Vous avez entré" | nombre | endl;
+        sout | "le nombre" | nombre | "est"
+                 | (nombre > 0 ? "positif" : nombre == 0 ? "zéro" : "négatif") | endl;
 
         sout | "Entrez trois nombres, s'il vous plaît: " | endl;
         int i, j, k;
-        sin  | &i | &j | &k;
+        sin  | i | j | k;
         sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
 }

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 13 16:35:01 2017
-// Update Count     : 541
+// Last Modified On : Thu Aug 24 09:33:26 2017
+// Update Count     : 543
 // 
 
@@ -70 +70 @@
         sout | endl;
 
+        sin | x | y | z;
+        sout | x | y | z | endl;
+
+        sout | endl;
+
         sout | "Fibonacci Numbers" | endl;
         Int fn, fn1, fn2;

src/tests/io.c

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  6 23:26:12 2017
-// Update Count     : 78
+// Last Modified On : Wed Aug 23 21:27:50 2017
+// Update Count     : 79
 // 
 
@@ -89 +89 @@
 
         sout | "input bacis types" | endl;
-        &in | &c                                                                                        // character
-                | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli     // integral
-                | &f | &d | &ld                                                                 // floating point
-                | &fc | &dc | &ldc                                                              // floating-point complex
+        &in | c                                                                                         // character
+                | si | usi | i | ui | li | uli | lli | ulli             // integral
+                | f | d | ld                                                                    // floating point
+                | fc | dc | ldc                                                                 // floating-point complex
                 | cstr( s1 ) | cstr( s2, size );                                // C string, length unchecked and checked
         sout | endl;

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 17 15:46:35 2017
-// Update Count     : 65
+// Last Modified On : Wed Aug 23 21:40:11 2017
+// Update Count     : 66
 //
 
@@ -92 +92 @@
         sout | x | endl;
 
-        sin | &a | &b;
+        sin | a | b;
         sout | a | b | endl;
 } // main

src/tests/test.py

@@ -174 +174 @@
         if make_ret == 0 :
                 # fetch optional input
-                stdinput = "< .in/%s.txt" % test.name if isfile(".in/%s.txt" % test.path) else ""
+                stdinput = "< .in/%s.txt" % test.name if isfile(".in/%s.txt" % test.name) else ""
 
                 if fileIsExecutable(test.name) :

src/tests/vector/vector_test.c

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:31:27 2016
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 24 08:15:38 2017
+// Update Count     : 19
 //
 
@@ -27 +27 @@
         sout | "enter N elements and C-d on a separate line:" | endl;
         for ( ;; ) {
-                sin | #
+                sin | num;
           if ( fail( sin ) || eof( sin ) ) break;
                 append( &vec, num );