Changeset 0f4527d for tests

Timestamp:

Dec 14, 2019, 11:56:52 AM (4 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

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

Children:

b84ab40

Parents:

ae09808 (diff), 9853d9b0 (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 vector-generic

Location:

tests

Files:

• .expect/loopctrl.txt (modified) (3 diffs)
• concurrent/.expect/keywordErrors.txt (modified) (1 diff)
• loopctrl.cfa (modified) (4 diffs)

tests/.expect/loopctrl.txt

@@ -6 +6 @@
 A
 A A A A A A A A A A
+A A A A A A A A A A A
 B B B B B
 C C C C C
@@ -12 +13 @@
 
 0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
 1 3 5 7 9
 10 8 6 4 2
@@ -28 +30 @@
 N N N N N N N N N N
 0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
 10 9 8 7 6 5 4 3 2 1
 

tests/concurrent/.expect/keywordErrors.txt

@@ -1 +1 @@
 concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-struct A: with body 1
+thread A: with body 1
 
 concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-struct B: with body 1
+thread B: with body 1
 

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:05:05 2019
-// Update Count     : 106
+// Last Modified On : Thu Dec 12 17:55:26 2019
+// Update Count     : 108
 // 
 
@@ -43 +43 @@
         for ( 1 ) { sout | "A"; }                                                       sout | nl;
         for ( 10 ) { sout | "A"; }                                                      sout | nl;
+        for ( = 10 ) { sout | "A"; }                                            sout | nl;
         for ( 1 ~= 10 ~ 2 ) { sout | "B"; }                                     sout | nl;
         for ( 10 -~= 1 ~ 2 ) { sout | "C"; }                            sout | nl;
@@ -49 +50 @@
 
         for ( i; 10 ) { sout | i; }                                                     sout | nl;
+        for ( i; = 10 ) { sout | i; }                                           sout | nl;
         for ( i; 1 ~= 10 ~ 2 ) { sout | i; }                            sout | nl;
         for ( i; 10 -~= 1 ~ 2 ) { sout | i; }                           sout | nl;
@@ -87 +89 @@
         for ( N ) { sout | "N"; }                                                       sout | nl;
         for ( i; N ) { sout | i; }                                                      sout | nl;
+        for ( i; = N ) { sout | i; }                                            sout | nl;
         for ( i; N -~ 0 ) { sout | i; }                                         sout | nl | nl;