working on new addrmap instead of maskmap - compiles, but have not yet implemented...

[chiark-tcl.git] / base / tables-examples.tct

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 696583a2fc139baafbc7556d1f203555d3f5d953..7ce5dc7f671bfcf61842961ba4169843c996d077 100644 (file)
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -7,14 +7,14 @@ 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 addrmapv:                 AddrMap_Var @
+Init addrmapv                  @.am=0; init_somethingv(&@.sth);
+Fini addrmapv                  fini_somethingv(ip, rc, &@.sth);
 
 Type sockaddr:                 SockAddr_Value @
 Init sockaddr                  sockaddr_clear(&@);
 
-Type iddata(IdDataTable *tab): void *@
+Type iddata(const IdDataSpec *idds):   void *@
 Type ulong:                    uint32_t @
 Type long:                     long @
 Type string:                   const char *@
@@ -69,18 +69,25 @@ Table adns Adns_SubCommand
        new-resolver
                ...     obj
                =>      iddata(&adnstcl_resolvers)
+       set-default-resolver
+               res     iddata(&adnstcl_resolvers)
        destroy-resolver
                res     iddata(&adnstcl_resolvers)
 
-Table maskmap MaskMap_SubCommand
+Table addrmap AddrMap_SubCommand
        lookup
-               map     constv(&maskmap_type)
+               map     constv(&addrmap_type)
                addr    hb
                ?def    obj
                =>      obj
-       amend
-               map     maskmapv
-               prefix  obj
+       amend-range
+               map     addrmapv
+               start   hb
+               end     hb
+               data    obj
+       amend-mask
+               map     addrmapv
+               prefix  hb
                preflen obj
                data    obj
 
@@ -216,8 +223,8 @@ Table hbytes HBytes_SubCommand
                prop    enum(HashAlgPropInfo, "prop")
                alg     enum(HashAlgInfo, "alg")
                =>      int
-       mask-map
-               subcmd  enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+       addr-map
+               subcmd  enum(AddrMap_SubCommand, "hbytes addr-map subcommand")
                ...     obj
 
 Table padmethodinfo PadMethodInfo