Changeset 63a4b92

Timestamp:

Apr 29, 2021, 10:25:20 PM (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:

b9dae14c

Parents:

3eb55f98

Message:

Improved support for new arrays subscripting by tuples, --,-,-?.

Files:

• libcfa/src/containers/array.hfa (modified) (2 diffs)
• tests/array-container/.expect/array-basic.x64.txt (modified) (1 diff)
• tests/array-container/.expect/array-md-sbscr-cases.x64.txt (added)
• tests/array-container/array-basic.cfa (modified) (2 diffs)
• tests/array-container/array-md-sbscr-cases.cfa (added)

libcfa/src/containers/array.hfa

@@ -25 +25 @@
 
     Timmed & ?[?]( arpk(Zn, S, Timmed, Tbase) & a, ptrdiff_t i ) {
+        return (Timmed &) a.strides[i];
+    }
+
+    Timmed & ?[?]( arpk(Zn, S, Timmed, Tbase) & a, int i ) {
+        return (Timmed &) a.strides[i];
+    }
+
+    Timmed & ?[?]( arpk(Zn, S, Timmed, Tbase) & a, size_t i ) {
         return (Timmed &) a.strides[i];
     }
@@ -80 +88 @@
 // Core -[[-,-,-]] operator
 
+#ifdef TRY_BROKEN_DESIRED_MD_SUBSCRIPT
+
 // Desired form.  One definition with recursion on IxBC (worked until Jan 2021, see trac #__TODO__)
-// forall( TA &, TB &, TC &, IxAB, IxBC ... | { TB & ?[?]( TA &, IxAB ); TC & ?[?]( TB &, IxBC ); } )
-// TC & ?[?]( TA & this, IxAB ab, IxBC bc ) {
-//     return this[ab][bc];
-// }
 
-// Workaround form.  Listing all possibilities up to 4 dims.
-forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
-            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); } )
+forall( TA &, TB &, TC &, IxAB, IxBC ... | { TB & ?[?]( TA &, IxAB ); TC & ?[?]( TB &, IxBC ); } )
 TC & ?[?]( TA & this, IxAB ab, IxBC bc ) {
     return this[ab][bc];
 }
-forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
-            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); }
-            , TD &, IxCD | { TD & ?[?]( TC &, IxCD ); } )
-TD & ?[?]( TA & this, IxAB ab, IxBC bc, IxCD cd ) {
-    return this[ab][bc][cd];
-}
-forall( TA &, TB &, IxAB | { TB & ?[?]( TA &, IxAB ); }
-            , TC &, IxBC | { TC & ?[?]( TB &, IxBC ); }
-            , TD &, IxCD | { TD & ?[?]( TC &, IxCD ); }
-            , TE &, IxDE | { TE & ?[?]( TD &, IxDE ); } )
-TE & ?[?]( TA & this, IxAB ab, IxBC bc, IxCD cd, IxDE de ) {
-    return this[ab][bc][cd][de];
+
+#else 
+
+// Workaround form.  Listing all possibilities up to 4 dims.
+
+forall( TA &, TB &, TC &, IxAB_0, IxBC | { TB & ?[?]( TA &, IxAB_0 ); TC & ?[?]( TB &, IxBC ); } )
+TC & ?[?]( TA & this, IxAB_0 ab, IxBC bc ) {
+    return this[ab][bc];
 }
 
-// Adapters for "indexed by ptrdiff_t" implies "indexed by [this other integral type]"
-// Work around restriction that assertions underlying -[[-,-,-]] must match excatly
-forall( C &, E & | { E & ?[?]( C &, ptrdiff_t ); } ) {
+forall( TA &, TB &, TC &, IxAB_0, IxAB_1, IxBC | { TB & ?[?]( TA &, IxAB_0, IxAB_1 ); TC & ?[?]( TB &, IxBC ); } )
+TC & ?[?]( TA & this, IxAB_0 ab0, IxAB_1 ab1, IxBC bc ) {
+    return this[[ab0,ab1]][bc];
+}
 
-    // Targeted to support:  for( i; z(N) ) ... a[[ ..., i, ... ]]
-    E & ?[?]( C & this, size_t i ) {
-        return this[ (ptrdiff_t) i ];
-    }
+forall( TA &, TB &, TC &, IxAB_0, IxAB_1, IxAB_2, IxBC | { TB & ?[?]( TA &, IxAB_0, IxAB_1, IxAB_2 ); TC & ?[?]( TB &, IxBC ); } )
+TC & ?[?]( TA & this, IxAB_0 ab0, IxAB_1 ab1, IxAB_2 ab2, IxBC bc ) {
+    return this[[ab0,ab1,ab2]][bc];
+}
 
-    // Targeted to support:  for( i; 5 ) ... a[[ ..., i, ... ]]
-    E & ?[?]( C & this, int i ) {
-        return this[ (ptrdiff_t) i ];
-    }
-}
+#endif
 
 //

tests/array-container/.expect/array-basic.x64.txt

@@ -1 +1 @@
 expect Ws             = 7.060606
 result Ws [][][][] lo = 7.060606
+result Ws [,,,]    lo = 7.060606
 result Ws [][][][] hi = 7.060606
+result Ws [,,,]    hi = 7.060606
 expect Xs             = 8.150808
 result Xs [][][][] lo = 8.150808
+result Xs [,,,]    lo = 8.150808
 result Xs [][][][] hi = 8.150808
+result Xs [,,,]    hi = 8.150808

tests/array-container/array-basic.cfa

@@ -105 +105 @@
     printf("result Ws [][][][] lo = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
-    // printf("result Ws [,,,]    lo = %f\n", result);
+    result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
+    printf("result Ws [,,,]    lo = %f\n", result);
 
     result = total1d_hi( wxyz[all][slice_ix][slice_ix][slice_ix] );
     printf("result Ws [][][][] hi = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
-    // printf("result Ws [,,,]    hi = %f\n", result);
+    result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
+    printf("result Ws [,,,]    hi = %f\n", result);
 
     // summing across X, with w=y=z=1
@@ -126 +124 @@
     printf("result Xs [][][][] lo = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
-    // printf("result Xs [,,,]    lo = %f\n", result);
+    result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
+    printf("result Xs [,,,]    lo = %f\n", result);
 
     result = total1d_hi( wxyz[slice_ix][all][slice_ix][slice_ix] );    
     printf("result Xs [][][][] hi = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
-    // printf("result Xs [,,,]    hi = %f\n", result);
+    result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
+    printf("result Xs [,,,]    hi = %f\n", result);
 
 }