diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2022-05-12 13:08:53 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2022-05-12 13:10:41 +0000 |
| commit | 40908d8bebbc5f3757e771592d477196b1910ab1 (patch) | |
| tree | afb4b82d5ad314744b48c3ea2beea697991a5229 | |
| parent | f807b952e2a0d1264f290387d4b81e6974d559fb (diff) | |
devel/tcllib: update to 1.21
Release notes: https://core.tcl-lang.org/tcllib/technote/7a047636411e
| -rw-r--r-- | devel/tcllib/Makefile | 2 | ||||
| -rw-r--r-- | devel/tcllib/distinfo | 6 | ||||
| -rw-r--r-- | devel/tcllib/files/patch-warnings | 1632 | ||||
| -rw-r--r-- | devel/tcllib/pkg-plist | 102 |
4 files changed, 743 insertions, 999 deletions
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index 04b896389cbb..1bdfdd552a70 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -1,7 +1,7 @@ # Created by: Mikhail Teterin <mi@aldan.algebra.com> PORTNAME= tcllib -PORTVERSION= 1.20 +PORTVERSION= 1.21 CATEGORIES= devel tcl MASTER_SITES= https://core.tcl.tk/tcllib/uv/ diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo index e2ff96cafc8d..e7b82e3fbe82 100644 --- a/devel/tcllib/distinfo +++ b/devel/tcllib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575275009 -SHA256 (tcllib-1.20.tar.xz) = 199e8ec7ee26220e8463bc84dd55c44965fc8ef4d4ac6e4684b2b1c03b1bd5b9 -SIZE (tcllib-1.20.tar.xz) = 6692664 +TIMESTAMP = 1652338359 +SHA256 (tcllib-1.21.tar.xz) = 10c7749e30fdd6092251930e8a1aa289b193a3b7f1abf17fee1d4fa89814762f +SIZE (tcllib-1.21.tar.xz) = 6467488 diff --git a/devel/tcllib/files/patch-warnings b/devel/tcllib/files/patch-warnings index 38276e544816..dcbbf3bf52d9 100644 --- a/devel/tcllib/files/patch-warnings +++ b/devel/tcllib/files/patch-warnings @@ -1,6 +1,17 @@ ---- modules/md5/md5.c.orig 2016-02-04 05:14:14 UTC -+++ modules/md5/md5.c -@@ -115,7 +115,7 @@ MD5_CTX *mdContext; +--- ./modules/rc4/rc4c.tcl.orig 2021-10-28 21:08:34.000000000 +0000 ++++ ./modules/rc4/rc4c.tcl 2022-05-12 07:00:35.590698000 +0000 +@@ -20,6 +20,8 @@ + namespace eval ::rc4 { + + critcl::ccode { ++ #include <string.h> ++ + #include <string.h> + + typedef struct RC4_CTX { +--- ./modules/md5/md5.c.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/md5/md5.c 2022-05-12 07:00:35.560242000 +0000 +@@ -115,7 +115,7 @@ in the message whose digest is being computed. */ void MD5Update (mdContext, inBuf, inLen) @@ -9,9 +20,9 @@ unsigned int inLen; { register int i, ii; ---- modules/md5/md5.h.orig 2016-02-04 05:14:14 UTC -+++ modules/md5/md5.h -@@ -59,7 +59,7 @@ typedef struct { +--- ./modules/md5/md5.h.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/md5/md5.h 2022-05-12 07:00:35.560779000 +0000 +@@ -59,7 +59,7 @@ } MD5_CTX; void MD5Init (MD5_CTX *mdContext); @@ -20,9 +31,402 @@ void MD5Final (unsigned char digest[16], MD5_CTX *mdContext); void Transform (UINT4 *buf, UINT4 *in); ---- modules/md5crypt/md5cryptc.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/md5crypt/md5cryptc.tcl -@@ -57,8 +57,9 @@ namespace eval ::md5crypt { +--- ./modules/struct/tree/ms.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/tree/ms.c 2022-05-12 07:00:40.010342000 +0000 +@@ -312,7 +312,7 @@ + M_NODES, M_NUMCHILDREN, M_PARENT, M_PREVIOUS, M_RENAME, + M_ROOTNAME, M_SERIALIZE, M_SET, M_SIZE, M_SPLICE, + M_SWAP, M_UNSET, M_WALK, M_WALKPROC +- }; ++ } method; + + if (objc < 2) { + Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); +@@ -326,7 +326,7 @@ + * the requested functionality + */ + +- switch (m) { ++ switch (method = m) { + case M_TASSIGN: return tm_TASSIGN (t, interp, objc, objv); + case M_TSET: return tm_TSET (t, interp, objc, objv); + case M_ANCESTORS: return tm_ANCESTORS (t, interp, objc, objv); +--- ./modules/struct/tree/util.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/tree/util.c 2022-05-12 07:00:40.012345000 +0000 +@@ -77,7 +77,7 @@ + /* Delete all items in the list. + */ + +-void* ++void + nlq_clear (NLQ* q) + { + NL* next; +--- ./modules/struct/tree/util.h.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/tree/util.h 2022-05-12 07:00:40.012741000 +0000 +@@ -52,7 +52,7 @@ + void nlq_append (NLQ* q, void* n); + void nlq_push (NLQ* q, void* n); + void* nlq_pop (NLQ* q); +-void* nlq_clear (NLQ* q); ++void nlq_clear (NLQ* q); + + #endif /* _UTIL_H */ + +--- ./modules/struct/tree/walk.c.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/struct/tree/walk.c 2022-05-12 07:00:40.013310000 +0000 +@@ -1,8 +1,9 @@ + ++#include <stdint.h> + #include <string.h> +-#include "tcl.h" +-#include <t.h> +-#include <util.h> ++#include <tcl.h> ++#include "t.h" ++#include "util.h" + + /* .................................................. */ + +--- ./modules/struct/sets/m.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/sets/m.c 2022-05-12 07:00:40.005832000 +0000 +@@ -80,7 +80,7 @@ + s_get (interp, val, &vs); + } + +- (void*) Tcl_CreateHashEntry(&vs->el, key, &new); ++ Tcl_CreateHashEntry(&vs->el, key, &new); + nx = 1; + } + if (nx) { +--- ./modules/struct/sets/s.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/sets/s.c 2022-05-12 07:00:40.006303000 +0000 +@@ -293,7 +293,7 @@ + if (Tcl_FindHashEntry (&b->el, key) != NULL) continue; + /* key is in a, not in b <=> in (a-b) */ + +- (void*) Tcl_CreateHashEntry(&s->el, key, &new); ++ Tcl_CreateHashEntry(&s->el, key, &new); + } + + return s; +@@ -329,7 +329,7 @@ + if (Tcl_FindHashEntry (&b->el, key) == NULL) continue; + /* key is in a, in b <=> in (a*b) */ + +- (void*) Tcl_CreateHashEntry(&s->el, key, &new); ++ Tcl_CreateHashEntry(&s->el, key, &new); + } + + return s; +@@ -365,7 +365,7 @@ + he != NULL; + he = Tcl_NextHashEntry(&hs)) { + key = Tcl_GetHashKey (&b->el, he); +- (void*) Tcl_CreateHashEntry(&a->el, key, &new); ++ Tcl_CreateHashEntry(&a->el, key, &new); + if (new) {nx = 1;} + } + } +@@ -377,7 +377,7 @@ + { + int new; + +- (void*) Tcl_CreateHashEntry(&a->el, item, &new); ++ Tcl_CreateHashEntry(&a->el, item, &new); + } + + void +--- ./modules/struct/graph/ds.h.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/graph/ds.h 2022-05-12 07:00:35.592738000 +0000 +@@ -160,7 +160,7 @@ + */ + + typedef struct GG { +- long int counter; /* Graph id generator */ ++ size_t counter; /* Graph id generator */ + char buf [50]; /* Buffer for handle construction */ + } GG; + +--- ./modules/struct/graph/filter.c.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/struct/graph/filter.c 2022-05-12 07:00:35.593586000 +0000 +@@ -261,13 +261,12 @@ + (na->mode == NA_NONE)) { + filter_none (interp, gx, &l); + } else { +- if (na->mode != NA_NONE) { +- if (nodes) { +- filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g); +- } else { +- filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g); +- } ++ if (nodes) { ++ filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g); ++ } else { ++ filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g); + } ++ + if (na->key && na->value) { + filter_kv (interp, gx, &l, gf, g, na->key, na->value); + } else if (na->key) { +@@ -332,6 +331,7 @@ + case NA_IN: filter_mode_a_in (gx, l, nc, nv, g); break; + case NA_INNER: filter_mode_a_inn (gx, l, nc, nv, g); break; + case NA_OUT: filter_mode_a_out (gx, l, nc, nv, g); break; ++ case NA_NONE: /* nothing */; + } + } + +@@ -592,6 +592,7 @@ + case NA_IN: filter_mode_n_in (gx, l, nc, nv, g); break; + case NA_INNER: filter_mode_n_inn (gx, l, nc, nv, g); break; + case NA_OUT: filter_mode_n_out (gx, l, nc, nv, g); break; ++ case NA_NONE: /* nothing */; + } + } + +--- ./modules/struct/graph/graph.c.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/struct/graph/graph.c 2022-05-12 07:00:35.594881000 +0000 +@@ -2,12 +2,13 @@ + * (c) Graph functions + */ + +-#include <arc.h> +-#include <attr.h> +-#include <graph.h> +-#include <node.h> +-#include <objcmd.h> +-#include <util.h> ++#include <stdint.h> ++#include "arc.h" ++#include "attr.h" ++#include "graph.h" ++#include "node.h" ++#include "objcmd.h" ++#include "util.h" + + /* .................................................. */ + +--- ./modules/struct/graph/objcmd.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/graph/objcmd.c 2022-05-12 07:00:40.002398000 +0000 +@@ -40,7 +40,7 @@ + M_DESTROY, M_GET, M_GETALL, M_KEYEXISTS, M_KEYS, M_LAPPEND, + M_NODE, M_NODES, M_SERIALIZE, M_SET, M_SWAP, M_UNSET, + M_WALK +- }; ++ } method; + + static CONST char* a_methods [] = { + "append", "attr", "delete", "exists", "flip", +@@ -57,7 +57,7 @@ + MA_MOVE_SOURCE, MA_MOVE_TARGET, MA_NODES, MA_RENAME, MA_SET, MA_SETUNWEIGHTED, + MA_SETWEIGHT, MA_SOURCE, MA_TARGET, MA_UNSET, MA_UNSETWEIGHT, + MA_WEIGHTS +- }; ++ } a_method; + + static CONST char* n_methods [] = { + "append", "attr", "degree", "delete", "exists", +@@ -69,7 +69,7 @@ + MN_APPEND, MN_ATTR, MN_DEGREE, MN_DELETE, MN_EXISTS, + MN_GET, MN_GETALL, MN_INSERT, MN_KEYEXISTS, MN_KEYS, + MN_LAPPEND, MN_OPPOSITE, MN_RENAME, MN_SET, MN_UNSET +- }; ++ } n_method; + + if (objc < 2) { + Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); +@@ -83,7 +83,7 @@ + * the requested functionality + */ + +- switch (m) { ++ switch (method = m) { + case M_GSET: return gm_GSET (g, interp, objc, objv); + case M_GASSIGN: return gm_GASSIGN (g, interp, objc, objv); + case M_APPEND: return gm_APPEND (g, interp, objc, objv); +@@ -95,7 +95,7 @@ + 0, &m) != TCL_OK) { + return TCL_ERROR; + } +- switch (m) { ++ switch (a_method = m) { + case MA_APPEND: return gm_arc_APPEND (g, interp, objc, objv); + case MA_ATTR: return gm_arc_ATTR (g, interp, objc, objv); + case MA_DELETE: return gm_arc_DELETE (g, interp, objc, objv); +@@ -141,7 +141,7 @@ + 0, &m) != TCL_OK) { + return TCL_ERROR; + } +- switch (m) { ++ switch (n_method = m) { + case MN_APPEND: return gm_node_APPEND (g, interp, objc, objv); + case MN_ATTR: return gm_node_ATTR (g, interp, objc, objv); + case MN_DEGREE: return gm_node_DEGREE (g, interp, objc, objv); +--- ./modules/struct/graph/util.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/graph/util.c 2022-05-12 07:00:40.002840000 +0000 +@@ -77,7 +77,7 @@ + /* Delete all items in the list. + */ + +-void* ++void + g_nlq_clear (NLQ* q) + { + NL* next; +--- ./modules/struct/graph/util.h.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/graph/util.h 2022-05-12 07:00:40.003195000 +0000 +@@ -53,7 +53,7 @@ + void g_nlq_append (NLQ* q, void* n); + void g_nlq_push (NLQ* q, void* n); + void* g_nlq_pop (NLQ* q); +-void* g_nlq_clear (NLQ* q); ++void g_nlq_clear (NLQ* q); + + #endif /* _G_UTIL_H */ + +--- ./modules/struct/graph/walk.c.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/struct/graph/walk.c 2022-05-12 07:00:40.003767000 +0000 +@@ -1,9 +1,9 @@ + +-#include "tcl.h" + #include <string.h> +-#include <graph.h> +-#include <util.h> +-#include <walk.h> ++#include <tcl.h> ++#include "graph.h" ++#include "util.h" ++#include "walk.h" + + /* .................................................. */ + +@@ -23,7 +23,7 @@ + static int walk_invoke (Tcl_Interp* interp, GN* n, + int cc, Tcl_Obj** ev, Tcl_Obj* action); + +-static int walk_neighbours (GN* n, Tcl_HashTable* v, int dir, ++static void walk_neighbours (GN* n, Tcl_HashTable* v, int dir, + int* nc, GN*** nv); + + /* .................................................. */ +@@ -288,7 +288,7 @@ + + /* .................................................. */ + +-static int ++static void + walk_neighbours (GN* n, Tcl_HashTable* vn, int dir, + int* nc, GN*** nv) + { +--- ./modules/struct/queue/ms.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/queue/ms.c 2022-05-12 07:00:40.004897000 +0000 +@@ -41,7 +41,7 @@ + M_CLEAR, M_DESTROY, M_GET, + M_PEEK, M_PUT, M_SIZE, + M_UNGET +- }; ++ } method; + + if (objc < 2) { + Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); +@@ -55,7 +55,7 @@ + * the requested functionality + */ + +- switch (m) { ++ switch (method = m) { + case M_CLEAR: return qum_CLEAR (q, interp, objc, objv); + case M_DESTROY: return qum_DESTROY (q, interp, objc, objv); + case M_GET: return qum_PEEK (q, interp, objc, objv, 1 /* get */); +--- ./modules/struct/stack/ms.c.orig 2019-08-23 04:55:09.000000000 +0000 ++++ ./modules/struct/stack/ms.c 2022-05-12 07:00:40.007279000 +0000 +@@ -39,7 +39,7 @@ + enum methods { + M_CLEAR, M_DESTROY, M_GET, M_GETR, M_PEEK, M_PEEKR, + M_POP, M_PUSH, M_ROTATE, M_SIZE, M_TRIM, M_TRIMV +- }; ++ } method; + + if (objc < 2) { + Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); +@@ -53,7 +53,7 @@ + * the requested functionality + */ + +- switch (m) { ++ switch (method = m) { + case M_CLEAR: return stm_CLEAR (s, interp, objc, objv); + case M_DESTROY: return stm_DESTROY (s, interp, objc, objv); + case M_GET: return stm_GET (s, interp, objc, objv, 0 ); /* get */ +--- ./modules/struct/queue_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000 ++++ ./modules/struct/queue_c.tcl 2022-05-12 07:00:40.004223000 +0000 +@@ -35,7 +35,7 @@ + */ + + typedef struct QDg { +- long int counter; ++ size_t counter; + char buf [50]; + } QDg; + +--- ./modules/struct/sets_c.tcl.orig 2021-10-28 20:35:34.000000000 +0000 ++++ ./modules/struct/sets_c.tcl 2022-05-12 07:00:40.005270000 +0000 +@@ -53,7 +53,7 @@ + S_equal,S_exclude, S_include, S_intersect, + S_intersect3, S_size, S_subsetof, S_subtract, + S_symdiff, S_union +- }; ++ } method; + + int m; + +@@ -69,7 +69,7 @@ + * the requested functionality + */ + +- switch (m) { ++ switch (method = m) { + case S_add: return sm_ADD (NULL, interp, objc, objv); + case S_contains: return sm_CONTAINS (NULL, interp, objc, objv); + case S_difference: return sm_DIFFERENCE (NULL, interp, objc, objv); +--- ./modules/struct/stack_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000 ++++ ./modules/struct/stack_c.tcl 2022-05-12 07:00:40.006760000 +0000 +@@ -40,7 +40,7 @@ + */ + + typedef struct SDg { +- long int counter; ++ size_t counter; + char buf [50]; + } SDg; + +--- ./modules/struct/tree_c.tcl.orig 2021-10-28 21:08:34.000000000 +0000 ++++ ./modules/struct/tree_c.tcl 2022-05-12 07:00:40.007725000 +0000 +@@ -41,7 +41,7 @@ + */ + + typedef struct TDg { +- long int counter; ++ size_t counter; + char buf [50]; + } TDg; + +--- ./modules/sha1/sha1c.tcl.orig 2022-05-03 18:53:00.000000000 +0000 ++++ ./modules/sha1/sha1c.tcl 2022-05-12 07:00:35.591089000 +0000 +@@ -32,8 +32,7 @@ + static void + sha1_free_rep(Tcl_Obj* obj) + { +- SHA1_CTX* mp = (SHA1_CTX*) obj->internalRep.otherValuePtr; +- Tcl_Free ((char*)mp); ++ Tcl_Free(obj->internalRep.otherValuePtr); + } + + static void +--- ./modules/md5crypt/md5cryptc.tcl.orig 2021-10-28 21:08:52.000000000 +0000 ++++ ./modules/md5crypt/md5cryptc.tcl 2022-05-12 07:00:35.561245000 +0000 +@@ -57,8 +57,9 @@ const char *salt, const char *magic) { @@ -34,7 +438,7 @@ unsigned char final[16]; int sl,pl,i; MD5_CTX ctx,ctx1; -@@ -113,7 +114,7 @@ namespace eval ::md5crypt { +@@ -113,7 +114,7 @@ } /* Now make the output string */ @@ -43,7 +447,7 @@ sl, (const char *)sp); MD5Final(final,&ctx); -@@ -143,8 +144,6 @@ namespace eval ::md5crypt { +@@ -143,8 +144,6 @@ MD5Final(final,&ctx1); } @@ -52,140 +456,8 @@ l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4; l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4; l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4; ---- modules/pt/pt_cparam_config_critcl.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/pt_cparam_config_critcl.tcl -@@ -114,6 +114,8 @@ proc ::pt::cparam::configuration::critcl - critcl::ccode { - /* -*- c -*- */ - -+ #include <stdint.h> -+ #include <stdlib.h> - #include <string.h> - #define SCOPE static - ---- modules/pt/pt_cparam_config_tea.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/pt_cparam_config_tea.tcl -@@ -94,6 +94,7 @@ proc ::pt::cparam::configuration::tea::d - * * ** *** ***** ******** ************* *********************/ - #include <string.h> - #include <tcl.h> -+ #include <stdint.h> - #include <stdlib.h> - #include <ctype.h> - #define SCOPE static ---- modules/pt/pt_parse_peg_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/pt_parse_peg_c.tcl -@@ -45,6 +45,8 @@ namespace eval ::pt::parse { - critcl::ccode { - /* -*- c -*- */ - -+ #include <stdint.h> -+ #include <stdlib.h> - #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::pt::parse { - p->ER->loc = p->CL; - p->ER->msg = rde_stack_new (NULL); - ASSERT_BOUNDS(s,p->numstr); -- rde_stack_push (p->ER->msg, (void*) s); -+ rde_stack_push (p->ER->msg, (void*)(intptr_t)s); - } - static void - error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::pt::parse { - hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); - if (!hPtr) { return 0; } - tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); -- hPtr = Tcl_FindHashEntry (tablePtr, (char*) s); -+ hPtr = Tcl_FindHashEntry (tablePtr, (void *)(intptr_t)s); - if (!hPtr) { return 0; } - - scs = Tcl_GetHashValue (hPtr); -@@ -1002,7 +1004,7 @@ namespace eval ::pt::parse { - SCOPE void - rde_param_i_symbol_save (RDE_PARAM p, long int s) - { -- long int at = (long int) rde_stack_top (p->LS); -+ intptr_t at = (intptr_t)rde_stack_top (p->LS); - NC_STATE* scs; - Tcl_HashEntry* hPtr; - Tcl_HashTable* tablePtr; -@@ -1011,7 +1013,7 @@ namespace eval ::pt::parse { - TRACE (("RDE_PARAM %p",p)); - TRACE (("INT %d",s)); - -- hPtr = Tcl_CreateHashEntry (&p->NC, (char*) at, &isnew); -+ hPtr = Tcl_CreateHashEntry (&p->NC, (void*) at, &isnew); - if (isnew) { - tablePtr = ALLOC (Tcl_HashTable); - Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::pt::parse { - } else { - tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); - } -- hPtr = Tcl_CreateHashEntry (tablePtr, (char*) s, &isnew); -+ hPtr = Tcl_CreateHashEntry (tablePtr, (void*)(intptr_t)s, &isnew); - if (isnew) { - - scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::pt::parse { - static int - UniCharIsHexDigit (int character) - { -- return (character >= 0) && (character < 0x80) && isxdigit(character); -+ return UniCharIsDecDigit(character) || -+ (character >= 'a' && character <= 'f') || -+ (character >= 'A' && character <= 'F'); - } - static int - UniCharIsDecDigit (int character) - { -- return (character >= 0) && (character < 0x80) && isdigit(character); -+ return (character >= '0') && (character <= '9'); - } - SCOPE void - rde_param_i_value_clear (RDE_PARAM p) -@@ -4727,7 +4731,7 @@ namespace eval ::pt::parse { - /* -*- c -*- */ - - typedef struct PARSERg { -- long int counter; -+ size_t counter; - char buf [50]; - } PARSERg; - -@@ -4755,7 +4759,7 @@ namespace eval ::pt::parse { - } - - parserg->counter ++; -- sprintf (parserg->buf, "peg%ld", parserg->counter); -+ sprintf (parserg->buf, "peg%td", parserg->counter); - return parserg->buf; - #undef KEY - } ---- modules/pt/pt_rdengine_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/pt_rdengine_c.tcl -@@ -48,7 +48,7 @@ namespace eval ::pt { - */ - - typedef struct PARAMg { -- long int counter; -+ size_t counter; - char buf [50]; - } PARAMg; - -@@ -76,7 +76,7 @@ namespace eval ::pt { - } - - paramg->counter ++; -- sprintf (paramg->buf, "rde%ld", paramg->counter); -+ sprintf (paramg->buf, "rde%td", paramg->counter); - return paramg->buf; - - #undef KEY ---- modules/pt/rde_critcl/p.c.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/rde_critcl/p.c +--- ./modules/pt/rde_critcl/p.c.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/rde_critcl/p.c 2022-05-12 07:00:35.565397000 +0000 @@ -2,9 +2,10 @@ * (c) PARAM functions */ @@ -199,7 +471,7 @@ /* .................................................. */ -@@ -132,7 +133,7 @@ param_intern (RDE_STATE p, const char* l +@@ -132,7 +133,7 @@ hPtr = Tcl_CreateHashEntry(&p->str, literal, &isnew); ASSERT (isnew, "Should have found entry"); @@ -208,27 +480,9 @@ if (p->numstr >= p->maxnum) { long int new; ---- modules/pt/rde_critcl/param.c.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/rde_critcl/param.c -@@ -3,11 +3,13 @@ - * == pt::rde (critcl) - Data Structures - PARAM architectural state. - */ - --#include <param.h> /* Public and private APIs */ --#include <stack.h> /* Stack handling */ --#include <tc.h> /* Token cache handling */ --#include <util.h> /* Allocation utilities */ -+#include <stdint.h> -+#include <stdlib.h> - #include <string.h> -+#include "param.h" /* Public and private APIs */ -+#include "stack.h" /* Stack handling */ -+#include "tc.h" /* Token cache handling */ -+#include "util.h" /* Allocation utilities */ - - /* - * = = == === ===== ======== ============= ===================== -@@ -670,7 +672,7 @@ error_set (RDE_PARAM p, long int s) +--- ./modules/pt/rde_critcl/param.c.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/rde_critcl/param.c 2022-05-12 07:00:35.566472000 +0000 +@@ -672,7 +672,7 @@ ASSERT_BOUNDS(s,p->numstr); @@ -237,7 +491,7 @@ } static void -@@ -820,7 +822,7 @@ rde_param_i_symbol_restore (RDE_PARAM p, +@@ -822,7 +822,7 @@ if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -246,7 +500,7 @@ if (!hPtr) { return 0; } /* -@@ -861,7 +863,7 @@ rde_param_i_symbol_save (RDE_PARAM p, lo +@@ -863,7 +863,7 @@ * 2-level hash table keyed by location, and symbol ... */ @@ -255,7 +509,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); -@@ -871,7 +873,7 @@ rde_param_i_symbol_save (RDE_PARAM p, lo +@@ -873,7 +873,7 @@ tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -264,7 +518,7 @@ if (isnew) { /* -@@ -1071,13 +1073,15 @@ UniCharIsAscii (int character) +@@ -1073,13 +1073,15 @@ static int UniCharIsHexDigit (int character) { @@ -282,8 +536,8 @@ } /* ---- modules/pt/rde_critcl/param.h.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/rde_critcl/param.h +--- ./modules/pt/rde_critcl/param.h.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/rde_critcl/param.h 2022-05-12 07:00:35.567038000 +0000 @@ -9,6 +9,7 @@ #include "tcl.h" #include <util.h> /* Scoping */ @@ -292,18 +546,18 @@ /* * The state structure is opaque, its internals are known only to the ---- modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/0_basic_arithmetic 2022-05-12 07:00:35.568151000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -312,7 +566,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -321,7 +575,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -330,7 +584,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -339,7 +593,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -356,18 +610,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/10_notahead 2022-05-12 07:00:35.569227000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -376,7 +630,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -385,7 +639,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -394,7 +648,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -403,7 +657,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -420,18 +674,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/11_epsilon 2022-05-12 07:00:35.570230000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -440,7 +694,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -449,7 +703,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -458,7 +712,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -467,7 +721,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -484,18 +738,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/1_functions.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/1_functions -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/1_functions.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/1_functions 2022-05-12 07:00:35.571208000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -504,7 +758,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -513,7 +767,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -522,7 +776,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -531,7 +785,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -548,18 +802,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/2_fun_arithmetic.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/2_fun_arithmetic -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/2_fun_arithmetic.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/2_fun_arithmetic 2022-05-12 07:00:35.572295000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -568,7 +822,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -577,7 +831,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -586,7 +840,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -595,7 +849,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -612,18 +866,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/3_peg_itself.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/3_peg_itself -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/3_peg_itself.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/3_peg_itself 2022-05-12 07:00:35.574306000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -632,7 +886,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -641,7 +895,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -650,7 +904,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -659,7 +913,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -676,18 +930,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/4_choice.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/4_choice -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/4_choice.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/4_choice 2022-05-12 07:00:35.575318000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -696,7 +950,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -705,7 +959,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -714,7 +968,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -723,7 +977,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -740,18 +994,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/5_sequence.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/5_sequence -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/5_sequence.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/5_sequence 2022-05-12 07:00:35.576307000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -760,7 +1014,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -769,7 +1023,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -778,7 +1032,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -787,7 +1041,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -804,18 +1058,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/6_optional.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/6_optional -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/6_optional.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/6_optional 2022-05-12 07:00:35.577302000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -824,7 +1078,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -833,7 +1087,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -842,7 +1096,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -851,7 +1105,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -868,18 +1122,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/7_kleene.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/7_kleene -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/7_kleene.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/7_kleene 2022-05-12 07:00:35.578304000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -888,7 +1142,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -897,7 +1151,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -906,7 +1160,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -915,7 +1169,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -932,18 +1186,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/8_pkleene.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/8_pkleene -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/8_pkleene.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/8_pkleene 2022-05-12 07:00:35.579292000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -952,7 +1206,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -961,7 +1215,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -970,7 +1224,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -979,7 +1233,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -996,18 +1250,18 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-critcl/9_ahead.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-critcl/9_ahead -@@ -45,6 +45,8 @@ namespace eval ::PARSER { +--- ./modules/pt/tests/data/ok/peg_cparam-critcl/9_ahead.orig 2021-04-14 16:57:28.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-critcl/9_ahead 2022-05-12 07:00:35.580250000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { /* -*- c -*- */ + #include <stdint.h> + #include <stdlib.h> #include <string.h> - #define SCOPE static - -@@ -896,7 +898,7 @@ namespace eval ::PARSER { + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ p->ER->loc = p->CL; p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1016,7 +1270,7 @@ } static void error_state_free (void* esx) -@@ -986,7 +988,7 @@ namespace eval ::PARSER { +@@ -988,7 +990,7 @@ hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); if (!hPtr) { return 0; } tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); @@ -1025,7 +1279,7 @@ if (!hPtr) { return 0; } scs = Tcl_GetHashValue (hPtr); -@@ -1011,7 +1013,7 @@ namespace eval ::PARSER { +@@ -1013,7 +1015,7 @@ TRACE (("RDE_PARAM %p",p)); TRACE (("INT %d",s)); @@ -1034,7 +1288,7 @@ if (isnew) { tablePtr = ALLOC (Tcl_HashTable); Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); -@@ -1019,7 +1021,7 @@ namespace eval ::PARSER { +@@ -1021,7 +1023,7 @@ } else { tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } @@ -1043,7 +1297,7 @@ if (isnew) { scs = ALLOC (NC_STATE); -@@ -1169,12 +1171,14 @@ namespace eval ::PARSER { +@@ -1171,12 +1173,14 @@ static int UniCharIsHexDigit (int character) { @@ -1060,8 +1314,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/0_basic_arithmetic.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/0_basic_arithmetic +--- ./modules/pt/tests/data/ok/peg_cparam-tea/0_basic_arithmetic.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/0_basic_arithmetic 2022-05-12 07:00:35.581083000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1123,8 +1377,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/10_notahead.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/10_notahead +--- ./modules/pt/tests/data/ok/peg_cparam-tea/10_notahead.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/10_notahead 2022-05-12 07:00:35.581868000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1186,8 +1440,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/11_epsilon.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/11_epsilon +--- ./modules/pt/tests/data/ok/peg_cparam-tea/11_epsilon.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/11_epsilon 2022-05-12 07:00:35.582616000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1249,8 +1503,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/1_functions.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/1_functions +--- ./modules/pt/tests/data/ok/peg_cparam-tea/1_functions.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/1_functions 2022-05-12 07:00:35.583374000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1312,8 +1566,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/2_fun_arithmetic.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/2_fun_arithmetic +--- ./modules/pt/tests/data/ok/peg_cparam-tea/2_fun_arithmetic.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/2_fun_arithmetic 2022-05-12 07:00:35.584180000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1375,8 +1629,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/3_peg_itself.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/3_peg_itself +--- ./modules/pt/tests/data/ok/peg_cparam-tea/3_peg_itself.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/3_peg_itself 2022-05-12 07:00:35.585500000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1438,8 +1692,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/4_choice.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/4_choice +--- ./modules/pt/tests/data/ok/peg_cparam-tea/4_choice.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/4_choice 2022-05-12 07:00:35.586272000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1501,8 +1755,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/5_sequence.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/5_sequence +--- ./modules/pt/tests/data/ok/peg_cparam-tea/5_sequence.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/5_sequence 2022-05-12 07:00:35.587104000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1564,8 +1818,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/6_optional.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/6_optional +--- ./modules/pt/tests/data/ok/peg_cparam-tea/6_optional.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/6_optional 2022-05-12 07:00:35.587940000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1627,8 +1881,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/7_kleene.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/7_kleene +--- ./modules/pt/tests/data/ok/peg_cparam-tea/7_kleene.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/7_kleene 2022-05-12 07:00:35.588702000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1690,8 +1944,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/8_pkleene.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/8_pkleene +--- ./modules/pt/tests/data/ok/peg_cparam-tea/8_pkleene.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/8_pkleene 2022-05-12 07:00:35.589498000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1753,8 +2007,8 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/pt/tests/data/ok/peg_cparam-tea/9_ahead.orig 2016-02-04 05:14:14 UTC -+++ modules/pt/tests/data/ok/peg_cparam-tea/9_ahead +--- ./modules/pt/tests/data/ok/peg_cparam-tea/9_ahead.orig 2019-08-23 04:55:08.000000000 +0000 ++++ ./modules/pt/tests/data/ok/peg_cparam-tea/9_ahead 2022-05-12 07:00:35.590270000 +0000 @@ -11,6 +11,7 @@ * * ** *** ***** ******** ************* *********************/ #include <string.h> @@ -1816,663 +2070,135 @@ } SCOPE void rde_param_i_value_clear (RDE_PARAM p) ---- modules/rc4/rc4c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/rc4/rc4c.tcl -@@ -20,6 +20,8 @@ package provide rc4c 1.1.0 - namespace eval ::rc4 { +--- ./modules/pt/pt_cparam_config_critcl.tcl.orig 2021-10-28 21:09:06.000000000 +0000 ++++ ./modules/pt/pt_cparam_config_critcl.tcl 2022-05-12 07:00:35.561832000 +0000 +@@ -114,6 +114,8 @@ + critcl::ccode { + /* -*- c -*- */ ++ #include <stdint.h> ++ #include <stdlib.h> + #include <string.h> + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +--- ./modules/pt/pt_cparam_config_tea.tcl.orig 2021-10-28 21:09:06.000000000 +0000 ++++ ./modules/pt/pt_cparam_config_tea.tcl 2022-05-12 07:00:35.562375000 +0000 +@@ -94,6 +94,7 @@ + * * ** *** ***** ******** ************* *********************/ + #include <string.h> + #include <tcl.h> ++ #include <stdint.h> + #include <stdlib.h> + #include <ctype.h> + #define SCOPE static +--- ./modules/pt/pt_parse_peg_c.tcl.orig 2021-10-28 21:09:06.000000000 +0000 ++++ ./modules/pt/pt_parse_peg_c.tcl 2022-05-12 07:00:35.564420000 +0000 +@@ -45,6 +45,8 @@ critcl::ccode { -+ #include <string.h> -+ - #include <string.h> - - typedef struct RC4_CTX { ---- modules/sha1/sha1c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/sha1/sha1c.tcl -@@ -32,8 +32,7 @@ namespace eval ::sha1 { - static void - sha1_free_rep(Tcl_Obj* obj) - { -- SHA1_CTX* mp = (SHA1_CTX*) obj->internalRep.otherValuePtr; -- Tcl_Free ((char*)mp); -+ Tcl_Free(obj->internalRep.otherValuePtr); - } - - static void ---- modules/struct/graph/arc.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/arc.c -@@ -2,10 +2,11 @@ - * (b) Arc operations. - */ - --#include <arc.h> --#include <attr.h> --#include <graph.h> --#include <util.h> -+#include "arc.h" -+#include "attr.h" -+#include "graph.h" -+#include "nacommon.h" -+#include "util.h" - - /* .................................................. */ - ---- modules/struct/graph/attr.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/attr.c -@@ -2,8 +2,10 @@ - * (c) Graph functions - */ - --#include <attr.h> --#include <util.h> -+#include "attr.h" -+#include "util.h" -+#include <string.h> -+ - - /* .................................................. */ - ---- modules/struct/graph/ds.h.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/ds.h -@@ -160,7 +160,7 @@ typedef struct G { - */ - - typedef struct GG { -- long int counter; /* Graph id generator */ -+ size_t counter; /* Graph id generator */ - char buf [50]; /* Buffer for handle construction */ - } GG; - ---- modules/struct/graph/filter.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/filter.c -@@ -2,9 +2,10 @@ - * (c) Graph functions - */ - --#include <nacommon.h> --#include <util.h> --#include <node.h> -+#include <string.h> -+#include "nacommon.h" -+#include "util.h" -+#include "node.h" - - /* .................................................. */ + /* -*- c -*- */ -@@ -253,13 +254,12 @@ filter_run (NA* na, Tcl_Interp* interp, - (na->mode == NA_NONE)) { - filter_none (interp, gx, &l); - } else { -- if (na->mode != NA_NONE) { -- if (nodes) { -- filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g); -- } else { -- filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g); -- } -+ if (nodes) { -+ filter_mode_n (na->mode, gx, &l, na->nc, na->nv, g); -+ } else { -+ filter_mode_a (na->mode, gx, &l, na->nc, na->nv, g); ++ #include <stdint.h> ++ #include <stdlib.h> + #include <string.h> + #include <ctype.h> /* is... */ + #include <stdlib.h> /* qsort */ +@@ -898,7 +900,7 @@ + p->ER->loc = p->CL; + p->ER->msg = rde_stack_new (NULL); + ASSERT_BOUNDS(s,p->numstr); +- rde_stack_push (p->ER->msg, (void*) s); ++ rde_stack_push (p->ER->msg, (void*)(intptr_t)s); } -+ - if (na->key && na->value) { - filter_kv (interp, gx, &l, gf, g, na->key, na->value); - } else if (na->key) { -@@ -324,6 +324,7 @@ filter_mode_a (NA_MODE mode, GCC* gx, NA - case NA_IN: filter_mode_a_in (gx, l, nc, nv, g); break; - case NA_INNER: filter_mode_a_inn (gx, l, nc, nv, g); break; - case NA_OUT: filter_mode_a_out (gx, l, nc, nv, g); break; -+ case NA_NONE: /* nothing */; - } - } - -@@ -584,6 +585,7 @@ filter_mode_n (NA_MODE mode, GCC* gx, NA - case NA_IN: filter_mode_n_in (gx, l, nc, nv, g); break; - case NA_INNER: filter_mode_n_inn (gx, l, nc, nv, g); break; - case NA_OUT: filter_mode_n_out (gx, l, nc, nv, g); break; -+ case NA_NONE: /* nothing */; - } - } - ---- modules/struct/graph/global.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/global.c -@@ -24,7 +24,7 @@ gg_new (Tcl_Interp* interp) - } + static void + error_state_free (void* esx) +@@ -988,7 +990,7 @@ + hPtr = Tcl_FindHashEntry (&p->NC, (char*) p->CL); + if (!hPtr) { return 0; } + tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); +- hPtr = Tcl_FindHashEntry (tablePtr, (char*) s); ++ hPtr = Tcl_FindHashEntry (tablePtr, (void *)(intptr_t)s); + if (!hPtr) { return 0; } - gg->counter ++; -- sprintf (gg->buf, "graph%d", gg->counter); -+ sprintf (gg->buf, "graph%td", gg->counter); - return gg->buf; - } - ---- modules/struct/graph/graph.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/graph.c -@@ -2,12 +2,13 @@ - * (c) Graph functions - */ - --#include <arc.h> --#include <attr.h> --#include <graph.h> --#include <node.h> --#include <objcmd.h> --#include <util.h> -+#include <stdint.h> -+#include "arc.h" -+#include "attr.h" -+#include "graph.h" -+#include "node.h" -+#include "objcmd.h" -+#include "util.h" - - /* .................................................. */ - -@@ -159,11 +160,11 @@ g_ms_serialize (Tcl_Interp* interp, Tcl_ - if (!n) { - goto abort; + scs = Tcl_GetHashValue (hPtr); +@@ -1004,7 +1006,7 @@ + SCOPE void + rde_param_i_symbol_save (RDE_PARAM p, long int s) + { +- long int at = (long int) rde_stack_top (p->LS); ++ intptr_t at = (intptr_t)rde_stack_top (p->LS); + NC_STATE* scs; + Tcl_HashEntry* hPtr; + Tcl_HashTable* tablePtr; +@@ -1013,7 +1015,7 @@ + TRACE (("RDE_PARAM %p",p)); + TRACE (("INT %d",s)); + +- hPtr = Tcl_CreateHashEntry (&p->NC, (char*) at, &isnew); ++ hPtr = Tcl_CreateHashEntry (&p->NC, (void*) at, &isnew); + if (isnew) { + tablePtr = ALLOC (Tcl_HashTable); + Tcl_InitHashTable (tablePtr, TCL_ONE_WORD_KEYS); +@@ -1021,7 +1023,7 @@ + } else { + tablePtr = (Tcl_HashTable*) Tcl_GetHashValue (hPtr); } -- if (Tcl_FindHashEntry (&cn, (char*) n)) continue; -+ if (Tcl_FindHashEntry (&cn, (void *) n)) continue; - ASSERT_BOUNDS(j, lc-1); -- he = Tcl_CreateHashEntry (&cn, (char*) n, &new); -+ he = Tcl_CreateHashEntry (&cn, (void *) n, &new); - lv [j] = n->base.name; -- Tcl_SetHashValue (he, (ClientData) j); -+ Tcl_SetHashValue (he, (ClientData)(intptr_t)j); - j += 3; - } - lc = j + 1; -@@ -180,7 +181,7 @@ g_ms_serialize (Tcl_Interp* interp, Tcl_ - ASSERT_BOUNDS(j, lc-1); - he = Tcl_CreateHashEntry (&cn, (char*) n, &new); - lv [j] = n->base.name; -- Tcl_SetHashValue (he, (ClientData) j); -+ Tcl_SetHashValue (he, (ClientData)(intptr_t)j); - j += 3; - } - lc = j + 1; ---- modules/struct/graph/methods.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/methods.c -@@ -4,14 +4,16 @@ - * Implementations for all tree methods. - */ - -+#include <ctype.h> - #include <string.h> --#include <arc.h> --#include <graph.h> --#include <methods.h> --#include <nacommon.h> --#include <node.h> --#include <util.h> --#include <walk.h> -+#include "arc.h" -+#include "attr.h" -+#include "graph.h" -+#include "methods.h" -+#include "nacommon.h" -+#include "node.h" -+#include "util.h" -+#include "walk.h" - - /* .................................................. - * Handling of all indices, numeric and 'end-x' forms. Copied straight out of ---- modules/struct/graph/methods.h.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/methods.h -@@ -30,6 +30,7 @@ int gm_arc_APPEND (G* g, Tcl_Interp* - int gm_arc_ATTR (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_DELETE (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_EXISTS (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -+int gm_arc_FLIP (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_GET (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_GETALL (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_GETUNWEIGH (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -@@ -39,6 +40,10 @@ int gm_arc_INSERT (G* g, Tcl_Interp* - int gm_arc_KEYEXISTS (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_KEYS (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_LAPPEND (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -+int gm_arc_MOVE (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -+int gm_arc_MOVE_SRC (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -+int gm_arc_MOVE_TARG (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); -+int gm_arc_NODES (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_RENAME (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_SET (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); - int gm_arc_SETUNWEIGH (G* g, Tcl_Interp* interp, int objc, Tcl_Obj* const* objv); ---- modules/struct/graph/nacommon.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/nacommon.c -@@ -2,9 +2,10 @@ - * (c) Graph functions - */ - --#include <nacommon.h> --#include <util.h> --#include <node.h> -+#include "attr.h" -+#include "nacommon.h" -+#include "util.h" -+#include "node.h" - - /* .................................................. */ - ---- modules/struct/graph/node.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/node.c -@@ -2,9 +2,10 @@ - * (b) Node operations. - */ - --#include <arc.h> --#include <node.h> --#include <util.h> -+#include "nacommon.h" -+#include "arc.h" -+#include "node.h" -+#include "util.h" - - /* .................................................. */ - ---- modules/struct/graph/objcmd.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/objcmd.c -@@ -40,7 +40,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - M_DESTROY, M_GET, M_GETALL, M_KEYEXISTS, M_KEYS, M_LAPPEND, - M_NODE, M_NODES, M_SERIALIZE, M_SET, M_SWAP, M_UNSET, - M_WALK -- }; -+ } method; - - static CONST char* a_methods [] = { - "append", "attr", "delete", "exists", "flip", -@@ -57,7 +57,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - MA_MOVE_SOURCE, MA_MOVE_TARGET, MA_NODES, MA_RENAME, MA_SET, MA_SETUNWEIGHTED, - MA_SETWEIGHT, MA_SOURCE, MA_TARGET, MA_UNSET, MA_UNSETWEIGHT, - MA_WEIGHTS -- }; -+ } a_method; - - static CONST char* n_methods [] = { - "append", "attr", "degree", "delete", "exists", -@@ -69,7 +69,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - MN_APPEND, MN_ATTR, MN_DEGREE, MN_DELETE, MN_EXISTS, - MN_GET, MN_GETALL, MN_INSERT, MN_KEYEXISTS, MN_KEYS, - MN_LAPPEND, MN_OPPOSITE, MN_RENAME, MN_SET, MN_UNSET -- }; -+ } n_method; - - if (objc < 2) { - Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); -@@ -83,7 +83,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - * the requested functionality - */ - -- switch (m) { -+ switch (method = m) { - case M_GSET: return gm_GSET (g, interp, objc, objv); - case M_GASSIGN: return gm_GASSIGN (g, interp, objc, objv); - case M_APPEND: return gm_APPEND (g, interp, objc, objv); -@@ -95,7 +95,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - 0, &m) != TCL_OK) { - return TCL_ERROR; +- hPtr = Tcl_CreateHashEntry (tablePtr, (char*) s, &isnew); ++ hPtr = Tcl_CreateHashEntry (tablePtr, (void*)(intptr_t)s, &isnew); + if (isnew) { + + scs = ALLOC (NC_STATE); +@@ -1171,12 +1173,14 @@ + static int + UniCharIsHexDigit (int character) + { +- return (character >= 0) && (character < 0x80) && isxdigit(character); ++ return UniCharIsDecDigit(character) || ++ (character >= 'a' && character <= 'f') || ++ (character >= 'A' && character <= 'F'); } -- switch (m) { -+ switch (a_method = m) { - case MA_APPEND: return gm_arc_APPEND (g, interp, objc, objv); - case MA_ATTR: return gm_arc_ATTR (g, interp, objc, objv); - case MA_DELETE: return gm_arc_DELETE (g, interp, objc, objv); -@@ -141,7 +141,7 @@ g_objcmd (ClientData cd, Tcl_Interp* int - 0, &m) != TCL_OK) { - return TCL_ERROR; + static int + UniCharIsDecDigit (int character) + { +- return (character >= 0) && (character < 0x80) && isdigit(character); ++ return (character >= '0') && (character <= '9'); } -- switch (m) { -+ switch (n_method = m) { - case MN_APPEND: return gm_node_APPEND (g, interp, objc, objv); - case MN_ATTR: return gm_node_ATTR (g, interp, objc, objv); - case MN_DEGREE: return gm_node_DEGREE (g, interp, objc, objv); ---- modules/struct/graph/util.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/util.c -@@ -77,7 +77,7 @@ g_nlq_pop (NLQ* q) - /* Delete all items in the list. - */ - --void* -+void - g_nlq_clear (NLQ* q) - { - NL* next; ---- modules/struct/graph/util.h.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/util.h -@@ -53,7 +53,7 @@ void g_nlq_init (NLQ* q); - void g_nlq_append (NLQ* q, void* n); - void g_nlq_push (NLQ* q, void* n); - void* g_nlq_pop (NLQ* q); --void* g_nlq_clear (NLQ* q); -+void g_nlq_clear (NLQ* q); - - #endif /* _G_UTIL_H */ - ---- modules/struct/graph/walk.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/graph/walk.c -@@ -1,8 +1,8 @@ -- --#include "tcl.h" --#include <graph.h> --#include <util.h> --#include <walk.h> -+#include <string.h> -+#include <tcl.h> -+#include "graph.h" -+#include "util.h" -+#include "walk.h" - - /* .................................................. */ - -@@ -22,7 +22,7 @@ static int walkbfspre (Tcl_Interp* inte - static int walk_invoke (Tcl_Interp* interp, GN* n, - int cc, Tcl_Obj** ev, Tcl_Obj* action); - --static int walk_neighbours (GN* n, Tcl_HashTable* v, int dir, -+static void walk_neighbours (GN* n, Tcl_HashTable* v, int dir, - int* nc, GN*** nv); - - /* .................................................. */ -@@ -287,7 +287,7 @@ walk_invoke (Tcl_Interp* interp, GN* n, - - /* .................................................. */ - --static int -+static void - walk_neighbours (GN* n, Tcl_HashTable* vn, int dir, - int* nc, GN*** nv) - { ---- modules/struct/queue_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/queue_c.tcl -@@ -35,7 +35,7 @@ namespace eval ::struct { - */ + SCOPE void + rde_param_i_value_clear (RDE_PARAM p) +@@ -4729,7 +4733,7 @@ + /* -*- c -*- */ - typedef struct QDg { + typedef struct PARSERg { - long int counter; -+ size_t counter; - char buf [50]; - } QDg; ++ size_t counter; + char buf [50]; + } PARSERg; -@@ -63,7 +63,7 @@ namespace eval ::struct { +@@ -4757,7 +4761,7 @@ } - - qdg->counter ++; -- sprintf (qdg->buf, "queue%d", qdg->counter); -+ sprintf (qdg->buf, "queue%td", qdg->counter); - return qdg->buf; + parserg->counter ++; +- sprintf (parserg->buf, "peg%ld", parserg->counter); ++ sprintf (parserg->buf, "peg%td", parserg->counter); + return parserg->buf; #undef KEY ---- modules/struct/queue/ms.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/queue/ms.c -@@ -41,7 +41,7 @@ qums_objcmd (ClientData cd, Tcl_Interp* - M_CLEAR, M_DESTROY, M_GET, - M_PEEK, M_PUT, M_SIZE, - M_UNGET -- }; -+ } method; - - if (objc < 2) { - Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); -@@ -55,7 +55,7 @@ qums_objcmd (ClientData cd, Tcl_Interp* - * the requested functionality - */ - -- switch (m) { -+ switch (method = m) { - case M_CLEAR: return qum_CLEAR (q, interp, objc, objv); - case M_DESTROY: return qum_DESTROY (q, interp, objc, objv); - case M_GET: return qum_PEEK (q, interp, objc, objv, 1 /* get */); ---- modules/struct/sets_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/sets_c.tcl -@@ -53,7 +53,7 @@ namespace eval ::struct { - S_equal,S_exclude, S_include, S_intersect, - S_intersect3, S_size, S_subsetof, S_subtract, - S_symdiff, S_union -- }; -+ } method; - - int m; - -@@ -69,7 +69,7 @@ namespace eval ::struct { - * the requested functionality - */ - -- switch (m) { -+ switch (method = m) { - case S_add: return sm_ADD (NULL, interp, objc, objv); - case S_contains: return sm_CONTAINS (NULL, interp, objc, objv); - case S_difference: return sm_DIFFERENCE (NULL, interp, objc, objv); ---- modules/struct/sets/m.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/sets/m.c -@@ -80,7 +80,7 @@ sm_ADD (ClientData clientData, Tcl_Inter - s_get (interp, val, &vs); - } - -- (void*) Tcl_CreateHashEntry(&vs->el, key, &new); -+ Tcl_CreateHashEntry(&vs->el, key, &new); - nx = 1; - } - if (nx) { ---- modules/struct/sets/s.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/sets/s.c -@@ -293,7 +293,7 @@ s_difference (SPtr a, SPtr b) - if (Tcl_FindHashEntry (&b->el, key) != NULL) continue; - /* key is in a, not in b <=> in (a-b) */ - -- (void*) Tcl_CreateHashEntry(&s->el, key, &new); -+ Tcl_CreateHashEntry(&s->el, key, &new); - } - - return s; -@@ -329,7 +329,7 @@ s_intersect (SPtr a, SPtr b) - if (Tcl_FindHashEntry (&b->el, key) == NULL) continue; - /* key is in a, in b <=> in (a*b) */ - -- (void*) Tcl_CreateHashEntry(&s->el, key, &new); -+ Tcl_CreateHashEntry(&s->el, key, &new); - } - - return s; -@@ -365,7 +365,7 @@ s_add (SPtr a, SPtr b, int* newPtr) - he != NULL; - he = Tcl_NextHashEntry(&hs)) { - key = Tcl_GetHashKey (&b->el, he); -- (void*) Tcl_CreateHashEntry(&a->el, key, &new); -+ Tcl_CreateHashEntry(&a->el, key, &new); - if (new) {nx = 1;} } - } -@@ -377,7 +377,7 @@ s_add1 (SPtr a, const char* item) - { - int new; - -- (void*) Tcl_CreateHashEntry(&a->el, item, &new); -+ Tcl_CreateHashEntry(&a->el, item, &new); - } - - void ---- modules/struct/stack_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/stack_c.tcl -@@ -40,7 +40,7 @@ namespace eval ::struct { +--- ./modules/pt/pt_rdengine_c.tcl.orig 2021-10-28 21:09:06.000000000 +0000 ++++ ./modules/pt/pt_rdengine_c.tcl 2022-05-12 07:00:35.564911000 +0000 +@@ -48,7 +48,7 @@ */ - typedef struct SDg { + typedef struct PARAMg { - long int counter; + size_t counter; - char buf [50]; - } SDg; - -@@ -68,7 +68,7 @@ namespace eval ::struct { - } - - sdg->counter ++; -- sprintf (sdg->buf, "stack%d", sdg->counter); -+ sprintf (sdg->buf, "stack%td", sdg->counter); - return sdg->buf; - - #undef KEY ---- modules/struct/stack/ms.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/stack/ms.c -@@ -39,7 +39,7 @@ stms_objcmd (ClientData cd, Tcl_Interp* - enum methods { - M_CLEAR, M_DESTROY, M_GET, M_GETR, M_PEEK, M_PEEKR, - M_POP, M_PUSH, M_ROTATE, M_SIZE, M_TRIM, M_TRIMV -- }; -+ } method; - - if (objc < 2) { - Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); -@@ -53,7 +53,7 @@ stms_objcmd (ClientData cd, Tcl_Interp* - * the requested functionality - */ - -- switch (m) { -+ switch (method = m) { - case M_CLEAR: return stm_CLEAR (s, interp, objc, objv); - case M_DESTROY: return stm_DESTROY (s, interp, objc, objv); - case M_GET: return stm_GET (s, interp, objc, objv, 0 ); /* get */ ---- modules/struct/tree_c.tcl.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree_c.tcl -@@ -41,7 +41,7 @@ namespace eval ::struct { - */ - - typedef struct TDg { -- long int counter; -+ size_t counter; - char buf [50]; - } TDg; + char buf [50]; + } PARAMg; -@@ -69,7 +69,7 @@ namespace eval ::struct { +@@ -76,7 +76,7 @@ } - tdg->counter ++; -- sprintf (tdg->buf, "tree%d", tdg->counter); -+ sprintf (tdg->buf, "tree%td", tdg->counter); - return tdg->buf; + paramg->counter ++; +- sprintf (paramg->buf, "rde%ld", paramg->counter); ++ sprintf (paramg->buf, "rde%td", paramg->counter); + return paramg->buf; #undef KEY ---- modules/struct/tree/m.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/m.c -@@ -4,6 +4,8 @@ - * Implementations for all tree methods. - */ - -+#include <ctype.h> -+#include <stdint.h> - #include <string.h> - #include "util.h" - #include "m.h" -@@ -18,6 +20,8 @@ - - static int TclGetIntForIndex (Tcl_Interp* interp, Tcl_Obj* objPtr, - int endValue, int* indexPtr); -+static int TclCheckBadOctal (Tcl_Interp *interp, const char *value); -+static int TclFormatInt (char *buffer, long n); - - /* .................................................. */ - -@@ -2545,7 +2549,7 @@ tm_WALKPROC (T* t, Tcl_Interp* interp, i - - res = t_walk (interp, tn, type, order, - t_walk_invokecmd, -- (Tcl_Obj*) cc, (Tcl_Obj*) ev, objv [0]); -+ (void *)(intptr_t)cc, (Tcl_Obj*) ev, objv [0]); - - ckfree ((char*) ev); - return res; ---- modules/struct/tree/ms.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/ms.c -@@ -312,7 +312,7 @@ tms_objcmd (ClientData cd, Tcl_Interp* i - M_NODES, M_NUMCHILDREN, M_PARENT, M_PREVIOUS, M_RENAME, - M_ROOTNAME, M_SERIALIZE, M_SET, M_SIZE, M_SPLICE, - M_SWAP, M_UNSET, M_WALK, M_WALKPROC -- }; -+ } method; - - if (objc < 2) { - Tcl_WrongNumArgs (interp, objc, objv, "option ?arg arg ...?"); -@@ -326,7 +326,7 @@ tms_objcmd (ClientData cd, Tcl_Interp* i - * the requested functionality - */ - -- switch (m) { -+ switch (method = m) { - case M_TASSIGN: return tm_TASSIGN (t, interp, objc, objv); - case M_TSET: return tm_TSET (t, interp, objc, objv); - case M_ANCESTORS: return tm_ANCESTORS (t, interp, objc, objv); ---- modules/struct/tree/t.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/t.c -@@ -2,9 +2,10 @@ - * (c) Tree functions - */ - --#include <t.h> --#include <tn.h> --#include <util.h> -+#include <string.h> -+#include "t.h" -+#include "tn.h" -+#include "util.h" - - /* .................................................. */ - ---- modules/struct/tree/tn.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/tn.c -@@ -2,8 +2,9 @@ - * (b) Node operations. - */ - --#include <tn.h> --#include <util.h> -+#include "t.h" -+#include "tn.h" -+#include "util.h" - - /* .................................................. */ - ---- modules/struct/tree/util.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/util.c -@@ -77,7 +77,7 @@ nlq_pop (NLQ* q) - /* Delete all items in the list. - */ - --void* -+void - nlq_clear (NLQ* q) - { - NL* next; ---- modules/struct/tree/util.h.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/util.h -@@ -52,7 +52,7 @@ void nlq_init (NLQ* q); - void nlq_append (NLQ* q, void* n); - void nlq_push (NLQ* q, void* n); - void* nlq_pop (NLQ* q); --void* nlq_clear (NLQ* q); -+void nlq_clear (NLQ* q); - - #endif /* _UTIL_H */ - ---- modules/struct/tree/walk.c.orig 2016-02-04 05:14:14 UTC -+++ modules/struct/tree/walk.c -@@ -1,8 +1,9 @@ - -+#include <stdint.h> - #include <string.h> --#include "tcl.h" --#include <t.h> --#include <util.h> -+#include <tcl.h> -+#include "t.h" -+#include "util.h" - - /* .................................................. */ - -@@ -237,7 +238,7 @@ t_walk_invokecmd (Tcl_Interp* interp, TN - Tcl_Obj* action) - { - int res; -- int cc = (int) dummy0; -+ int cc = (intptr_t) dummy0; - Tcl_Obj** ev = (Tcl_Obj**) dummy1; /* cc+3 elements */ - - ev [cc] = dummy2; /* Tree */ diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist index 30d6f49c9384..dd5391ea50f8 100644 --- a/devel/tcllib/pkg-plist +++ b/devel/tcllib/pkg-plist @@ -1,4 +1,5 @@ bin/dtplite +bin/mkdoc bin/nns bin/nnsd bin/nnslog @@ -12,18 +13,18 @@ lib/tcllib/0compatibility/p_paths.tcl lib/tcllib/0compatibility/pkgIndex.tcl lib/tcllib/aes/aes.tcl lib/tcllib/aes/pkgIndex.tcl -lib/tcllib/amazon-s3/S3.tcl lib/tcllib/amazon-s3/pkgIndex.tcl +lib/tcllib/amazon-s3/S3.tcl lib/tcllib/amazon-s3/xsxp.tcl lib/tcllib/asn/asn.tcl lib/tcllib/asn/pkgIndex.tcl -lib/tcllib/base32/base32.tcl lib/tcllib/base32/base32_c.tcl lib/tcllib/base32/base32_tcl.tcl +lib/tcllib/base32/base32.tcl lib/tcllib/base32/base32core.tcl -lib/tcllib/base32/base32hex.tcl lib/tcllib/base32/base32hex_c.tcl lib/tcllib/base32/base32hex_tcl.tcl +lib/tcllib/base32/base32hex.tcl lib/tcllib/base32/pkgIndex.tcl lib/tcllib/base64/ascii85.tcl lib/tcllib/base64/base64.tcl @@ -33,10 +34,10 @@ lib/tcllib/base64/uuencode.tcl lib/tcllib/base64/yencode.tcl lib/tcllib/bee/bee.tcl lib/tcllib/bee/pkgIndex.tcl -lib/tcllib/bench/bench.tcl lib/tcllib/bench/bench_read.tcl lib/tcllib/bench/bench_wcsv.tcl lib/tcllib/bench/bench_wtext.tcl +lib/tcllib/bench/bench.tcl lib/tcllib/bench/libbench.tcl lib/tcllib/bench/pkgIndex.tcl lib/tcllib/bibtex/bibtex.tcl @@ -97,16 +98,16 @@ lib/tcllib/dns/msgs/en.msg lib/tcllib/dns/pkgIndex.tcl lib/tcllib/dns/resolv.tcl lib/tcllib/dns/spf.tcl -lib/tcllib/docstrip/docstrip.tcl lib/tcllib/docstrip/docstrip_util.tcl +lib/tcllib/docstrip/docstrip.tcl lib/tcllib/docstrip/pkgIndex.tcl -lib/tcllib/doctools/api.tcl lib/tcllib/doctools/api_idx.tcl lib/tcllib/doctools/api_toc.tcl +lib/tcllib/doctools/api.tcl lib/tcllib/doctools/changelog.tcl -lib/tcllib/doctools/checker.tcl lib/tcllib/doctools/checker_idx.tcl lib/tcllib/doctools/checker_toc.tcl +lib/tcllib/doctools/checker.tcl lib/tcllib/doctools/cvs.tcl lib/tcllib/doctools/docidx.tcl lib/tcllib/doctools/doctoc.tcl @@ -117,7 +118,6 @@ lib/tcllib/doctools/mpformats/_html.tcl.orig lib/tcllib/doctools/mpformats/_idx_common.tcl lib/tcllib/doctools/mpformats/_markdown.tcl lib/tcllib/doctools/mpformats/_nroff.tcl -lib/tcllib/doctools/mpformats/_text.tcl lib/tcllib/doctools/mpformats/_text_bullets.tcl lib/tcllib/doctools/mpformats/_text_ccore.tcl lib/tcllib/doctools/mpformats/_text_cstack.tcl @@ -126,6 +126,7 @@ lib/tcllib/doctools/mpformats/_text_margin.tcl lib/tcllib/doctools/mpformats/_text_para.tcl lib/tcllib/doctools/mpformats/_text_state.tcl lib/tcllib/doctools/mpformats/_text_utils.tcl +lib/tcllib/doctools/mpformats/_text.tcl lib/tcllib/doctools/mpformats/_toc_common.tcl lib/tcllib/doctools/mpformats/_xml.tcl lib/tcllib/doctools/mpformats/_xref.tcl @@ -158,24 +159,24 @@ lib/tcllib/doctools/mpformats/toc.text lib/tcllib/doctools/mpformats/toc.tmml lib/tcllib/doctools/mpformats/toc.wiki lib/tcllib/doctools/pkgIndex.tcl -lib/tcllib/doctools2base/html.tcl lib/tcllib/doctools2base/html_cssdefaults.tcl +lib/tcllib/doctools2base/html.tcl lib/tcllib/doctools2base/msgcat.tcl lib/tcllib/doctools2base/nroff_manmacros.tcl lib/tcllib/doctools2base/pkgIndex.tcl lib/tcllib/doctools2base/tcl_parse.tcl lib/tcllib/doctools2base/text.tcl lib/tcllib/doctools2idx/container.tcl -lib/tcllib/doctools2idx/export.tcl lib/tcllib/doctools2idx/export_docidx.tcl lib/tcllib/doctools2idx/export_html.tcl lib/tcllib/doctools2idx/export_json.tcl lib/tcllib/doctools2idx/export_nroff.tcl lib/tcllib/doctools2idx/export_text.tcl lib/tcllib/doctools2idx/export_wiki.tcl -lib/tcllib/doctools2idx/import.tcl +lib/tcllib/doctools2idx/export.tcl lib/tcllib/doctools2idx/import_docidx.tcl lib/tcllib/doctools2idx/import_json.tcl +lib/tcllib/doctools2idx/import.tcl lib/tcllib/doctools2idx/msgcat_c.tcl lib/tcllib/doctools2idx/msgcat_de.tcl lib/tcllib/doctools2idx/msgcat_en.tcl @@ -184,16 +185,16 @@ lib/tcllib/doctools2idx/parse.tcl lib/tcllib/doctools2idx/pkgIndex.tcl lib/tcllib/doctools2idx/structure.tcl lib/tcllib/doctools2toc/container.tcl -lib/tcllib/doctools2toc/export.tcl lib/tcllib/doctools2toc/export_doctoc.tcl lib/tcllib/doctools2toc/export_html.tcl lib/tcllib/doctools2toc/export_json.tcl lib/tcllib/doctools2toc/export_nroff.tcl lib/tcllib/doctools2toc/export_text.tcl lib/tcllib/doctools2toc/export_wiki.tcl -lib/tcllib/doctools2toc/import.tcl +lib/tcllib/doctools2toc/export.tcl lib/tcllib/doctools2toc/import_doctoc.tcl lib/tcllib/doctools2toc/import_json.tcl +lib/tcllib/doctools2toc/import.tcl lib/tcllib/doctools2toc/msgcat_c.tcl lib/tcllib/doctools2toc/msgcat_de.tcl lib/tcllib/doctools2toc/msgcat_en.tcl @@ -210,8 +211,8 @@ lib/tcllib/fileutil/multiop.tcl lib/tcllib/fileutil/paths.tcl lib/tcllib/fileutil/pkgIndex.tcl lib/tcllib/fileutil/traverse.tcl -lib/tcllib/ftp/ftp.tcl lib/tcllib/ftp/ftp_geturl.tcl +lib/tcllib/ftp/ftp.tcl lib/tcllib/ftp/pkgIndex.tcl lib/tcllib/ftpd/ftpd.tcl lib/tcllib/ftpd/pkgIndex.tcl @@ -239,8 +240,8 @@ lib/tcllib/grammar_me/me_cpucore.tcl lib/tcllib/grammar_me/me_tcl.tcl lib/tcllib/grammar_me/me_util.tcl lib/tcllib/grammar_me/pkgIndex.tcl -lib/tcllib/grammar_peg/peg.tcl lib/tcllib/grammar_peg/peg_interp.tcl +lib/tcllib/grammar_peg/peg.tcl lib/tcllib/grammar_peg/pkgIndex.tcl lib/tcllib/hook/hook.tcl lib/tcllib/hook/pkgIndex.tcl @@ -271,9 +272,9 @@ lib/tcllib/javascript/javascript.tcl lib/tcllib/javascript/pkgIndex.tcl lib/tcllib/jpeg/jpeg.tcl lib/tcllib/jpeg/pkgIndex.tcl -lib/tcllib/json/json.tcl lib/tcllib/json/json_tcl.tcl lib/tcllib/json/json_write.tcl +lib/tcllib/json/json.tcl lib/tcllib/json/jsonc.tcl lib/tcllib/json/pkgIndex.tcl lib/tcllib/lambda/lambda.tcl @@ -290,9 +291,9 @@ lib/tcllib/log/loggerUtils.tcl lib/tcllib/log/msgs/en.msg lib/tcllib/log/pkgIndex.tcl lib/tcllib/map/map_geocode_nominatim.tcl -lib/tcllib/map/map_slippy.tcl lib/tcllib/map/map_slippy_cache.tcl lib/tcllib/map/map_slippy_fetcher.tcl +lib/tcllib/map/map_slippy.tcl lib/tcllib/map/pkgIndex.tcl lib/tcllib/mapproj/mapproj.tcl lib/tcllib/mapproj/pkgIndex.tcl @@ -303,17 +304,22 @@ lib/tcllib/math/bigfloat.tcl lib/tcllib/math/bigfloat2.tcl lib/tcllib/math/bignum.tcl lib/tcllib/math/calculus.tcl +lib/tcllib/math/changepoint.tcl lib/tcllib/math/classic_polyns.tcl lib/tcllib/math/combinatorics.tcl +lib/tcllib/math/combinatoricsExt.tcl lib/tcllib/math/constants.tcl lib/tcllib/math/decimal.tcl lib/tcllib/math/elliptic.tcl lib/tcllib/math/exact.tcl lib/tcllib/math/exponential.tcl +lib/tcllib/math/figurate.tcl +lib/tcllib/math/filtergen.tcl lib/tcllib/math/fourier.tcl lib/tcllib/math/fuzzy.tcl -lib/tcllib/math/geometry.tcl lib/tcllib/math/geometry_circle.tcl +lib/tcllib/math/geometry_ext.tcl +lib/tcllib/math/geometry.tcl lib/tcllib/math/interpolate.tcl lib/tcllib/math/kruskal.tcl lib/tcllib/math/linalg.tcl @@ -330,6 +336,11 @@ lib/tcllib/math/pkgIndex.tcl lib/tcllib/math/plotstat.tcl lib/tcllib/math/polynomials.tcl lib/tcllib/math/primes.tcl +lib/tcllib/math/probopt_diffev.tcl +lib/tcllib/math/probopt_lipo.tcl +lib/tcllib/math/probopt_pso.tcl +lib/tcllib/math/probopt_sce.tcl +lib/tcllib/math/probopt.tcl lib/tcllib/math/qcomplex.tcl lib/tcllib/math/quasirandom.tcl lib/tcllib/math/rational_funcs.tcl @@ -356,6 +367,8 @@ lib/tcllib/md5crypt/pkgIndex.tcl lib/tcllib/mime/mime.tcl lib/tcllib/mime/pkgIndex.tcl lib/tcllib/mime/smtp.tcl +lib/tcllib/mkdoc/mkdoc.tcl +lib/tcllib/mkdoc/pkgIndex.tcl lib/tcllib/multiplexer/multiplexer.tcl lib/tcllib/multiplexer/pkgIndex.tcl lib/tcllib/namespacex/namespacex.tcl @@ -367,8 +380,8 @@ lib/tcllib/nettool/pkgIndex.tcl lib/tcllib/nmea/nmea.tcl lib/tcllib/nmea/pkgIndex.tcl lib/tcllib/nns/common.tcl -lib/tcllib/nns/nns.tcl lib/tcllib/nns/nns_auto.tcl +lib/tcllib/nns/nns.tcl lib/tcllib/nns/pkgIndex.tcl lib/tcllib/nns/server.tcl lib/tcllib/nntp/nntp.tcl @@ -441,9 +454,9 @@ lib/tcllib/png/png.tcl lib/tcllib/pop3/pkgIndex.tcl lib/tcllib/pop3/pop3.tcl lib/tcllib/pop3d/pkgIndex.tcl -lib/tcllib/pop3d/pop3d.tcl lib/tcllib/pop3d/pop3d_dbox.tcl lib/tcllib/pop3d/pop3d_udb.tcl +lib/tcllib/pop3d/pop3d.tcl lib/tcllib/practcl/pkgIndex.tcl lib/tcllib/practcl/practcl.tcl lib/tcllib/processman/pkgIndex.tcl @@ -455,20 +468,20 @@ lib/tcllib/pt/pkgIndex.tcl lib/tcllib/pt/pt_astree.tcl lib/tcllib/pt/pt_cparam_config_critcl.tcl lib/tcllib/pt/pt_cparam_config_tea.tcl -lib/tcllib/pt/pt_parse_peg.tcl lib/tcllib/pt/pt_parse_peg_c.tcl lib/tcllib/pt/pt_parse_peg_tcl.tcl -lib/tcllib/pt/pt_peg_container.tcl +lib/tcllib/pt/pt_parse_peg.tcl lib/tcllib/pt/pt_peg_container_peg.tcl -lib/tcllib/pt/pt_peg_export.tcl +lib/tcllib/pt/pt_peg_container.tcl lib/tcllib/pt/pt_peg_export_container.tcl lib/tcllib/pt/pt_peg_export_json.tcl lib/tcllib/pt/pt_peg_export_peg.tcl +lib/tcllib/pt/pt_peg_export.tcl lib/tcllib/pt/pt_peg_from_json.tcl lib/tcllib/pt/pt_peg_from_peg.tcl -lib/tcllib/pt/pt_peg_import.tcl lib/tcllib/pt/pt_peg_import_json.tcl lib/tcllib/pt/pt_peg_import_peg.tcl +lib/tcllib/pt/pt_peg_import.tcl lib/tcllib/pt/pt_peg_interp.tcl lib/tcllib/pt/pt_peg_op.tcl lib/tcllib/pt/pt_peg_to_container.tcl @@ -481,11 +494,11 @@ lib/tcllib/pt/pt_pegrammar.tcl lib/tcllib/pt/pt_pexpr_op.tcl lib/tcllib/pt/pt_pexpression.tcl lib/tcllib/pt/pt_pgen.tcl -lib/tcllib/pt/pt_rdengine.tcl lib/tcllib/pt/pt_rdengine_c.tcl lib/tcllib/pt/pt_rdengine_nx.tcl lib/tcllib/pt/pt_rdengine_oo.tcl lib/tcllib/pt/pt_rdengine_tcl.tcl +lib/tcllib/pt/pt_rdengine.tcl lib/tcllib/pt/pt_tclparam_config_nx.tcl lib/tcllib/pt/pt_tclparam_config_snit.tcl lib/tcllib/pt/pt_tclparam_config_tcloo.tcl @@ -499,11 +512,11 @@ lib/tcllib/pt/rde_critcl/ot.h lib/tcllib/pt/rde_critcl/p.c lib/tcllib/pt/rde_critcl/p.c.orig lib/tcllib/pt/rde_critcl/p.h -lib/tcllib/pt/rde_critcl/pInt.h lib/tcllib/pt/rde_critcl/param.c lib/tcllib/pt/rde_critcl/param.c.orig lib/tcllib/pt/rde_critcl/param.h lib/tcllib/pt/rde_critcl/param.h.orig +lib/tcllib/pt/rde_critcl/pInt.h lib/tcllib/pt/rde_critcl/stack.c lib/tcllib/pt/rde_critcl/stack.h lib/tcllib/pt/rde_critcl/tc.c @@ -529,9 +542,13 @@ lib/tcllib/sasl/pkgIndex.tcl lib/tcllib/sasl/sasl.tcl lib/tcllib/sasl/scram.tcl lib/tcllib/sha1/pkgIndex.tcl +lib/tcllib/sha1/sha1.c +lib/tcllib/sha1/sha1.h lib/tcllib/sha1/sha1.tcl lib/tcllib/sha1/sha1c.tcl lib/tcllib/sha1/sha1v1.tcl +lib/tcllib/sha1/sha256.c +lib/tcllib/sha1/sha256.h lib/tcllib/sha1/sha256.tcl lib/tcllib/sha1/sha256c.tcl lib/tcllib/simulation/annealing.tcl @@ -540,13 +557,13 @@ lib/tcllib/simulation/pkgIndex.tcl lib/tcllib/simulation/random.tcl lib/tcllib/smtpd/pkgIndex.tcl lib/tcllib/smtpd/smtpd.tcl -lib/tcllib/snit/main1.tcl lib/tcllib/snit/main1_83.tcl +lib/tcllib/snit/main1.tcl lib/tcllib/snit/main2.tcl lib/tcllib/snit/pkgIndex.tcl +lib/tcllib/snit/snit_tcl83_utils.tcl lib/tcllib/snit/snit.tcl lib/tcllib/snit/snit2.tcl -lib/tcllib/snit/snit_tcl83_utils.tcl lib/tcllib/snit/validate.tcl lib/tcllib/soundex/pkgIndex.tcl lib/tcllib/soundex/soundex.tcl @@ -556,50 +573,51 @@ lib/tcllib/stooop/stooop.tcl lib/tcllib/stooop/switched.tcl lib/tcllib/stooop/xifo.tcl lib/tcllib/string/pkgIndex.tcl -lib/tcllib/string/token.tcl lib/tcllib/string/token_shell.tcl +lib/tcllib/string/token.tcl lib/tcllib/stringprep/pkgIndex.tcl -lib/tcllib/stringprep/stringprep.tcl lib/tcllib/stringprep/stringprep_data.tcl -lib/tcllib/stringprep/unicode.tcl +lib/tcllib/stringprep/stringprep.tcl lib/tcllib/stringprep/unicode_data.tcl +lib/tcllib/stringprep/unicode.tcl lib/tcllib/struct/disjointset.tcl -lib/tcllib/struct/graph.tcl -lib/tcllib/struct/graph1.tcl lib/tcllib/struct/graph_c.tcl lib/tcllib/struct/graph_tcl.tcl +lib/tcllib/struct/graph.tcl +lib/tcllib/struct/graph1.tcl lib/tcllib/struct/graphops.tcl lib/tcllib/struct/list.tcl +lib/tcllib/struct/list.test.tcl lib/tcllib/struct/map.tcl lib/tcllib/struct/matrix.tcl lib/tcllib/struct/matrix1.tcl lib/tcllib/struct/pkgIndex.tcl lib/tcllib/struct/pool.tcl lib/tcllib/struct/prioqueue.tcl -lib/tcllib/struct/queue.tcl lib/tcllib/struct/queue_c.tcl lib/tcllib/struct/queue_oo.tcl lib/tcllib/struct/queue_tcl.tcl +lib/tcllib/struct/queue.tcl lib/tcllib/struct/record.tcl -lib/tcllib/struct/sets.tcl lib/tcllib/struct/sets_c.tcl lib/tcllib/struct/sets_tcl.tcl +lib/tcllib/struct/sets.tcl lib/tcllib/struct/skiplist.tcl -lib/tcllib/struct/stack.tcl lib/tcllib/struct/stack_c.tcl lib/tcllib/struct/stack_oo.tcl lib/tcllib/struct/stack_tcl.tcl +lib/tcllib/struct/stack.tcl lib/tcllib/struct/struct.tcl lib/tcllib/struct/struct1.tcl -lib/tcllib/struct/tree.tcl -lib/tcllib/struct/tree1.tcl lib/tcllib/struct/tree_c.tcl lib/tcllib/struct/tree_tcl.tcl +lib/tcllib/struct/tree.tcl +lib/tcllib/struct/tree1.tcl lib/tcllib/tar/pkgIndex.tcl lib/tcllib/tar/tar.tcl lib/tcllib/tepam/pkgIndex.tcl -lib/tcllib/tepam/tepam.tcl lib/tcllib/tepam/tepam_doc_gen.tcl +lib/tcllib/tepam/tepam.tcl lib/tcllib/term/ansi/code.tcl lib/tcllib/term/ansi/code/attr.tcl lib/tcllib/term/ansi/code/ctrl.tcl @@ -628,13 +646,13 @@ lib/tcllib/textutil/textutil.tcl lib/tcllib/textutil/trim.tcl lib/tcllib/textutil/wcswidth.tcl lib/tcllib/tie/pkgIndex.tcl -lib/tcllib/tie/tie.tcl lib/tcllib/tie/tie_array.tcl lib/tcllib/tie/tie_dsource.tcl lib/tcllib/tie/tie_file.tcl lib/tcllib/tie/tie_growfile.tcl lib/tcllib/tie/tie_log.tcl lib/tcllib/tie/tie_rarray.tcl +lib/tcllib/tie/tie.tcl lib/tcllib/tiff/pkgIndex.tcl lib/tcllib/tiff/tiff.tcl lib/tcllib/tool/pkgIndex.tcl @@ -657,8 +675,8 @@ lib/tcllib/try/try.tcl lib/tcllib/udpcluster/pkgIndex.tcl lib/tcllib/udpcluster/udpcluster.tcl lib/tcllib/uev/pkgIndex.tcl -lib/tcllib/uev/uevent.tcl lib/tcllib/uev/uevent_onidle.tcl +lib/tcllib/uev/uevent.tcl lib/tcllib/units/pkgIndex.tcl lib/tcllib/units/units.tcl lib/tcllib/uri/pkgIndex.tcl @@ -718,8 +736,8 @@ lib/tcllib/websocket/websocket.tcl lib/tcllib/wip/pkgIndex.tcl lib/tcllib/wip/wip.tcl lib/tcllib/wip/wip2.tcl -lib/tcllib/yaml/huddle.tcl lib/tcllib/yaml/huddle_types.tcl +lib/tcllib/yaml/huddle.tcl lib/tcllib/yaml/json2huddle.tcl lib/tcllib/yaml/pkgIndex.tcl lib/tcllib/yaml/yaml.tcl |