changed from underscore+lowercase to TypicalModula2MixedCapitalisation

JustLikeThis :-)

test/mtest.mod

@@ -9,82 +9,78 @@ FROM BIO IMPORT PutString, PutLine, PutLn;
 FROM FIO IMPORT StdOut;
 
 FROM mx IMPORT
-	string, intlist, intlist_null, intlist_cons,
-        getkind_intlist, get_intlist_cons, print_intlist,
-	illist, illist_null, illist_cons, getkind_illist,
-	get_illist_cons, print_illist,
-        idtree, idtree_leaf, idtree_node, getkind_idtree,
-	get_idtree_leaf, get_idtree_node, print_idtree;
+	IntList, IntListNull, IntListCons, PrintIntList,
+	ILList, ILListNull, ILListCons, PrintILList,
+	IdTree, IdTreeLeaf, IdTreeNode, PrintIdTree;
 
 
 VAR
-	int1, int2, int3 : intlist;
+	int1, int2, int3 : IntList;
 
 
-PROCEDURE test_intlist();
+PROCEDURE testintlist();
 
 BEGIN
-	int1 := intlist_null();
-	int2 := intlist_cons( 10, int1 );
-	int3 := intlist_cons( 20, int2 );
+	int1 := IntListNull();
+	int2 := IntListCons( 10, int1 );
+	int3 := IntListCons( 20, int2 );
 
 	PutLn( "intlists:" );
 	PutLine();
-	PutString( " int1: " ); print_intlist( StdOut, int1 ); PutLine();
-	PutString( " int2: " ); print_intlist( StdOut, int2 ); PutLine();
-	PutString( " int3: " ); print_intlist( StdOut, int3 ); PutLine();
+	PutString( " int1: " ); PrintIntList( StdOut, int1 ); PutLine();
+	PutString( " int2: " ); PrintIntList( StdOut, int2 ); PutLine();
+	PutString( " int3: " ); PrintIntList( StdOut, int3 ); PutLine();
 	PutLine();
-END test_intlist;
+END testintlist;
 
 
-PROCEDURE test_illist();
+PROCEDURE testillist();
 
 VAR
-	il1, il2, il3, il4 : illist;
+	il1, il2, il3, il4 : ILList;
 
 BEGIN
-	il1 := illist_null();
-	il2 := illist_cons( int1, il1 );
-	il3 := illist_cons( int2, il2 );
-	il4 := illist_cons( int3, il3 );
+	il1 := ILListNull();
+	il2 := ILListCons( int1, il1 );
+	il3 := ILListCons( int2, il2 );
+	il4 := ILListCons( int3, il3 );
 
-	PutLn( "illists:" );
+	PutLn( "ILLists:" );
 	PutLine();
-	PutString( " il1: " ); print_illist( StdOut, il1 ); PutLine();
-	PutString( " il2: " ); print_illist( StdOut, il2 ); PutLine();
-	PutString( " il3: " ); print_illist( StdOut, il3 ); PutLine();
-	PutString( " il4: " ); print_illist( StdOut, il4 ); PutLine();
+	PutString( " il1: " ); PrintILList( StdOut, il1 ); PutLine();
+	PutString( " il2: " ); PrintILList( StdOut, il2 ); PutLine();
+	PutString( " il3: " ); PrintILList( StdOut, il3 ); PutLine();
+	PutString( " il4: " ); PrintILList( StdOut, il4 ); PutLine();
 	PutLine();
-END test_illist;
+END testillist;
 
 
-PROCEDURE test_idtree();
+PROCEDURE testidtree();
 
 VAR
-	id1, id2, id3, id4, id5, id6 : idtree;
+	id1, id2, id3, id4, id5, id6 : IdTree;
 
 BEGIN
-	id1 := idtree_leaf( "hello", int1 );
-	id2 := idtree_leaf( "there", int2 );
-	id3 := idtree_node( id1, id2 );
-	id4 := idtree_node( id3, id1 );
-	id5 := idtree_leaf( "zebedee", int3 );
-	id6 := idtree_node( id4, id5 );
-
-	PutLn( "idtrees:" );
+	id1 := IdTreeLeaf( "hello", int1 );
+	id2 := IdTreeLeaf( "there", int2 );
+	id3 := IdTreeNode( id1, id2 );
+	id4 := IdTreeNode( id3, id1 );
+	id5 := IdTreeLeaf( "zebedee", int3 );
+	id6 := IdTreeNode( id4, id5 );
+
+	PutLn( "idtrees:" ); PutLine();
+	PutString( " id1: " ); PrintIdTree( StdOut, id1 ); PutLine();
+	PutString( " id2: " ); PrintIdTree( StdOut, id2 ); PutLine();
+	PutString( " id3: " ); PrintIdTree( StdOut, id3 ); PutLine();
+	PutString( " id4: " ); PrintIdTree( StdOut, id4 ); PutLine();
+	PutString( " id5: " ); PrintIdTree( StdOut, id5 ); PutLine();
+	PutString( " id6: " ); PrintIdTree( StdOut, id6 ); PutLine();
 	PutLine();
-	PutString( " id1: " ); print_idtree( StdOut, id1 ); PutLine();
-	PutString( " id2: " ); print_idtree( StdOut, id2 ); PutLine();
-	PutString( " id3: " ); print_idtree( StdOut, id3 ); PutLine();
-	PutString( " id4: " ); print_idtree( StdOut, id4 ); PutLine();
-	PutString( " id5: " ); print_idtree( StdOut, id5 ); PutLine();
-	PutString( " id6: " ); print_idtree( StdOut, id6 ); PutLine();
-	PutLine();
-END test_idtree;
+END testidtree;
 
 
 BEGIN
-	test_intlist();
-	test_illist();
-	test_idtree();
+	testintlist();
+	testillist();
+	testidtree();
 END mtest.