Skip to content

Commit 7cb6fc2

Browse files
brammoolbrammool
committed
patch 8.2.1504: Vim9: white space checks are only done for a :def function
Problem: Vim9: white space checks are only done for a :def function. Solution: Also do checks at the script level. Adjust the name of a few error messages.
1 parent 81e17fb commit 7cb6fc2

11 files changed

Lines changed: 65 additions & 39 deletions

File tree

‎src/dict.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
862862
if (evaluate)
863863
{
864864
if (*skipwhite(*arg) == ':')
865-
semsg(_(e_no_white_space_allowed_before), ":");
865+
semsg(_(e_no_white_space_allowed_before_str), ":");
866866
else
867867
semsg(_(e_missing_dict_colon), *arg);
868868
}
@@ -881,7 +881,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
881881
}
882882
if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1]))
883883
{
884-
semsg(_(e_white_space_required_after), ":");
884+
semsg(_(e_white_space_required_after_str), ":");
885885
clear_tv(&tvkey);
886886
goto failret;
887887
}
@@ -924,7 +924,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
924924
{
925925
if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1]))
926926
{
927-
semsg(_(e_white_space_required_after), ",");
927+
semsg(_(e_white_space_required_after_str), ",");
928928
goto failret;
929929
}
930930
*arg = skipwhite(*arg + 1);
@@ -939,7 +939,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
939939
if (evaluate)
940940
{
941941
if (**arg == ',')
942-
semsg(_(e_no_white_space_allowed_before), ",");
942+
semsg(_(e_no_white_space_allowed_before_str), ",");
943943
else
944944
semsg(_(e_missing_dict_comma), *arg);
945945
}

‎src/errors.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ EXTERN char e_syntax_error_at_str[]
3333
INIT(= N_("E1002: Syntax error at %s"));
3434
EXTERN char e_missing_return_value[]
3535
INIT(= N_("E1003: Missing return value"));
36-
EXTERN char e_white_space_required_before_and_after[]
36+
EXTERN char e_white_space_required_before_and_after_str[]
3737
INIT(= N_("E1004: white space required before and after '%s'"));
3838
EXTERN char e_too_many_argument_types[]
3939
INIT(= N_("E1005: Too many argument types"));
@@ -156,21 +156,21 @@ EXTERN char e_type_mismatch_for_v_variable[]
156156
INIT(= N_("E1063: type mismatch for v: variable"));
157157
// E1064 unused
158158
// E1065 unused
159-
EXTERN char e_cannot_declare_a_register[]
159+
EXTERN char e_cannot_declare_a_register_str[]
160160
INIT(= N_("E1066: Cannot declare a register: %s"));
161-
EXTERN char e_separator_mismatch[]
161+
EXTERN char e_separator_mismatch_str[]
162162
INIT(= N_("E1067: Separator mismatch: %s"));
163-
EXTERN char e_no_white_space_allowed_before[]
163+
EXTERN char e_no_white_space_allowed_before_str[]
164164
INIT(= N_("E1068: No white space allowed before '%s'"));
165-
EXTERN char e_white_space_required_after[]
165+
EXTERN char e_white_space_required_after_str[]
166166
INIT(= N_("E1069: white space required after '%s'"));
167167
EXTERN char e_missing_from[]
168168
INIT(= N_("E1070: Missing \"from\""));
169169
EXTERN char e_invalid_string_after_from[]
170170
INIT(= N_("E1071: Invalid string after \"from\""));
171171
EXTERN char e_cannot_compare_str_with_str[]
172172
INIT(= N_("E1072: Cannot compare %s with %s"));
173-
EXTERN char e_name_already_defined[]
173+
EXTERN char e_name_already_defined_str[]
174174
INIT(= N_("E1073: name already defined: %s"));
175175
EXTERN char e_no_white_space_allowed_after_dot[]
176176
INIT(= N_("E1074: no white space allowed after dot"));

‎src/evalvars.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ ex_let(exarg_T *eap)
811811
|| !IS_WHITE_OR_NUL(*expr)))
812812
{
813813
vim_strncpy(op, expr - len, len);
814-
semsg(_(e_white_space_required_before_and_after), op);
814+
semsg(_(e_white_space_required_before_and_after_str), op);
815815
i = FAIL;
816816
}
817817

‎src/list.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ eval_list(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
12591259
{
12601260
if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]))
12611261
{
1262-
semsg(_(e_white_space_required_after), ",");
1262+
semsg(_(e_white_space_required_after_str), ",");
12631263
goto failret;
12641264
}
12651265
*arg = skipwhite(*arg + 1);
@@ -1276,7 +1276,7 @@ eval_list(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
12761276
if (do_error)
12771277
{
12781278
if (**arg == ',')
1279-
semsg(_(e_no_white_space_allowed_before), ",");
1279+
semsg(_(e_no_white_space_allowed_before_str), ",");
12801280
else
12811281
semsg(_("E696: Missing comma in List: %s"), *arg);
12821282
}

‎src/testdir/test_vim9_expr.vim‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2336,7 +2336,8 @@ func Test_expr_fails()
23362336
call CheckDefFailure(["let x = '1'isnot2"], 'E488:', 1)
23372337

23382338
call CheckDefFailure(["CallMe ('yes')"], 'E476:', 1)
2339-
call CheckDefFailure(["CallMe2('yes','no')"], 'E1069:', 1)
2339+
call CheckScriptFailure(["CallMe ('yes')"], 'E492:', 1)
2340+
call CheckScriptAndDefFailure(["CallMe2('yes','no')"], 'E1069:', 1)
23402341
call CheckDefFailure(["CallMe2('yes' , 'no')"], 'E1068:', 1)
23412342

23422343
call CheckDefFailure(["v:nosuch += 3"], 'E1001:', 1)

‎src/testdir/vim9.vim‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,10 @@ def CheckScriptSuccess(lines: list<string>)
4040
so Xdef
4141
delete('Xdef')
4242
enddef
43+
44+
" Check that a command fails both when used in a :def function and when used
45+
" in Vim9 script.
46+
def CheckScriptAndDefFailure(lines: list<string>, error: string, lnum = -3)
47+
CheckDefFailure(lines, error, lnum)
48+
CheckScriptFailure(['vim9script'] + lines, error, lnum + 1)
49+
enddef

‎src/userfunc.c‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ one_function_arg(char_u *arg, garray_T *newargs, garray_T *argtypes, int skip)
119119
++p;
120120
if (!VIM_ISWHITE(*p))
121121
{
122-
semsg(_(e_white_space_required_after), ":");
122+
semsg(_(e_white_space_required_after_str), ":");
123123
return arg;
124124
}
125125
type = skipwhite(p);
@@ -276,7 +276,7 @@ get_function_args(
276276
if (!skip && in_vim9script()
277277
&& !IS_WHITE_OR_NUL(*p) && *p != endchar)
278278
{
279-
semsg(_(e_white_space_required_after), ",");
279+
semsg(_(e_white_space_required_after_str), ",");
280280
goto err_ret;
281281
}
282282
}
@@ -623,6 +623,7 @@ get_func_tv(
623623
int ret = OK;
624624
typval_T argvars[MAX_FUNC_ARGS + 1]; // vars for arguments
625625
int argcount = 0; // number of arguments found
626+
int vim9script = in_vim9script();
626627

627628
/*
628629
* Get the arguments.
@@ -644,10 +645,25 @@ get_func_tv(
644645
++argcount;
645646
// The comma should come right after the argument, but this wasn't
646647
// checked previously, thus only enforce it in Vim9 script.
647-
if (!in_vim9script())
648+
if (vim9script)
649+
{
650+
if (*argp != ',' && *skipwhite(argp) == ',')
651+
{
652+
semsg(_(e_no_white_space_allowed_before_str), ",");
653+
ret = FAIL;
654+
break;
655+
}
656+
}
657+
else
648658
argp = skipwhite(argp);
649659
if (*argp != ',')
650660
break;
661+
if (vim9script && !IS_WHITE_OR_NUL(argp[1]))
662+
{
663+
semsg(_(e_white_space_required_after_str), ",");
664+
ret = FAIL;
665+
break;
666+
}
651667
}
652668
argp = skipwhite_and_linebreak(argp, evalarg);
653669
if (*argp == ')')
@@ -3275,7 +3291,7 @@ def_function(exarg_T *eap, char_u *name_arg)
32753291
|| fp->uf_script_ctx.sc_seq == current_sctx.sc_seq)))
32763292
{
32773293
if (vim9script)
3278-
emsg_funcname(e_name_already_defined, name);
3294+
emsg_funcname(e_name_already_defined_str, name);
32793295
else
32803296
emsg_funcname(e_funcexts, name);
32813297
goto erret;

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1504,
757759
/**/
758760
1503,
759761
/**/

‎src/vim9compile.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ check_defined(char_u *p, size_t len, cctx_T *cctx)
295295
|| find_func_even_dead(p, FALSE, cctx) != NULL)
296296
{
297297
p[len] = c;
298-
semsg(_(e_name_already_defined), p);
298+
semsg(_(e_name_already_defined_str), p);
299299
return FAIL;
300300
}
301301
p[len] = c;
@@ -2202,14 +2202,14 @@ compile_arguments(char_u **arg, cctx_T *cctx, int *argcount)
22022202

22032203
if (*p != ',' && *skipwhite(p) == ',')
22042204
{
2205-
semsg(_(e_no_white_space_allowed_before), ",");
2205+
semsg(_(e_no_white_space_allowed_before_str), ",");
22062206
p = skipwhite(p);
22072207
}
22082208
if (*p == ',')
22092209
{
22102210
++p;
22112211
if (*p != NUL && !VIM_ISWHITE(*p))
2212-
semsg(_(e_white_space_required_after), ",");
2212+
semsg(_(e_white_space_required_after_str), ",");
22132213
}
22142214
whitep = p;
22152215
p = skipwhite(p);
@@ -2416,7 +2416,7 @@ compile_list(char_u **arg, cctx_T *cctx)
24162416
}
24172417
if (*p == ',')
24182418
{
2419-
semsg(_(e_no_white_space_allowed_before), ",");
2419+
semsg(_(e_no_white_space_allowed_before_str), ",");
24202420
return FAIL;
24212421
}
24222422
if (*p == ']')
@@ -2432,7 +2432,7 @@ compile_list(char_u **arg, cctx_T *cctx)
24322432
++p;
24332433
if (*p != ']' && !IS_WHITE_OR_NUL(*p))
24342434
{
2435-
semsg(_(e_white_space_required_after), ",");
2435+
semsg(_(e_white_space_required_after_str), ",");
24362436
return FAIL;
24372437
}
24382438
}
@@ -2618,15 +2618,15 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
26182618
if (**arg != ':')
26192619
{
26202620
if (*skipwhite(*arg) == ':')
2621-
semsg(_(e_no_white_space_allowed_before), ":");
2621+
semsg(_(e_no_white_space_allowed_before_str), ":");
26222622
else
26232623
semsg(_(e_missing_dict_colon), *arg);
26242624
return FAIL;
26252625
}
26262626
whitep = *arg + 1;
26272627
if (!IS_WHITE_OR_NUL(*whitep))
26282628
{
2629-
semsg(_(e_white_space_required_after), ":");
2629+
semsg(_(e_white_space_required_after_str), ":");
26302630
return FAIL;
26312631
}
26322632

@@ -2657,7 +2657,7 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
26572657
}
26582658
if (IS_WHITE_OR_NUL(*whitep))
26592659
{
2660-
semsg(_(e_no_white_space_allowed_before), ",");
2660+
semsg(_(e_no_white_space_allowed_before_str), ",");
26612661
return FAIL;
26622662
}
26632663
whitep = *arg + 1;
@@ -3518,7 +3518,7 @@ error_white_both(char_u *op, int len)
35183518
char_u buf[10];
35193519

35203520
vim_strncpy(buf, op, len);
3521-
semsg(_(e_white_space_required_before_and_after), buf);
3521+
semsg(_(e_white_space_required_before_and_after_str), buf);
35223522
}
35233523

35243524
/*
@@ -3542,7 +3542,7 @@ compile_expr7t(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
35423542
if (**arg != '>')
35433543
{
35443544
if (*skipwhite(*arg) == '>')
3545-
semsg(_(e_no_white_space_allowed_before), ">");
3545+
semsg(_(e_no_white_space_allowed_before_str), ">");
35463546
else
35473547
emsg(_(e_missing_gt));
35483548
return FAIL;
@@ -3887,7 +3887,7 @@ compile_and_or(
38873887

38883888
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[2]))
38893889
{
3890-
semsg(_(e_white_space_required_before_and_after), op);
3890+
semsg(_(e_white_space_required_before_and_after_str), op);
38913891
return FAIL;
38923892
}
38933893

@@ -4028,7 +4028,7 @@ compile_expr1(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
40284028

40294029
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1]))
40304030
{
4031-
semsg(_(e_white_space_required_before_and_after), "?");
4031+
semsg(_(e_white_space_required_before_and_after_str), "?");
40324032
return FAIL;
40334033
}
40344034

@@ -4087,7 +4087,7 @@ compile_expr1(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
40874087

40884088
if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1]))
40894089
{
4090-
semsg(_(e_white_space_required_before_and_after), ":");
4090+
semsg(_(e_white_space_required_before_and_after_str), ":");
40914091
return FAIL;
40924092
}
40934093

@@ -4394,7 +4394,7 @@ vim9_declare_error(char_u *name)
43944394
return;
43954395
case '&': semsg(_(e_cannot_declare_an_option), name);
43964396
return;
4397-
case '@': semsg(_(e_cannot_declare_a_register), name);
4397+
case '@': semsg(_(e_cannot_declare_a_register_str), name);
43984398
return;
43994399
default: return;
44004400
}
@@ -4775,7 +4775,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
47754775
// parse optional type: "let var: type = expr"
47764776
if (!VIM_ISWHITE(p[1]))
47774777
{
4778-
semsg(_(e_white_space_required_after), ":");
4778+
semsg(_(e_white_space_required_after_str), ":");
47794779
goto theend;
47804780
}
47814781
p = skipwhite(p + 1);
@@ -6042,7 +6042,7 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)
60426042
end = skip_regexp_ex(p + 1, *p, TRUE, &tofree, &dropped);
60436043
if (*end != *p)
60446044
{
6045-
semsg(_(e_separator_mismatch), p);
6045+
semsg(_(e_separator_mismatch_str), p);
60466046
vim_free(tofree);
60476047
return FAIL;
60486048
}

‎src/vim9script.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ vim9_declare_scriptvar(exarg_T *eap, char_u *arg)
532532
}
533533
if (!VIM_ISWHITE(p[1]))
534534
{
535-
semsg(_(e_white_space_required_after), ":");
535+
semsg(_(e_white_space_required_after_str), ":");
536536
return arg + STRLEN(arg);
537537
}
538538
name = vim_strnsave(arg, p - arg);

0 commit comments

Comments
 (0)