Changeset 63f42a8

Timestamp:

May 18, 2021, 4:12:02 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:

78ea291

Parents:

d286e94d

Message:

Re-worked new array declarations to avoid suggestion that a type-system managed value needs to appear in type position. The arpk S parameter is now clearly a type, not a length.

File:

• libcfa/src/containers/array.hfa (modified) (2 diffs)

libcfa/src/containers/array.hfa

@@ -16 +16 @@
 //
 
-forall( [N], [S], Timmed &, Tbase & ) {
+forall( [N], S & | sized(S), Timmed &, Tbase & ) {
     struct arpk {
         S strides[z(N)];
@@ -142 +142 @@
 
 // Base
-forall( [Nq], [Sq], Tbase & )
+forall( [Nq], Sq & | sized(Sq), Tbase & )
 static inline tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {}
 
 // Rec
-forall( [Nq], [Sq], [N], [S], recq &, recr &, Tbase & | { tag(recr) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(recq) ); } )
+forall( [Nq], Sq & | sized(Sq), [N], S & | sized(S), recq &, recr &, Tbase & | { tag(recr) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(recq) ); } )
 static inline tag(arpk(N, S, recr, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(arpk(N, S, recq, Tbase)) ) {}
 
 // Wrapper
 struct all_t {} all;
-forall( [N], [S], Te &, result &, Tbase & | { tag(result) enq_( tag(Tbase), tag(N), tag(S), tag(Te) ); } )
+forall( [N], S & | sized(S), Te &, result &, Tbase & | { tag(result) enq_( tag(Tbase), tag(N), tag(S), tag(Te) ); } )
 static inline result & ?[?]( arpk(N, S, Te, Tbase) & this, all_t ) {
     return (result&) this;