vim: src/xdiff/xemit.c annotate

annotate src/xdiff/xemit.c @ 33399:95db67c7b754 v9.0.1958

patch 9.0.1958: cannot complete option values Commit: https://github.com/vim/vim/commit/900894b09a95398dfc75599e9f0aa2ea25723384 Author: Yee Cheng Chin <ychin.git@gmail.com> Date: Fri Sep 29 20:42:32 2023 +0200 patch 9.0.1958: cannot complete option values Problem: cannot complete option values Solution: Add completion functions for several options Add cmdline tab-completion for setting string options Add tab-completion for setting string options on the cmdline using `:set=` (along with `:set+=` and `:set-=`). The existing tab completion for setting options currently only works when nothing is typed yet, and it only fills in with the existing value, e.g. when the user does `:set diffopt=<Tab>` it will be completed to `set diffopt=internal,filler,closeoff` and nothing else. This isn't too useful as a user usually wants auto-complete to suggest all the possible values, such as 'iblank', or 'algorithm:patience'. For set= and set+=, this adds a new optional callback function for each option that can be invoked when doing completion. This allows for each option to have control over how completion works. For example, in 'diffopt', it will suggest the default enumeration, but if `algorithm:` is selected, it will further suggest different algorithm types like 'meyers' and 'patience'. When using set=, the existing option value will be filled in as the first choice to preserve the existing behavior. When using set+= this won't happen as it doesn't make sense. For flag list options (e.g. 'mouse' and 'guioptions'), completion will take into account existing typed values (and in the case of set+=, the existing option value) to make sure it doesn't suggest duplicates. For set-=, there is a new `ExpandSettingSubtract` function which will handle flag list and comma-separated options smartly, by only suggesting values that currently exist in the option. Note that Vim has some existing code that adds special handling for 'filetype', 'syntax', and misc dir options like 'backupdir'. This change preserves them as they already work, instead of converting to the new callback API for each option. closes: #13182 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>

author	Christian Brabandt <cb@256bit.org>
date	Fri, 29 Sep 2023 20:45:04 +0200
parents	f84e5db372ea
children

rev	line source
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	1 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	2 * LibXDiff by Davide Libenzi ( File Differential Library )
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	3 * Copyright (C) 2003 Davide Libenzi
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	4 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	5 * This library is free software; you can redistribute it and/or
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	6 * modify it under the terms of the GNU Lesser General Public
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	7 * License as published by the Free Software Foundation; either
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	8 * version 2.1 of the License, or (at your option) any later version.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	9 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	10 * This library is distributed in the hope that it will be useful,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	13 * Lesser General Public License for more details.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	14 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	15 * You should have received a copy of the GNU Lesser General Public
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	16 * License along with this library; if not, see
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	17 * <http://www.gnu.org/licenses/>.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	18 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	19 * Davide Libenzi <davidel@xmailserver.org>
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	20 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	21 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	22
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	23 #include "xinclude.h"
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	24
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	25 static long xdl_get_rec(xdfile_t xdf, long ri, char const *rec) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	26
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	27 *rec = xdf->recs[ri]->ptr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	28
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	29 return xdf->recs[ri]->size;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	30 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	31
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	32
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	33 static int xdl_emit_record(xdfile_t xdf, long ri, char const pre, xdemitcb_t *ecb) {
25804 bf09d07f098e patch 8.2.3437: compiler warnings for 32/64 bit usage Bram Moolenaar <Bram@vim.org> parents: 25709 diff changeset	34 long size, psize = (long)strlen(pre);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	35 char const *rec;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	36
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	37 size = xdl_get_rec(xdf, ri, &rec);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	38 if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	39
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	40 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	41 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	42
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	43 return 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	44 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	45
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	46
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	47 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	48 * Starting at the passed change atom, find the latest change atom to be included
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	49 * inside the differential hunk according to the specified configuration.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	50 * Also advance xscr if the first changes must be discarded.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	51 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	52 xdchange_t xdl_get_hunk(xdchange_t xscr, xdemitconf_t const xecfg)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	53 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	54 xdchange_t xch, xchp, *lxch;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	55 long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	56 long max_ignorable = xecfg->ctxlen;
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	57 unsigned long ignored = 0; /* number of ignored blank lines */
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	58
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	59 /* remove ignorable changes that are too far before other changes */
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	60 for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	61 xch = xchp->next;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	62
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	63 if (xch == NULL \|\|
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	64 xch->i1 - (xchp->i1 + xchp->chg1) >= max_ignorable)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	65 *xscr = xch;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	66 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	67
32174 f84e5db372ea patch 9.0.1418: the included xdiff code is a bit outdated Bram Moolenaar <Bram@vim.org> parents: 25804 diff changeset	68 if (!*xscr)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	69 return NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	70
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	71 lxch = *xscr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	72
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	73 for (xchp = *xscr, xch = xchp->next; xch; xchp = xch, xch = xch->next) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	74 long distance = xch->i1 - (xchp->i1 + xchp->chg1);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	75 if (distance > max_common)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	76 break;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	77
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	78 if (distance < max_ignorable && (!xch->ignore \|\| lxch == xchp)) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	79 lxch = xch;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	80 ignored = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	81 } else if (distance < max_ignorable && xch->ignore) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	82 ignored += xch->chg2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	83 } else if (lxch != xchp &&
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	84 xch->i1 + (long)ignored - (lxch->i1 + lxch->chg1) > max_common) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	85 break;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	86 } else if (!xch->ignore) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	87 lxch = xch;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	88 ignored = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	89 } else {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	90 ignored += xch->chg2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	91 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	92 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	93
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	94 return lxch;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	95 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	96
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	97
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	98 #if 0
32174 f84e5db372ea patch 9.0.1418: the included xdiff code is a bit outdated Bram Moolenaar <Bram@vim.org> parents: 25804 diff changeset	99 static long def_ff(const char rec, long len, char buf, long sz)
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	100 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	101 if (len > 0 &&
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	102 (isalpha((unsigned char)rec) \|\| / identifier? */
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	103 rec == '_' \|\| / also identifier? */
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	104 rec == '$')) { / identifiers from VMS and other esoterico */
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	105 if (len > sz)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	106 len = sz;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	107 while (0 < len && isspace((unsigned char)rec[len - 1]))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	108 len--;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	109 memcpy(buf, rec, len);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	110 return len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	111 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	112 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	113 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	114 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	115
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	116 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	117 static long match_func_rec(xdfile_t xdf, xdemitconf_t const xecfg, long ri,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	118 char *buf, long sz)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	119 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	120 const char *rec;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	121 long len = xdl_get_rec(xdf, ri, &rec);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	122 if (!xecfg->find_func)
32174 f84e5db372ea patch 9.0.1418: the included xdiff code is a bit outdated Bram Moolenaar <Bram@vim.org> parents: 25804 diff changeset	123 return def_ff(rec, len, buf, sz);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	124 return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	125 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	126 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	127
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	128 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	129 static int is_func_rec(xdfile_t xdf, xdemitconf_t const xecfg, long ri)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	130 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	131 char dummy[1];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	132 return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	133 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	134 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	135
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	136 struct func_line {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	137 long len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	138 char buf[80];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	139 };
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	140
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	141 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	142 static long get_func_line(xdfenv_t xe, xdemitconf_t const xecfg,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	143 struct func_line *func_line, long start, long limit)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	144 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	145 long l, size, step = (start > limit) ? -1 : 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	146 char *buf, dummy[1];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	147
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	148 buf = func_line ? func_line->buf : dummy;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	149 size = func_line ? sizeof(func_line->buf) : sizeof(dummy);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	150
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	151 for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	152 long len = match_func_rec(&xe->xdf1, xecfg, l, buf, size);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	153 if (len >= 0) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	154 if (func_line)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	155 func_line->len = len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	156 return l;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	157 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	158 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	159 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	160 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	161 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	162
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	163 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	164 static int is_empty_rec(xdfile_t *xdf, long ri)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	165 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	166 const char *rec;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	167 long len = xdl_get_rec(xdf, ri, &rec);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	168
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	169 while (len > 0 && XDL_ISSPACE(*rec)) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	170 rec++;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	171 len--;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	172 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	173 return !len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	174 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	175 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	176
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	177 int xdl_emit_diff(xdfenv_t xe, xdchange_t xscr, xdemitcb_t *ecb,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	178 xdemitconf_t const *xecfg) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	179 long s1, s2, e1, e2, lctx;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	180 xdchange_t xch, xche;
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	181 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	182 long funclineprev = -1;
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	183 #endif
14704 150274bc6f5c patch 8.1.0364: compiler warning in xdiff code Christian Brabandt <cb@256bit.org> parents: 14696 diff changeset	184 struct func_line func_line;
150274bc6f5c patch 8.1.0364: compiler warning in xdiff code Christian Brabandt <cb@256bit.org> parents: 14696 diff changeset	185
150274bc6f5c patch 8.1.0364: compiler warning in xdiff code Christian Brabandt <cb@256bit.org> parents: 14696 diff changeset	186 func_line.len = 0;
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	187
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	188 for (xch = xscr; xch; xch = xche->next) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	189 xche = xdl_get_hunk(&xch, xecfg);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	190 if (!xch)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	191 break;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	192
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	193 s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	194 s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	195
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	196 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	197 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	198 long fs1, i1 = xch->i1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	199
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	200 /* Appended chunk? */
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	201 if (i1 >= xe->xdf1.nrec) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	202 long i2 = xch->i2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	203
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	204 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	205 * We don't need additional context if
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	206 * a whole function was added.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	207 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	208 while (i2 < xe->xdf2.nrec) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	209 if (is_func_rec(&xe->xdf2, xecfg, i2))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	210 goto post_context_calculation;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	211 i2++;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	212 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	213
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	214 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	215 * Otherwise get more context from the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	216 * pre-image.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	217 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	218 i1 = xe->xdf1.nrec - 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	219 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	220
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	221 fs1 = get_func_line(xe, xecfg, NULL, i1, -1);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	222 while (fs1 > 0 && !is_empty_rec(&xe->xdf1, fs1 - 1) &&
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	223 !is_func_rec(&xe->xdf1, xecfg, fs1 - 1))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	224 fs1--;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	225 if (fs1 < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	226 fs1 = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	227 if (fs1 < s1) {
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	228 s2 = XDL_MAX(s2 - (s1 - fs1), 0);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	229 s1 = fs1;
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	230
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	231 /*
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	232 * Did we extend context upwards into an
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	233 * ignored change?
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	234 */
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	235 while (xchp != xch &&
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	236 xchp->i1 + xchp->chg1 <= s1 &&
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	237 xchp->i2 + xchp->chg2 <= s2)
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	238 xchp = xchp->next;
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	239
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	240 /* If so, show it after all. */
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	241 if (xchp != xch) {
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	242 xch = xchp;
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	243 goto pre_context_calculation;
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	244 }
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	245 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	246 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	247
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	248 post_context_calculation:
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	249 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	250 lctx = xecfg->ctxlen;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	251 lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	252 lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	253
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	254 e1 = xche->i1 + xche->chg1 + lctx;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	255 e2 = xche->i2 + xche->chg2 + lctx;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	256
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	257 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	258 if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	259 long fe1 = get_func_line(xe, xecfg, NULL,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	260 xche->i1 + xche->chg1,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	261 xe->xdf1.nrec);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	262 while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	263 fe1--;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	264 if (fe1 < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	265 fe1 = xe->xdf1.nrec;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	266 if (fe1 > e1) {
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	267 e2 = XDL_MIN(e2 + (fe1 - e1), xe->xdf2.nrec);
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	268 e1 = fe1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	269 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	270
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	271 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	272 * Overlap with next change? Then include it
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	273 * in the current hunk and start over to find
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	274 * its new end.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	275 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	276 if (xche->next) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	277 long l = XDL_MIN(xche->next->i1,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	278 xe->xdf1.nrec - 1);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	279 if (l - xecfg->ctxlen <= e1 \|\|
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	280 get_func_line(xe, xecfg, NULL, l, e1) < 0) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	281 xche = xche->next;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	282 goto post_context_calculation;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	283 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	284 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	285 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	286 #endif
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	287
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	288 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	289 * Emit current hunk header.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	290 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	291
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	292 #if 0
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	293 if (xecfg->flags & XDL_EMIT_FUNCNAMES) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	294 get_func_line(xe, xecfg, &func_line,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	295 s1 - 1, funclineprev);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	296 funclineprev = s1 - 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	297 }
14708 0e336b7d2090 patch 8.1.0366: pieces of the xdiff code are not used Christian Brabandt <cb@256bit.org> parents: 14704 diff changeset	298 #endif
25709 d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	299 if (!(xecfg->flags & XDL_EMIT_NO_HUNK_HDR) &&
d5142d87f898 patch 8.2.3390: included xdiff code is outdated Bram Moolenaar <Bram@vim.org> parents: 18802 diff changeset	300 xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2,
14696 195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	301 func_line.buf, func_line.len, ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	302 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	303
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	304 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	305 * Emit pre-context.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	306 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	307 for (; s2 < xch->i2; s2++)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	308 if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	309 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	310
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	311 for (s1 = xch->i1, s2 = xch->i2;; xch = xch->next) {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	312 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	313 * Merge previous with current change atom.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	314 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	315 for (; s1 < xch->i1 && s2 < xch->i2; s1++, s2++)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	316 if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	317 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	318
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	319 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	320 * Removes lines from the first file.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	321 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	322 for (s1 = xch->i1; s1 < xch->i1 + xch->chg1; s1++)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	323 if (xdl_emit_record(&xe->xdf1, s1, "-", ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	324 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	325
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	326 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	327 * Adds lines from the second file.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	328 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	329 for (s2 = xch->i2; s2 < xch->i2 + xch->chg2; s2++)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	330 if (xdl_emit_record(&xe->xdf2, s2, "+", ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	331 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	332
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	333 if (xch == xche)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	334 break;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	335 s1 = xch->i1 + xch->chg1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	336 s2 = xch->i2 + xch->chg2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	337 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	338
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	339 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	340 * Emit post-context.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	341 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	342 for (s2 = xche->i2 + xche->chg2; s2 < e2; s2++)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	343 if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	344 return -1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	345 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	346
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	347 return 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible Christian Brabandt <cb@256bit.org> parents: diff changeset	348 }

Mercurial > vim

annotate src/xdiff/xemit.c @ 33399:95db67c7b754 v9.0.1958