X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=base%2Ftables-examples.tct;h=56fd4ab2ae4e926ac636704c9e5df75fd3b9a952;hp=9a19c5a7676467fb401baebdc431c1b4f79e3fc9;hb=9af88eb2e41e2b6a73643948e31262eee08c5400;hpb=5d466de467f28ae6f7125bef086d141a7734a4ce

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 9a19c5a..56fd4ab 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -9,7 +9,8 @@ Type sockaddr:			SockAddr_Value @
 Init sockaddr			sockaddr_clear(&@);
 
 Type sockid:			DgramSockID @
-Type ulong:			unsigned long @
+Type ulong:			uint32_t @
+Type long:			long @
 
 H-Include	"hbytes.h"
 
@@ -25,24 +26,36 @@ Table toplevel TopLevel_Command
 		...	obj
 
 Table ulong ULong_SubCommand
-	shift
-		right	charfrom("lr", "shift direction")
+	ul2int
 		v	ulong
-		bits	int
+		=>	int
+	int2ul
+		v	int
 		=>	ulong
 	mask
 		a	ulong
 		b	ulong
 		=>	ulong
+	add
+		a	ulong
+		b	ulong
+		=>	ulong
+	multiply
+		a	ulong
+		b	ulong
+		=>	ulong
+	subtract
+		a	ulong
+		b	ulong
+		=>	ulong
 	compare
 		a	ulong
 		b	ulong
 		=>	int
-	ul2int
+	shift
+		right	charfrom("lr", "shift direction")
 		v	ulong
-		=>	int
-	int2ul
-		v	int
+		bits	int
 		=>	ulong
 	ul2bitfields
 		value	ulong
@@ -60,18 +73,12 @@ Table hbytes HBytes_SubCommand
 	h2raw
 		hex	hb
 		=>	obj
-	ulong2h
-		value	ulong
-		=>	hb
-	h2ulong
-		hex	hb
-		=>	ulong
 	ushort2h
-		value	ulong
+		value	long
 		=>	hb
 	h2ushort
 		hex	hb
-		=>	ulong
+		=>	long
 	length
 		v	hb
 		=>	int
@@ -121,10 +128,6 @@ Table hbytes HBytes_SubCommand
 		v	hb
 		count	int
 		=>	hb
-	clockincrement
-		value	hbv
-		change	int
-		=>	int
 	random
 		length	int
 		=>	hb
@@ -146,6 +149,10 @@ Table hbytes HBytes_SubCommand
  		key	obj
  		?maclen	obj
  		=>	hb
+	hash-prop
+		prop	enum(HashAlgPropInfo, "prop")
+		alg	enum(HashAlgInfo, "alg")
+		=>	int
 
 Table dgram_socket DgramSocket_SubCommand
 	create
@@ -183,6 +190,10 @@ Table blockcipherop BlockCipherOp
  		mode	enum(BlockCipherModeInfo, "mode")
 		iv	hb
 		=>	hb
+	prop	-1
+		prop	enum(BlockCipherPropInfo, "prop")
+		alg	enum(BlockCipherAlgInfo, "alg")
+		=>	int
 
 EntryExtra BlockCipherOp
 	int encrypt;