Changeset b9dae14c for tests

Timestamp:

Apr 30, 2021, 9:23:12 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

a049412, ad89296, ec1c674

Parents:

63a4b92

Message:

Activated syntax, forall( [N] ).

This implementation desugars in the parser, as forall( ztype(N) ) did in
the preprocessor. Semantic analysis is still required to lock down treating N as a
a traditional type (forbid: N x = 17; vector(N) v;). Deferring that work until
the N--value adapters ( Z(17), z(N) ) are settled.

Location:

tests/array-container

Files:

• array-basic.cfa (modified) (4 diffs)
• array-md-sbscr-cases.cfa (modified) (6 diffs)

tests/array-container/array-basic.cfa

@@ -5 +5 @@
 //
 
-forall( ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nx], [Ny], [Nz] )
 void typesTest( tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -59 +59 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) {
     for (w; z(Nw))
@@ -68 +68 @@
 }
 
-forall( ztype(Zn)
+forall( [Zn]
       , S & | sized(S)
       )
@@ -86 +86 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void runtimeTest( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 

tests/array-container/array-md-sbscr-cases.cfa

@@ -18 +18 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) {
     for (w; z(Nw))
@@ -27 +27 @@
 }
 
-forall( ztype(Zn)
-      , S & | sized(S)
-      )
-float total1d_low( arpk(Zn, S, float, float ) & a ) {
-    float total = 0.0f;
-    for (i; z(Zn))
-        total += a[i];
-    return total;
-}
-
-forall( A & | ar(A, float) )
-float total1d_hi( A & a ) {
-    float total = 0.0f;
-    for (i; a`len)
-        total += a[i];
-    return total;
-}
-
 // Tests all the ways to split dimensions into CFA-supported chunks, by the only order that C supports: coarsest to finest stride.
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void test_inOrderSplits( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -96 +78 @@
 
 // All orders that skip a single dimension, each in its most natural split.
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void test_skipSingle( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -137 +119 @@
 // Natural split means the arity of every -[[-,...]] tuple equals the dimensionality of its "this" operand, then that the fewest "all" subscripts are given.
 // The commented-out test code shows cases that don't work.  We wish all the comment-coverd cases worked.
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void test_latticeCoverage( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -235 +217 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void test_numSubscrTypeCompatibility( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -282 +264 @@
     test_skipSingle     ( ztag(KW), ztag(KX), ztag(KY), ztag(KZ) );
     test_latticeCoverage( ztag(KW), ztag(KX), ztag(KY), ztag(KZ) );
+    test_numSubscrTypeCompatibility( ztag(KW), ztag(KX), ztag(KY), ztag(KZ) );
     printf("done\n");
 }