mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 22:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove has_mbytes local to lines changed in parent commit

Browse Source
This commit is contained in:
ZviRackover
2018-09-02 01:36:18 +03:00
parent cbdbc4f63d
commit ac13e65ae0
11 changed files with 51 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/edit.c
View File

@@ -2131,11 +2131,7 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int
char_u *p = IObuff;
i = 0;
while (i < actual_len && (p - IObuff + 6) < IOSIZE) {
if (has_mbyte) {
p += utf_char2bytes(wca[i++], p);
} else {
*(p++) = wca[i++];
}
p += utf_char2bytes(wca[i++], p);
}
*p = NUL;
}
@@ -3084,7 +3080,7 @@ static void ins_compl_addleader(int c)
if (stop_arrow() == FAIL) {
return;
}
if (has_mbyte && (cc = (*mb_char2len)(c)) > 1) {
if ((cc = utf_char2len(c)) > 1) {
char_u buf[MB_MAXBYTES + 1];
utf_char2bytes(c, buf);
@@ -5334,7 +5330,7 @@ insertchar (
} else {
int cc;
if (has_mbyte && (cc = (*mb_char2len)(c)) > 1) {
if ((cc = utf_char2len(c)) > 1) {
char_u buf[MB_MAXBYTES + 1];
utf_char2bytes(c, buf);
@@ -8660,12 +8656,7 @@ static char_u *do_insert_char_pre(int c)
if (!has_event(EVENT_INSERTCHARPRE)) {
return NULL;
}
if (has_mbyte) {
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
} else {
buf[0] = c;
buf[1] = NUL;
}
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
// Lock the text to avoid weird things from happening.
textlock++;

12
src/nvim/eval.c
View File

@@ -9477,10 +9477,8 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
temp[i++] = K_SPECIAL;
temp[i++] = K_SECOND(n);
temp[i++] = K_THIRD(n);
} else if (has_mbyte)
} else
i += utf_char2bytes(n, temp + i);
else
temp[i++] = n;
temp[i++] = NUL;
rettv->v_type = VAR_STRING;
rettv->vval.v_string = vim_strsave(temp);
@@ -18346,12 +18344,8 @@ void set_vim_var_char(int c)
{
char buf[MB_MAXBYTES + 1];
if (has_mbyte) {
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
} else {
buf[0] = c;
buf[1] = NUL;
}
buf[utf_char2bytes(c, (char_u *) buf)] = NUL;
set_vim_var_string(VV_CHAR, buf, -1);
}

19
src/nvim/ex_getln.c
View File

@@ -1762,14 +1762,10 @@ static int command_line_handle_key(CommandLineState *s)
if (IS_SPECIAL(s->c) || mod_mask != 0) {
put_on_cmdline(get_special_key_name(s->c, mod_mask), -1, true);
} else {
if (has_mbyte) {
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
} else {
IObuff[0] = s->c;
put_on_cmdline(IObuff, 1, true);
}
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
}
return command_line_changed(s);
}
@@ -2372,12 +2368,7 @@ redraw:
if (IS_SPECIAL(c1)) {
c1 = '?';
}
if (has_mbyte) {
len = utf_char2bytes(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
} else {
len = 1;
((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
}
len = utf_char2bytes(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
if (c1 == '\n')
msg_putchar('\n');
else if (c1 == TAB) {

12
src/nvim/getchar.c
View File

@@ -3657,14 +3657,10 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
} else {
if (c < ABBR_OFF && (c < ' ' || c > '~'))
tb[j++] = Ctrl_V; /* special char needs CTRL-V */
if (has_mbyte) {
/* if ABBR_OFF has been added, remove it here */
if (c >= ABBR_OFF)
c -= ABBR_OFF;
j += utf_char2bytes(c, tb + j);
} else {
tb[j++] = (char_u)c;
}
/* if ABBR_OFF has been added, remove it here */
if (c >= ABBR_OFF)
c -= ABBR_OFF;
j += utf_char2bytes(c, tb + j);
}
tb[j] = NUL;
/* insert the last typed char */

8
src/nvim/keymap.c
View File

@@ -465,7 +465,7 @@ char_u *get_special_key_name(int c, int modifiers)
}
/* Not a special key, only modifiers, output directly */
else {
if (has_mbyte && (*mb_char2len)(c) > 1)
if (utf_char2len(c) > 1)
idx += utf_char2bytes(c, string + idx);
else if (vim_isprintc(c))
string[idx++] = (char_u)c;
@@ -524,14 +524,12 @@ unsigned int trans_special(const char_u **srcp, const size_t src_len,
dst[dlen++] = K_SPECIAL;
dst[dlen++] = (char_u)KEY2TERMCAP0(key);
dst[dlen++] = KEY2TERMCAP1(key);
} else if (has_mbyte && !keycode) {
} else if (!keycode) {
dlen += (unsigned int)utf_char2bytes(key, dst + dlen);
} else if (keycode) {
} else {
char_u *after = add_char2buf(key, dst + dlen);
assert(after >= dst && (uintmax_t)(after - dst) <= UINT_MAX);
dlen = (unsigned int)(after - dst);
} else {
dst[dlen++] = (char_u)key;
}
return dlen;

9
src/nvim/ops.c
View File

@@ -1737,13 +1737,8 @@ int op_replace(oparg_T *oap, int c)
if (had_ctrl_v_cr || (c != '\r' && c != '\n')) {
// strlen(newp) at this point
int newp_len = bd.textcol + bd.startspaces;
if (has_mbyte) {
while (--num_chars >= 0) {
newp_len += utf_char2bytes(c, newp + newp_len);
}
} else {
memset(newp + newp_len, c, (size_t)numc);
newp_len += numc;
while (--num_chars >= 0) {
newp_len += utf_char2bytes(c, newp + newp_len);
}
if (!bd.is_short) {
// insert post-spaces

33
src/nvim/regexp.c
View File

@@ -2538,10 +2538,8 @@ static void regc(int b)
*/
static void regmbc(int c)
{
if (!has_mbyte && c > 0xff)
return;
if (regcode == JUST_CALC_SIZE)
regsize += (*mb_char2len)(c);
regsize += utf_char2len(c);
else
regcode += utf_char2bytes(c, regcode);
}
@@ -6759,27 +6757,22 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
cc = c;
}
if (has_mbyte) {
int totlen = mb_ptr2len(src - 1);
int totlen = utfc_ptr2len(src - 1);
if (copy)
utf_char2bytes(cc, dst);
dst += mb_char2len(cc) - 1;
if (enc_utf8) {
int clen = utf_ptr2len(src - 1);
dst += utf_char2len(cc) - 1;
int clen = utf_ptr2len(src - 1);
/* If the character length is shorter than "totlen", there
* are composing characters; copy them as-is. */
if (clen < totlen) {
if (copy)
memmove(dst + 1, src - 1 + clen,
(size_t)(totlen - clen));
dst += totlen - clen;
}
/* If the character length is shorter than "totlen", there
* are composing characters; copy them as-is. */
if (clen < totlen) {
if (copy)
memmove(dst + 1, src - 1 + clen,
(size_t)(totlen - clen));
dst += totlen - clen;
}
src += totlen - 1;
} else if (copy)
*dst = cc;
dst++;
} else {
if (REG_MULTI) {
@@ -6861,13 +6854,13 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
if (enc_utf8)
l = utf_ptr2len(s) - 1;
else
l = mb_ptr2len(s) - 1;
l = utfc_ptr2len(s) - 1;
s += l;
len -= l;
if (copy)
utf_char2bytes(cc, dst);
dst += mb_char2len(cc) - 1;
dst += utf_char2len(cc) - 1;
} else if (copy)
*dst = cc;
dst++;

5
src/nvim/regexp_nfa.c
View File

@@ -563,10 +563,7 @@ static char_u *nfa_get_match_text(nfa_state_T *start)
p = start->out->out; /* skip first char, it goes into regstart */
s = ret;
while (p->c > 0) {
if (has_mbyte)
s += utf_char2bytes(p->c, s);
else
*s++ = p->c;
s += utf_char2bytes(p->c, s);
p = p->out;
}
*s = NUL;

5
src/nvim/screen.c
View File

@@ -6954,10 +6954,7 @@ static void win_redr_ruler(win_T *wp, int always)
if (this_ru_col + o < width) {
// Need at least 3 chars left for get_rel_pos() + NUL.
while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) {
if (has_mbyte)
i += utf_char2bytes(fillchar, buffer + i);
else
buffer[i++] = fillchar;
i += utf_char2bytes(fillchar, buffer + i);
++o;
}
get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i);

49
src/nvim/spell.c
View File

@@ -3433,12 +3433,7 @@ void onecap_copy(char_u *word, char_u *wcopy, bool upper)
} else {
c = SPELL_TOFOLD(c);
}
if (has_mbyte) {
l = utf_char2bytes(c, wcopy);
} else {
l = 1;
wcopy[0] = c;
}
l = utf_char2bytes(c, wcopy);
STRLCPY(wcopy + l, p, MAXWLEN - l);
}
@@ -3466,15 +3461,9 @@ static void allcap_copy(char_u *word, char_u *wcopy)
} else
c = SPELL_TOUPPER(c);
if (has_mbyte) {
if (d - wcopy >= MAXWLEN - MB_MAXBYTES)
break;
d += utf_char2bytes(c, d);
} else {
if (d - wcopy >= MAXWLEN - 1)
break;
*d++ = c;
}
if (d - wcopy >= MAXWLEN - MB_MAXBYTES)
break;
d += utf_char2bytes(c, d);
}
*d = NUL;
}
@@ -4543,16 +4532,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNSWAP;
++depth;
if (has_mbyte) {
fl = mb_char2len(c2);
memmove(p, p + n, fl);
utf_char2bytes(c, p + fl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl;
} else {
p[0] = c2;
p[1] = c;
stack[depth].ts_fidxtry = sp->ts_fidx + 2;
}
fl = mb_char2len(c2);
memmove(p, p + n, fl);
utf_char2bytes(c, p + fl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl;
} else
// If this swap doesn't work then SWAP3 won't either.
PROF_STORE(sp->ts_state)
@@ -4604,17 +4587,11 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNSWAP3;
++depth;
if (has_mbyte) {
tl = mb_char2len(c3);
memmove(p, p + n + fl, tl);
utf_char2bytes(c2, p + tl);
utf_char2bytes(c, p + fl + tl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl + tl;
} else {
p[0] = p[2];
p[2] = c;
stack[depth].ts_fidxtry = sp->ts_fidx + 3;
}
tl = mb_char2len(c3);
memmove(p, p + n + fl, tl);
utf_char2bytes(c2, p + tl);
utf_char2bytes(c, p + fl + tl);
stack[depth].ts_fidxtry = sp->ts_fidx + n + fl + tl;
} else {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI;

10
src/nvim/spellfile.c
View File

@@ -1459,10 +1459,7 @@ static int read_compound(FILE *fd, slang_T *slang, int len)
} else { // normal char, "[abc]" and '*' are copied as-is
if (c == '?' || c == '+' || c == '~')
*pp++ = '\\'; // "a?" becomes "a\?", "a+" becomes "a\+"
if (enc_utf8)
pp += utf_char2bytes(c, pp);
else
*pp++ = c;
pp += utf_char2bytes(c, pp);
}
}
@@ -4245,10 +4242,7 @@ static int write_vim_spell(spellinfo_T *spin, char_u *fname)
// Form the <folchars> string first, we need to know its length.
size_t l = 0;
for (size_t i = 128; i < 256; ++i) {
if (has_mbyte)
l += (size_t)utf_char2bytes(spelltab.st_fold[i], folchars + l);
else
folchars[l++] = spelltab.st_fold[i];
l += (size_t)utf_char2bytes(spelltab.st_fold[i], folchars + l);
}
put_bytes(fd, 1 + 128 + 2 + l, 4); // <sectionlen>