Changes in libcfa/src/containers/array.hfa [6448f7d:63f42a8]

File:

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

libcfa/src/containers/array.hfa

@@ -1 +1 @@
 
 
-forall( __CFA_tysys_id_only_X & ) struct tag {};
+// a type whose size is n
+#define Z(n) char[n]
+
+// the inverse of Z(-)
+#define z(N) sizeof(N)
+
+forall( T & ) struct tag {};
 #define ttag(T) ((tag(T)){})
-#define ztag(n) ttag(n)
+#define ztag(n) ttag(Z(n))
 
 
@@ -12 +18 @@
 forall( [N], S & | sized(S), Timmed &, Tbase & ) {
     struct arpk {
-        S strides[N];
+        S strides[z(N)];
     };
 
@@ -50 +56 @@
 
     static inline size_t ?`len( arpk(N, S, Timmed, Tbase) & a ) {
-        return N;
+        return z(N);
     }
 
     // workaround #226 (and array relevance thereof demonstrated in mike102/otype-slow-ndims.cfa)
     static inline void ?{}( arpk(N, S, Timmed, Tbase) & this ) {
-        void ?{}( S (&inner)[N] ) {}
+        void ?{}( S (&inner)[z(N)] ) {}
         ?{}(this.strides);
     }
     static inline void ^?{}( arpk(N, S, Timmed, Tbase) & this ) {
-        void ^?{}( S (&inner)[N] ) {}
+        void ^?{}( S (&inner)[z(N)] ) {}
         ^?{}(this.strides);
     }
@@ -137 +143 @@
 // Base
 forall( [Nq], Sq & | sized(Sq), Tbase & )
-static inline tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {
-    tag(arpk(Nq, Sq, Tbase, Tbase)) ret;
-    return ret;
-}
+static inline tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {}
 
 // Rec
 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)) ) {
-    tag(arpk(N, S, recr, Tbase)) ret;
-    return ret;
-}
+static inline tag(arpk(N, S, recr, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(arpk(N, S, recq, Tbase)) ) {}
 
 // Wrapper