From: Ezekiel Newren via GitGitGadget Date: Fri, 19 Sep 2025 15:16:32 GMT Subject: [PATCH v3 10/10] xdiff: treat xdfile_t.rchg like an enum Message-ID: <1e404c3290bd4ba8b4973a597b976c301138cf73.1758294992.git.gitgitgadget@gmail.com> In-Reply-To: From: Ezekiel Newren Define macros NO(0), YES(1), MAYBE(2) as the enum values for rchg to make the code easier to follow. Perhaps 'rchg' should be renamed to 'changed'? A few of the code changes might appear to change behavior, such as: - while (xdf->rchg[g->start - 1]) + while (xdf->rchg[g->start - 1] == YES) because it appears the value of MAYBE is being ignored. However, MAYBE is only ever assigned as a value to a temporary array (dis1 & dis2) and then as a last step use that temporary array to decide if it wants to change xdfile_t.rchg[i] to YES or leave it as NO. As such, rchg will never have a value of MAYBE and thus there is no behavioral change. Best-viewed-with: --color-words Signed-off-by: Ezekiel Newren --- xdiff/xdiff.h | 4 ++++ xdiff/xdiffi.c | 22 +++++++++++----------- xdiff/xhistogram.c | 8 ++++---- xdiff/xpatience.c | 8 ++++---- xdiff/xprepare.c | 24 ++++++++++++------------ 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 2cecde5afe..7092879829 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -27,6 +27,10 @@ extern "C" { #endif /* #ifdef __cplusplus */ +#define NO 0 +#define YES 1 +#define MAYBE 2 + /* xpparm_t.flags */ #define XDF_NEED_MINIMAL (1 << 0) diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 83c4cff6f7..44fd27823a 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -278,10 +278,10 @@ int xdl_recs_cmp(xdfile_t *xdf1, long off1, long lim1, */ if (off1 == lim1) { for (; off2 < lim2; off2++) - xdf2->rchg[xdf2->rindex[off2]] = 1; + xdf2->rchg[xdf2->rindex[off2]] = YES; } else if (off2 == lim2) { for (; off1 < lim1; off1++) - xdf1->rchg[xdf1->rindex[off1]] = 1; + xdf1->rchg[xdf1->rindex[off1]] = YES; } else { xdpsplit_t spl; spl.i1 = spl.i2 = 0; @@ -708,7 +708,7 @@ struct xdlgroup { static void group_init(xdfile_t *xdf, struct xdlgroup *g) { g->start = g->end = 0; - while (xdf->rchg[g->end]) + while (xdf->rchg[g->end] == YES) g->end++; } @@ -722,7 +722,7 @@ static inline int group_next(xdfile_t *xdf, struct xdlgroup *g) return -1; g->start = g->end + 1; - for (g->end = g->start; xdf->rchg[g->end]; g->end++) + for (g->end = g->start; xdf->rchg[g->end] == YES; g->end++) ; return 0; @@ -738,7 +738,7 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g) return -1; g->end = g->start - 1; - for (g->start = g->end; xdf->rchg[g->start - 1]; g->start--) + for (g->start = g->end; xdf->rchg[g->start - 1] == YES; g->start--) ; return 0; @@ -753,10 +753,10 @@ static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g) { if (g->end < xdf->nrec && recs_match(&xdf->recs[g->start], &xdf->recs[g->end])) { - xdf->rchg[g->start++] = 0; - xdf->rchg[g->end++] = 1; + xdf->rchg[g->start++] = NO; + xdf->rchg[g->end++] = YES; - while (xdf->rchg[g->end]) + while (xdf->rchg[g->end] == YES) g->end++; return 0; @@ -774,10 +774,10 @@ static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g) { if (g->start > 0 && recs_match(&xdf->recs[g->start - 1], &xdf->recs[g->end - 1])) { - xdf->rchg[--g->start] = 1; - xdf->rchg[--g->end] = 0; + xdf->rchg[--g->start] = YES; + xdf->rchg[--g->end] = NO; - while (xdf->rchg[g->start - 1]) + while (xdf->rchg[g->start - 1] == YES) g->start--; return 0; diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 4d857e8ae2..c2e85b8ab9 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -318,11 +318,11 @@ redo: if (!count1) { while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; + env->xdf2.rchg[line2++ - 1] = YES; return 0; } else if (!count2) { while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; + env->xdf1.rchg[line1++ - 1] = YES; return 0; } @@ -335,9 +335,9 @@ redo: else { if (lcs.begin1 == 0 && lcs.begin2 == 0) { while (count1--) - env->xdf1.rchg[line1++ - 1] = 1; + env->xdf1.rchg[line1++ - 1] = YES; while (count2--) - env->xdf2.rchg[line2++ - 1] = 1; + env->xdf2.rchg[line2++ - 1] = YES; result = 0; } else { result = histogram_diff(xpp, env, diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index bf69a58527..20cda5e258 100644 --- a/xdiff/xpatience.c +++ b/xdiff/xpatience.c @@ -331,11 +331,11 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env, /* trivial case: one side is empty */ if (!count1) { while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; + env->xdf2.rchg[line2++ - 1] = YES; return 0; } else if (!count2) { while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; + env->xdf1.rchg[line1++ - 1] = YES; return 0; } @@ -347,9 +347,9 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env, /* are there any matching lines at all? */ if (!map.has_matches) { while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; + env->xdf1.rchg[line1++ - 1] = YES; while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; + env->xdf2.rchg[line2++ - 1] = YES; xdl_free(map.entries); return 0; } diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 5c7e858b6b..c11875d07f 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -214,9 +214,9 @@ static int xdl_clean_mmatch(char const *dis, long i, long s, long e) { * current line (i) is already a multimatch line. */ for (r = 1, rdis0 = 0, rpdis0 = 1; (i - r) >= s; r++) { - if (!dis[i - r]) + if (dis[i - r] == NO) rdis0++; - else if (dis[i - r] == 2) + else if (dis[i - r] == MAYBE) rpdis0++; else break; @@ -230,9 +230,9 @@ static int xdl_clean_mmatch(char const *dis, long i, long s, long e) { if (rdis0 == 0) return 0; for (r = 1, rdis1 = 0, rpdis1 = 1; (i + r) <= e; r++) { - if (!dis[i + r]) + if (dis[i + r] == NO) rdis1++; - else if (dis[i + r] == 2) + else if (dis[i + r] == MAYBE) rpdis1++; else break; @@ -272,7 +272,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) { rcrec = cf->rcrecs[recs->ha]; nm = rcrec ? rcrec->len2 : 0; - dis1[i] = (nm == 0) ? 0: (nm >= mlim && !need_min) ? 2: 1; + dis1[i] = (nm == 0) ? NO: (nm >= mlim && !need_min) ? MAYBE: YES; } if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT) @@ -280,26 +280,26 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) { rcrec = cf->rcrecs[recs->ha]; nm = rcrec ? rcrec->len1 : 0; - dis2[i] = (nm == 0) ? 0: (nm >= mlim && !need_min) ? 2: 1; + dis2[i] = (nm == 0) ? NO: (nm >= mlim && !need_min) ? MAYBE: YES; } for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) { - if (dis1[i] == 1 || - (dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) { + if (dis1[i] == YES || + (dis1[i] == MAYBE && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) { xdf1->rindex[nreff++] = i; } else - xdf1->rchg[i] = 1; + xdf1->rchg[i] = YES; } xdf1->nreff = nreff; for (nreff = 0, i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) { - if (dis2[i] == 1 || - (dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) { + if (dis2[i] == YES || + (dis2[i] == MAYBE && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) { xdf2->rindex[nreff++] = i; } else - xdf2->rchg[i] = 1; + xdf2->rchg[i] = YES; } xdf2->nreff = nreff; -- gitgitgadget