aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/digraph.c52
-rw-r--r--src/nvim/edit.c2
-rw-r--r--src/nvim/eval.lua8
-rw-r--r--src/nvim/testdir/test_digraph.vim74
4 files changed, 68 insertions, 68 deletions
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 4046869871..aaf3ace861 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -39,8 +39,8 @@ static char e_digraph_must_be_just_two_characters_str[]
= N_("E1214: Digraph must be just two characters: %s");
static char e_digraph_argument_must_be_one_character_str[]
= N_("E1215: Digraph must be one character: %s");
-static char e_setdigraphlist_argument_must_be_list_of_lists_with_two_items[]
- = N_("E1216: setdigraphlist() argument must be a list of lists with two items");
+static char e_digraph_setlist_argument_must_be_list_of_lists_with_two_items[]
+ = N_("E1216: digraph_setlist() argument must be a list of lists with two items");
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "digraph.c.generated.h"
@@ -1465,7 +1465,7 @@ int do_digraph(int c)
backspaced = -1;
} else if (p_dg) {
if (backspaced >= 0) {
- c = getdigraph(backspaced, c, false);
+ c = digraph_get(backspaced, c, false);
}
backspaced = -1;
@@ -1537,7 +1537,7 @@ int get_digraph(bool cmdline)
if (cc != ESC) {
// ESC cancels CTRL-K
- return getdigraph(c, cc, true);
+ return digraph_get(c, cc, true);
}
}
return NUL;
@@ -1601,7 +1601,7 @@ static int getexactdigraph(int char1, int char2, bool meta_char)
/// @param meta_char
///
/// @return The digraph.
-int getdigraph(int char1, int char2, bool meta_char)
+int digraph_get(int char1, int char2, bool meta_char)
{
int retval;
@@ -1729,7 +1729,7 @@ void listdigraphs(bool use_headers)
}
}
-static void getdigraphlist_appendpair(digr_T *dp, list_T *l)
+static void digraph_getlist_appendpair(digr_T *dp, list_T *l)
{
list_T *l2 = tv_list_alloc(2);
tv_list_append_list(l, l2);
@@ -1746,7 +1746,7 @@ static void getdigraphlist_appendpair(digr_T *dp, list_T *l)
tv_list_append_string(l2, (char *)buf, -1);
}
-void getdigraphlist_common(bool list_all, typval_T *rettv)
+void digraph_getlist_common(bool list_all, typval_T *rettv)
{
tv_list_alloc_ret(rettv, (int)sizeof(digraphdefault) + user_digraphs.ga_len);
@@ -1760,7 +1760,7 @@ void getdigraphlist_common(bool list_all, typval_T *rettv)
tmp.char2 = dp->char2;
tmp.result = getexactdigraph(tmp.char1, tmp.char2, false);
if (tmp.result != 0 && tmp.result != tmp.char2) {
- getdigraphlist_appendpair(&tmp, rettv->vval.v_list);
+ digraph_getlist_appendpair(&tmp, rettv->vval.v_list);
}
dp++;
}
@@ -1768,7 +1768,7 @@ void getdigraphlist_common(bool list_all, typval_T *rettv)
dp = (digr_T *)user_digraphs.ga_data;
for (int i = 0; i < user_digraphs.ga_len && !got_int; i++) {
- getdigraphlist_appendpair(dp, rettv->vval.v_list);
+ digraph_getlist_appendpair(dp, rettv->vval.v_list);
dp++;
}
}
@@ -1889,7 +1889,7 @@ static int get_digraph_chars(typval_T *arg, int *char1, int *char2)
return FAIL;
}
-static bool setdigraph_common(typval_T *argchars, typval_T *argdigraph)
+static bool digraph_set_common(typval_T *argchars, typval_T *argdigraph)
{
int char1, char2;
if (get_digraph_chars(argchars, &char1, &char2) == FAIL) {
@@ -1912,8 +1912,8 @@ static bool setdigraph_common(typval_T *argchars, typval_T *argdigraph)
return true;
}
-/// "getdigraph()" function
-void f_getdigraph(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+/// "digraph_get()" function
+void f_digraph_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL; // Return empty string for failure
@@ -1926,15 +1926,15 @@ void f_getdigraph(typval_T *argvars, typval_T *rettv, FunPtr fptr)
semsg(_(e_digraph_must_be_just_two_characters_str), digraphs);
return;
}
- int code = getdigraph(digraphs[0], digraphs[1], false);
+ int code = digraph_get(digraphs[0], digraphs[1], false);
char_u buf[NUMBUFLEN];
buf[utf_char2bytes(code, buf)] = NUL;
rettv->vval.v_string = vim_strsave(buf);
}
-/// "getdigraphlist()" function
-void f_getdigraphlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+/// "digraph_getlist()" function
+void f_digraph_getlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
bool flag_list_all;
@@ -1949,30 +1949,30 @@ void f_getdigraphlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
flag_list_all = flag != 0;
}
- getdigraphlist_common(flag_list_all, rettv);
+ digraph_getlist_common(flag_list_all, rettv);
}
-/// "setdigraph()" function
-void f_setdigraph(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+/// "digraph_set()" function
+void f_digraph_set(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
rettv->v_type = VAR_BOOL;
rettv->vval.v_bool = kBoolVarFalse;
- if (!setdigraph_common(&argvars[0], &argvars[1])) {
+ if (!digraph_set_common(&argvars[0], &argvars[1])) {
return;
}
rettv->vval.v_bool = kBoolVarTrue;
}
-/// "setdigraphlist()" function
-void f_setdigraphlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+/// "digraph_setlist()" function
+void f_digraph_setlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
rettv->v_type = VAR_BOOL;
rettv->vval.v_bool = kBoolVarFalse;
if (argvars[0].v_type != VAR_LIST) {
- emsg(_(e_setdigraphlist_argument_must_be_list_of_lists_with_two_items));
+ emsg(_(e_digraph_setlist_argument_must_be_list_of_lists_with_two_items));
return;
}
@@ -1985,18 +1985,18 @@ void f_setdigraphlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
TV_LIST_ITER_CONST(pl, pli, {
if (TV_LIST_ITEM_TV(pli)->v_type != VAR_LIST) {
- emsg(_(e_setdigraphlist_argument_must_be_list_of_lists_with_two_items));
+ emsg(_(e_digraph_setlist_argument_must_be_list_of_lists_with_two_items));
return;
}
list_T *l = TV_LIST_ITEM_TV(pli)->vval.v_list;
if (l == NULL || tv_list_len(l) != 2) {
- emsg(_(e_setdigraphlist_argument_must_be_list_of_lists_with_two_items));
+ emsg(_(e_digraph_setlist_argument_must_be_list_of_lists_with_two_items));
return;
}
- if (!setdigraph_common(TV_LIST_ITEM_TV(tv_list_first(l)),
- TV_LIST_ITEM_TV(TV_LIST_ITEM_NEXT(l, tv_list_first(l))))) {
+ if (!digraph_set_common(TV_LIST_ITEM_TV(tv_list_first(l)),
+ TV_LIST_ITEM_TV(TV_LIST_ITEM_NEXT(l, tv_list_first(l))))) {
return;
}
});
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 313e23fd3b..47d491033b 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -9260,7 +9260,7 @@ static int ins_digraph(void)
}
if (cc != ESC) {
AppendToRedobuff(CTRL_V_STR);
- c = getdigraph(c, cc, true);
+ c = digraph_get(c, cc, true);
clear_showcmd();
return c;
}
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 0951cd239d..698cffe2fa 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -102,6 +102,10 @@ return {
did_filetype={},
diff_filler={args=1, base=1},
diff_hlID={args=2, base=1},
+ digraph_get={args=1, base=1},
+ digraph_getlist={args={0, 1}, base=1},
+ digraph_set={args=2, base=1},
+ digraph_setlist={args=1, base=1},
empty={args=1, base=1},
environ={},
escape={args=2, base=1},
@@ -156,8 +160,6 @@ return {
getcurpos={args={0, 1}, base=1},
getcursorcharpos={args={0, 1}, base=1},
getcwd={args={0, 2}, base=1},
- getdigraph={args=1, base=1},
- getdigraphlist={args={0, 1}, base=1},
getenv={args=1, base=1},
getfontname={args={0, 1}},
getfperm={args=1, base=1},
@@ -324,8 +326,6 @@ return {
setcharsearch={args=1, base=1},
setcmdpos={args=1, base=1},
setcursorcharpos={args={1, 3}, base=1},
- setdigraph={args=2, base=1},
- setdigraphlist={args=1, base=1},
setenv={args=2, base=2},
setfperm={args=2, base=1},
setline={args=2, base=2},
diff --git a/src/nvim/testdir/test_digraph.vim b/src/nvim/testdir/test_digraph.vim
index e9073db649..9fecedfd5b 100644
--- a/src/nvim/testdir/test_digraph.vim
+++ b/src/nvim/testdir/test_digraph.vim
@@ -505,47 +505,47 @@ func Test_entering_digraph()
call StopVimInTerminal(buf)
endfunc
-func Test_setdigraph_function()
+func Test_digraph_set_function()
new
- call setdigraph('aa', 'あ')
+ call digraph_set('aa', 'あ')
call Put_Dig('aa')
call assert_equal('あ', getline('$'))
- call setdigraph(' i', 'い')
+ call digraph_set(' i', 'い')
call Put_Dig(' i')
call assert_equal('い', getline('$'))
- call setdigraph(' ', 'う')
+ call digraph_set(' ', 'う')
call Put_Dig(' ')
call assert_equal('う', getline('$'))
- eval 'aa'->setdigraph('え')
+ eval 'aa'->digraph_set('え')
call Put_Dig('aa')
call assert_equal('え', getline('$'))
- call assert_fails('call setdigraph("aaa", "あ")', 'E1214: Digraph must be just two characters: aaa')
- call assert_fails('call setdigraph("b", "あ")', 'E1214: Digraph must be just two characters: b')
- call assert_fails('call setdigraph("あ", "あ")', 'E1214: Digraph must be just two characters: あ')
- call assert_fails('call setdigraph("aa", "ああ")', 'E1215: Digraph must be one character: ああ')
- call assert_fails('call setdigraph("aa", "か" .. nr2char(0x3099))', 'E1215: Digraph must be one character: か' .. nr2char(0x3099))
+ call assert_fails('call digraph_set("aaa", "あ")', 'E1214: Digraph must be just two characters: aaa')
+ call assert_fails('call digraph_set("b", "あ")', 'E1214: Digraph must be just two characters: b')
+ call assert_fails('call digraph_set("あ", "あ")', 'E1214: Digraph must be just two characters: あ')
+ call assert_fails('call digraph_set("aa", "ああ")', 'E1215: Digraph must be one character: ああ')
+ call assert_fails('call digraph_set("aa", "か" .. nr2char(0x3099))', 'E1215: Digraph must be one character: か' .. nr2char(0x3099))
bwipe!
endfunc
-func Test_getdigraph_function()
+func Test_digraph_get_function()
" Built-in digraphs
- call assert_equal('∞', getdigraph('00'))
+ call assert_equal('∞', digraph_get('00'))
" User-defined digraphs
- call setdigraph('aa', 'あ')
- call setdigraph(' i', 'い')
- call setdigraph(' ', 'う')
- call assert_equal('あ', getdigraph('aa'))
- call assert_equal('あ', 'aa'->getdigraph())
- call assert_equal('い', getdigraph(' i'))
- call assert_equal('う', getdigraph(' '))
- call assert_fails('call getdigraph("aaa")', 'E1214: Digraph must be just two characters: aaa')
- call assert_fails('call getdigraph("b")', 'E1214: Digraph must be just two characters: b')
+ call digraph_set('aa', 'あ')
+ call digraph_set(' i', 'い')
+ call digraph_set(' ', 'う')
+ call assert_equal('あ', digraph_get('aa'))
+ call assert_equal('あ', 'aa'->digraph_get())
+ call assert_equal('い', digraph_get(' i'))
+ call assert_equal('う', digraph_get(' '))
+ call assert_fails('call digraph_get("aaa")', 'E1214: Digraph must be just two characters: aaa')
+ call assert_fails('call digraph_get("b")', 'E1214: Digraph must be just two characters: b')
endfunc
-func Test_getdigraph_function_encode()
+func Test_digraph_get_function_encode()
throw 'Skipped: Nvim does not support setting encoding=japan'
CheckFeature iconv
let testcases = {
@@ -553,34 +553,34 @@ func Test_getdigraph_function_encode()
\'aa': 'あ',
\}
for [key, ch] in items(testcases)
- call setdigraph(key, ch)
+ call digraph_set(key, ch)
set encoding=japan
- call assert_equal(iconv(ch, 'utf-8', 'japan'), getdigraph(key))
+ call assert_equal(iconv(ch, 'utf-8', 'japan'), digraph_get(key))
set encoding&
endfor
endfunc
-func Test_setdigraphlist_function()
- call setdigraphlist([['aa', 'き'], ['bb', 'く']])
- call assert_equal('き', getdigraph('aa'))
- call assert_equal('く', getdigraph('bb'))
+func Test_digraph_setlist_function()
+ call digraph_setlist([['aa', 'き'], ['bb', 'く']])
+ call assert_equal('き', digraph_get('aa'))
+ call assert_equal('く', digraph_get('bb'))
- call assert_fails('call setdigraphlist([[]])', 'E1216:')
- call assert_fails('call setdigraphlist([["aa", "b", "cc"]])', '1216:')
- call assert_fails('call setdigraphlist([["あ", "あ"]])', 'E1214: Digraph must be just two characters: あ')
+ call assert_fails('call digraph_setlist([[]])', 'E1216:')
+ call assert_fails('call digraph_setlist([["aa", "b", "cc"]])', '1216:')
+ call assert_fails('call digraph_setlist([["あ", "あ"]])', 'E1214: Digraph must be just two characters: あ')
endfunc
-func Test_getdigraphlist_function()
+func Test_digraph_getlist_function()
" Make sure user-defined digraphs are defined
- call setdigraphlist([['aa', 'き'], ['bb', 'く']])
+ call digraph_setlist([['aa', 'き'], ['bb', 'く']])
- for pair in getdigraphlist(1)
- call assert_equal(getdigraph(pair[0]), pair[1])
+ for pair in digraph_getlist(1)
+ call assert_equal(digraph_get(pair[0]), pair[1])
endfor
" We don't know how many digraphs are registered before, so check the number
" of digraphs returned.
- call assert_equal(getdigraphlist()->len(), getdigraphlist(0)->len())
- call assert_notequal((getdigraphlist()->len()), getdigraphlist(1)->len())
+ call assert_equal(digraph_getlist()->len(), digraph_getlist(0)->len())
+ call assert_notequal((digraph_getlist()->len()), digraph_getlist(1)->len())
endfunc
" vim: shiftwidth=2 sts=2 expandtab
generated by cgit (git 2.34.1) at 2025-05-02 11:34:34 +0000