Changeset 2f19e03 for tests

Timestamp:

Jun 15, 2021, 12:28:48 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b51e389c

Parents:

4aba055 (diff), 4f1b8f3f (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 andrew-mmath, collecting updates.

Location:

tests

Files:

• coroutine/fibonacci.cfa (modified) (1 diff)
• device/.expect/cpu.txt (added)
• device/cpu.cfa (added)
• generator/fibonacci.cfa (modified) (3 diffs)
• generator/fmtLines.cfa (modified) (1 diff)
• generator/suspend_then.cfa (modified) (1 diff)
• unified_locking/fast.cfa (modified) (2 diffs)
• vector_math/.expect/vec2_ldouble.arm64.txt (added)
• vector_math/.expect/vec2_ldouble.x64.txt (moved) (moved from tests/vector_math/.expect/vec2_ldouble.txt )
• vector_math/.expect/vec2_ldouble.x86.txt (added)

tests/coroutine/fibonacci.cfa

@@ -31 +31 @@
 }
 
-int next( Fibonacci & fib ) with( fib ) {
-        resume( fib );                                                                          // restart last suspend
-        return fn;
-}
-
 int main() {
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
-                sout | next( f1 ) | next( f2 );
+                sout | resume( f1 ).fn | resume( f2 ).fn;
         } // for
 }

tests/generator/fibonacci.cfa

@@ -8 +8 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Mon Mar  1 16:54:23 2020
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Created On       : Mon Mar 1 16:54:23 2020
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 10 21:54:14 2021
+// Update Count     : 3
 //
+
+#include <fstream.hfa>
 
 generator Fib {
@@ -18 +20 @@
 };
 
-void main(Fib & b) with (b) {
+void main(Fib & fib) with (fib) {
         [fn1, fn] = [1, 0];
         for () {
@@ -29 +31 @@
         Fib f1, f2;
         for ( 10 ) {
-                resume( f1 );
-                resume( f2 );
-                printf("%d %d\n", f1.fn, f2.fn);
+                resume( f1 ); resume( f2 );
+                sout | f1.fn | f2.fn;
+                // sout | resume( f1 ).fn | resume( f2 ).fn; // compiler bug
         }
-
 }
 

tests/generator/fmtLines.cfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Mar  5 16:09:08 2020
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 10 21:56:22 2021
+// Update Count     : 2
 //
 

tests/generator/suspend_then.cfa

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Mon Apr 29 12:01:35 2019
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 10 21:55:51 2021
+// Update Count     : 1
 //
 

tests/unified_locking/fast.cfa

@@ -22 +22 @@
 uint32_t cs() {
         $thread * me = active_thread();
-        uint32_t value = (uint32_t)me;
+        uint32_t value;
         lock(mo.l);
         {
@@ -28 +28 @@
                 mo.id = me;
                 yield(random(5));
+                value = ((uint32_t)random()) ^ ((uint32_t)me);
                 if(mo.id != me) sout | "Intruder!";
                 mo.sum = tsum + value;