Another round of -Wconversion warning fixes, see [03cff7a777]

Author: jan.nijtmans

generic/regcomp.c

@@ -64,8 +64,8 @@ static void markst(struct subre *);
 static void cleanst(struct vars *);
 static long nfatree(struct vars *, struct subre *, FILE *);
 static long nfanode(struct vars *, struct subre *, FILE *);
-static int newlacon(struct vars *, struct state *, struct state *, int);
-static void freelacons(struct subre *, int);
+static size_t newlacon(struct vars *, struct state *, struct state *, size_t);
+static void freelacons(struct subre *, size_t);
 static void rfree(regex_t *);
 static void dump(regex_t *, FILE *);
 static void dumpst(struct subre *, FILE *, int);
@@ -789,11 +789,11 @@ parseqatom(
     struct state *s;		/* temporaries for new states */
     struct state *s2;
 #define	ARCV(t, val)	newarc(v->nfa, t, val, lp, rp)
-    int m, n;
+    size_t m, n;
     struct subre *atom;		/* atom's subtree */
     struct subre *t;
     int cap;			/* capturing parens? */
-    int pos;			/* positive lookahead? */
+    size_t pos;			/* positive lookahead? */
     size_t subno;		/* capturing-parens or backref number */
     int atomtype;
     int qprefer;		/* quantifier short/long preference */
@@ -1944,16 +1944,16 @@ nfanode(
 
 /*
  - newlacon - allocate a lookahead-constraint subRE
- ^ static int newlacon(struct vars *, struct state *, struct state *, int);
+ ^ static size_t newlacon(struct vars *, struct state *, struct state *, size_t);
  */
-static int			/* lacon number */
+static size_t		/* lacon number */
 newlacon(
     struct vars *v,
     struct state *begin,
     struct state *end,
-    int pos)
+    size_t pos)
 {
-    int n;
+    size_t n;
     struct subre *newlacons;
     struct subre *sub;
 
@@ -1988,10 +1988,10 @@ newlacon(
 static void
 freelacons(
     struct subre *subs,
-    int n)
+    size_t n)
 {
     struct subre *sub;
-    int i;
+    size_t i;
 
     assert(n > 0);
     for (sub=subs+1, i=n-1; i>0; sub++, i--) {	/* no 0th */
@@ -2135,7 +2135,7 @@ stdump(
 	fprintf(f, " UNUSED");
     }
     if (t->subno != 0) {
-	fprintf(f, " (#%d)", t->subno);
+	fprintf(f, " (#%" TCL_Z_MODIFIER "d)", t->subno);
     }
     if (t->min != 1 || t->max != 1) {
 	fprintf(f, " {%d,", t->min);

generic/regexec.c

@@ -592,7 +592,7 @@ subset(
     chr *const begin,
     chr *const end)
 {
-    int n = sub->subno;
+    size_t n = sub->subno;
 
     assert(n > 0);
     if ((size_t)n >= v->nmatch) {
@@ -874,7 +874,8 @@ cbrdissect(
     chr *begin,		/* beginning of relevant substring */
     chr *end)		/* end of same */
 {
-    int n = t->subno, min = t->min, max = t->max;
+    size_t n = t->subno;
+    int min = t->min, max = t->max;
     size_t numreps;
     size_t tlen;
     size_t brlen;

generic/regguts.h

@@ -364,7 +364,7 @@ struct subre {
 #define	PREF2(f1, f2)	((PREF(f1) != 0) ? PREF(f1) : PREF(f2))
 #define	COMBINE(f1, f2)	(UP((f1)|(f2)) | PREF2(f1, f2))
     short id;			/* ID of subre (1..ntree-1) */
-    int subno;			/* subexpression number (for 'b' and '(') */
+    size_t subno;			/* subexpression number (for 'b' and '(') */
     short min;			/* min repetitions for iteration or backref */
     short max;			/* max repetitions for iteration or backref */
     struct subre *left;		/* left child, if any (also freelist chain) */

generic/tclBasic.c

@@ -5852,7 +5852,7 @@ TclArgumentBCEnter(
     Tcl_Size pc)
 {
     ExtCmdLoc *eclPtr;
-    Tcl_Size word;
+    int word;
     ECL *ePtr;
     CFWordBC *lastPtr = NULL;
     Interp *iPtr = (Interp *) interp;
@@ -6105,7 +6105,7 @@ TclEvalObjEx(
 				 * evaluation of the script. Supported values
 				 * are TCL_EVAL_GLOBAL and TCL_EVAL_DIRECT. */
     const CmdFrame *invoker,	/* Frame of the command doing the eval. */
-    int word)			/* Index of the word which is in objPtr. */
+    int word)		/* Index of the word which is in objPtr. */
 {
     int result = TCL_OK;
     NRE_callback *rootPtr = TOP_CB(interp);
@@ -6124,7 +6124,7 @@ TclNREvalObjEx(
 				 * evaluation of the script. Supported values
 				 * are TCL_EVAL_GLOBAL and TCL_EVAL_DIRECT. */
     const CmdFrame *invoker,	/* Frame of the command doing the eval. */
-    int word)			/* Index of the word which is in objPtr. */
+    int word)		/* Index of the word which is in objPtr. */
 {
     Interp *iPtr = (Interp *) interp;
     int result;