mask-map amend implemented, but untested

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

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index f8d44ef0d2c592c03fabf613b8a1269747104f8b..9165827456f282900c00e23fafc350860a70cfd6 100644 (file)
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -2,8 +2,14 @@ Type hb:                       HBytes_Value @
 Init hb                                hbytes_sentinel(&@);
 
 Type hbv:                      HBytes_Var @
 Init hb                                hbytes_sentinel(&@);
 
 Type hbv:                      HBytes_Var @

-Init hbv                       @.hb=0; @.obj=0; @.var=0; @.copied=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 sockaddr:                 SockAddr_Value @
 Init sockaddr                  sockaddr_clear(&@);


@@ -13,6 +19,8 @@ Type ulong:                   uint32_t @
 Type long:                     long @
 Type string:                   const char *@
 
 Type long:                     long @
 Type string:                   const char *@
 

+Type charfrom(const char *opts, const char *what):     int
+

 H-Include      "hbytes.h"
 
 Table toplevel TopLevel_Command
 H-Include      "hbytes.h"
 
 Table toplevel TopLevel_Command


@@ -29,6 +37,18 @@ Table toplevel TopLevel_Command
                subcmd  enum(ULong_SubCommand,"ulong subcommand")
                ...     obj
 
                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
 Table ulong ULong_SubCommand
        ul2int
                v       ulong


@@ -161,6 +181,9 @@ Table hbytes HBytes_SubCommand
                prop    enum(HashAlgPropInfo, "prop")
                alg     enum(HashAlgInfo, "alg")
                =>      int
                prop    enum(HashAlgPropInfo, "prop")
                alg     enum(HashAlgInfo, "alg")
                =>      int

+       mask-map
+               subcmd  enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+               ...     obj

 
 Table padmethodinfo PadMethodInfo
        pkcs5
 
 Table padmethodinfo PadMethodInfo
        pkcs5