Index: doc/theses/jiada_liang_MMath/test1.cfa
===================================================================
--- doc/theses/jiada_liang_MMath/test1.cfa	(revision 7f8c2323f117b7143014f347174bd00ad62cf18e)
+++ doc/theses/jiada_liang_MMath/test1.cfa	(revision c40a98268f7ac3be26d179ba49352c2b1fbcb0fd)
@@ -34,6 +34,6 @@
 enum() Mode { O_RDONLY, O_WRONLY, O_CREAT, O_TRUNC, O_APPEND };
 Mode iomode = O_RDONLY;
-bool b = iomode == O_RDONLY || iomode < O_APPEND;
-int www = iomode;
+//bool b = iomode == O_RDONLY || iomode < O_APPEND;	// disallowed
+//int www = iomode;	// disallowed
 
 enum( char * ) Colour { Red = "red", Green = "green", Blue = "blue"  };
@@ -45,9 +45,9 @@
 //greek = A;								// disallowed
 
-	for ( Greek l = Alph; posE(l) <= posE(Gamma); l = succ( l ) ) {
-		printf( "%s %c %d\n", labelE( l ), valueE( l ), posE( l ) );
+	for ( Greek l = Alph; posn(l) <= posn(Gamma); l = succ( l ) ) {
+		printf( "%s %c %d\n", label( l ), value( l ), posn( l ) );
 	}
-	for ( Currency c = Dollar; posE(c) <= posE(Currency.Euro); c = succ( c ) ) {
-		printf( "%s %c %d\n", labelE( c ), valueE( c ), posE( c ) );
+	for ( Currency c = Dollar; posn(c) <= posn(Currency.Euro); c = succ( c ) ) {
+		printf( "%s %c %d\n", label( c ), value( c ), posn( c ) );
 	}
 }
@@ -58,5 +58,5 @@
 enum( char * ) Names3 { inline Names2, Sue = "SUE", Tom = "TOM" };
 
-void f( Names n ) { sout | "Name" | posE( n ); }
+void f( Names n ) { sout | "Name" | posn( n ); }
 void g( Names2 );
 void h( Names3 );
@@ -84,7 +84,7 @@
 //	f( name );
 
-	int jane_pos = posE( Names.Jane );
-	char * jane_value = valueE( Names.Jane );
-	char * jane_label = labelE( Names.Jane );
-	sout | Names.Jane | posE( Names.Jane) | labelE( Names.Jane ) | valueE( Names.Jane );
+	int jane_pos = posn( Names.Jane );
+	char * jane_value = value( Names.Jane );
+	char * jane_label = label( Names.Jane );
+	sout | Names.Jane | posn( Names.Jane) | label( Names.Jane ) | value( Names.Jane );
 }