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=9165827456f282900c00e23fafc350860a70cfd6;hp=6bdc7ff4afc95966cbc0182826be367ce232524f;hb=4149293c485d766e446f1a841892420059755347;hpb=12cb589d468d6c93b04dfabe645ce761a81c5328

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 6bdc7ff..9165827 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -2,24 +2,93 @@ Type hb:			HBytes_Value @
 Init hb				hbytes_sentinel(&@);
 
 Type hbv:			HBytes_Var @
-Init hbv			@.hb=0; @.obj=0; @.var=0;
-Fini hbv			fini_hbv(ip, rc, &@);
+Init hbv			@.hb=0; init_somethingv(&@.sth);
+Fini hbv			fini_somethingv(ip, rc, &@.sth);
+
+Type constv(Tcl_ObjType*):	Tcl_Obj *@
+
+Type maskmapv:			MaskMap_Var @
+Init maskmapv			@.mm=0; init_somethingv(&@.sth);
+Fini maskmapv			fini_somethingv(ip, rc, &@.sth);
 
 Type sockaddr:			SockAddr_Value @
 Init sockaddr			sockaddr_clear(&@);
 
-Type sockid:			DgramSockID @
-Type ulong:			unsigned long @
+Type iddata(IdDataTable *tab):	void *@
+Type ulong:			uint32_t @
+Type long:			long @
+Type string:			const char *@
+
+Type charfrom(const char *opts, const char *what):	int
 
 H-Include	"hbytes.h"
 
-Untabled
+Table toplevel TopLevel_Command
 	hbytes
 		subcmd	enum(HBytes_SubCommand, "hbytes subcommand")
-		obj	...
+		...	obj
 	dgram-socket
-		subcmd enum(DgramSocket_SubCommand,"dgram-socket subcommand")
-		obj	...
+		subcmd	enum(DgramSocket_SubCommand,"dgram-socket subcommand")
+		...	obj
+	tuntap-socket-raw
+	    subcmd enum(TunSocket_SubCommand,"tuntap-socket-raw subcommand")
+	    ...	obj
+	ulong
+		subcmd	enum(ULong_SubCommand,"ulong subcommand")
+		...	obj
+
+Table maskmap MaskMap_SubCommand
+	lookup
+		map	constv(&maskmap_type)
+		addr	hb
+		?def	obj
+		=>	obj
+	amend
+		map	maskmapv
+		prefix	obj
+		preflen	obj
+		data	obj
+
+Table ulong ULong_SubCommand
+	ul2int
+		v	ulong
+		=>	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
+	shift
+		right	charfrom("lr", "shift direction")
+		v	ulong
+		bits	int
+		=>	ulong
+	ul2bitfields
+		value	ulong
+		...	obj
+		=>	int
+	bitfields2ul
+		base	ulong
+		...	obj
+		=>	ulong
 
 Table hbytes HBytes_SubCommand
 	raw2h
@@ -28,18 +97,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
@@ -47,17 +110,22 @@ Table hbytes HBytes_SubCommand
 		a	hb
 		b	hb
 		=>	int
+	range
+		v	hb
+		start	int
+		size	int
+		=>	hb
  	prepend
  		v	hbv
- 		str	...
+ 		...	str
  	append
  		v	hbv
- 		str	...
+ 		...	str
 	rep-info
 		v	obj
 		=>	obj
  	concat
- 		str	...
+ 		...	str
 		=>	hb
  	unprepend
  		v	hbv
@@ -71,19 +139,34 @@ Table hbytes HBytes_SubCommand
  		v	hbv
  		length	int
  		=>	hb
- 	pkcs5
- 		meth	enum(PadMethod, "hbytes pad subcommand")
+	overwrite
 		v	hbv
-		block	obj
-		=>	int
+		start	int
+		sub	hb
+	trimleft
+		v	hbv
+	zeroes
+		length	int
+		=>	hb
+	repeat
+		v	hb
+		count	int
+		=>	hb
+	xor
+		v	hbv
+		d	hb
+	random
+		length	int
+		=>	hb
+	pad
+ 		op	enum(PadOp, "hbytes pad subcommand")
+		v	hbv
+		blocksz	obj
+		meth	enum(PadMethodInfo, "pad method")
+		...	methargs
  	blockcipher
- 		encrypt	charfrom("de","encrypt/decrypt")
- 		v	hbv
- 		alg	enum(BlockCipherAlgInfo, "alg")
-		key	obj
- 		mode	enum(BlockCipherModeInfo, "mode")
- 		?iv	hb
- 		=>	hb
+ 		op	enum(BlockCipherOp, "op")
+		...	obj
  	hash
  		alg	enum(HashAlgInfo, "hash alg")
  		message	hb
@@ -94,23 +177,78 @@ Table hbytes HBytes_SubCommand
  		key	obj
  		?maclen	obj
  		=>	hb
-	zeroes
-		length	int
-		=>	hb
-	random
-		length	int
-		=>	hb
+	hash-prop
+		prop	enum(HashAlgPropInfo, "prop")
+		alg	enum(HashAlgInfo, "alg")
+		=>	int
+	mask-map
+		subcmd	enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+		...	obj
+
+Table padmethodinfo PadMethodInfo
+	pkcs5
+		=>	int
+	rfc2406
+		nxthdr	obj
+		=>	int
 
 Table dgram_socket DgramSocket_SubCommand
 	create
 		local	sockaddr
-		=>	sockid
+		=>	iddata(&dgram_socks)
 	close
-		sock	sockid
+		sock	iddata(&dgram_socks)
 	transmit
-		sock	sockid
+		sock	iddata(&dgram_socks)
 		data	hb
 		remote	sockaddr
 	on-receive
-		sock	sockid
+		sock	iddata(&dgram_socks)
+		?script	obj
+
+Table tuntap_socket_raw TunSocket_SubCommand
+	create
+		?ifname	string
+		=>	iddata(&tuntap_socks)
+	close
+		sock	iddata(&tuntap_socks)
+	ifname
+		sock	iddata(&tuntap_socks)
+		=>	string
+	receive
+		sock	iddata(&tuntap_socks)
+		data	hb
+	on-transmit
+		sock	iddata(&tuntap_socks)
+		mtu	long
 		?script	obj
+
+Table blockcipherop BlockCipherOp
+	e	1
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	d	0
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	mac	-1
+		msg	hb
+		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+		iv	hb
+		=>	hb
+	prop	-1
+		prop	enum(BlockCipherPropInfo, "prop")
+		alg	enum(BlockCipherAlgInfo, "alg")
+		=>	int
+
+EntryExtra BlockCipherOp
+	int encrypt;