Index: doc/theses/mike_brooks_MMath/programs/hello-md.cfa
===================================================================
--- doc/theses/mike_brooks_MMath/programs/hello-md.cfa	(revision 8d76f2bdbb1fb91a8a34e16b27f6785fc45ea2b3)
+++ doc/theses/mike_brooks_MMath/programs/hello-md.cfa	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
@@ -1,12 +1,3 @@
 #include "array.hfa"
-
-
-trait ix( C &, E &, ztype(N) ) {
-    E & ?[?]( C &, ptrdiff_t );
-    void __taglen( tag(C), tag(N) );
-};
-
-forall( ztype(Zn), ztype(S), Timmed &, Tbase & )
-void __taglen( tag(arpk(Zn, S, Timmed, Tbase)), tag(Zn) ) {}
 
 
@@ -38,8 +29,17 @@
 
 
-forall( ztype( N ) )
+
+
+
+
+
+
+
+
+
+forall( [N] )
 void print1d_cstyle( array(float, N) & c );
 
-forall( C &, ztype( N ) | ix( C, float, N ) )
+forall( [N], C & | ar( C, float, N ) )
 void print1d( C & c );
 
@@ -58,7 +58,7 @@
 
 
-forall( ztype( N ) )
+forall( [N] )
 void print1d_cstyle( array(float, N) & c ) {
-    for( i; z(N) ) {
+    for( i; N ) {
         printf("%.1f  ", c[i]);
     }
@@ -78,7 +78,7 @@
 
 
-forall( C &, ztype( N ) | ix( C, float, N ) )
+forall( [N], C & | ar( C, float, N ) )
 void print1d( C & c ) {
-    for( i; z(N) ) {
+    for( i; N ) {
         printf("%.1f  ", c[i]);
     }
@@ -99,9 +99,9 @@
 
 
-void fill( array(float, Z(5), Z(7)) & a ) {
+void fill( array(float, 5, 7) & a ) {
     for ( i; (ptrdiff_t) 5 ) {
         for ( j; 7 ) {
-            a[[i,j]] = 1.0 * i + 0.1 * j;
-            printf("%.1f  ", a[[i,j]]);
+            a[i,j] = 1.0 * i + 0.1 * j;
+            printf("%.1f  ", a[i,j]);
         }
         printf("\n");
@@ -118,5 +118,5 @@
 
 
-array( float, Z(5), Z(7) ) a;
+array( float, 5, 7 ) a;
 fill(a);
 /*
@@ -148,10 +148,10 @@
 
 
-print1d( a[[ 2, all ]] );  // 2.0  2.1  2.2  2.3  2.4  2.5  2.6
-print1d( a[[ all, 3 ]] );  // 0.3  1.3  2.3  3.3  4.3
+print1d( a[ 2, all ] );  // 2.0  2.1  2.2  2.3  2.4  2.5  2.6
+print1d( a[ all, 3 ] );  // 0.3  1.3  2.3  3.3  4.3
 
 
 
-print1d_cstyle( a[[ 2, all ]] );
+print1d_cstyle( a[ 2, all ] );
 
 
@@ -161,7 +161,7 @@
 
 
-#ifdef SHOWERR1
+#ifdef SHOW_ERROR_1
 
-print1d_cstyle( a[[ all, 2 ]] );  // bad
+print1d_cstyle( a[ all, 2 ] );  // bad
 
 #endif