Skip to content

Commit

Permalink
patch 9.0.2181: Vim9: missing error messages
Browse files Browse the repository at this point in the history
Problem:  Vim9: missing error messages
Solution: Add one more error message

closes: #13729

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
  • Loading branch information
errael authored and chrisbra committed Dec 19, 2023
1 parent cb69dc3 commit 5e13315
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/errors.h
Original file line number Diff line number Diff line change
Expand Up @@ -3574,8 +3574,10 @@ EXTERN char e_cannot_change_readonly_variable_str_in_class_str[]
INIT(= N_("E1409: Cannot change read-only variable \"%s\" in class \"%s\""));
EXTERN char e_const_variable_not_supported_in_interface[]
INIT(= N_("E1410: Const variable not supported in an interface"));
EXTERN char e_missing_dot_after_object_str[]
INIT(= N_("E1411: Missing dot after object \"%s\""));
#endif
// E1411 - E1499 unused (reserved for Vim9 class support)
// E1412 - E1499 unused (reserved for Vim9 class support)
EXTERN char e_cannot_mix_positional_and_non_positional_str[]
INIT(= N_("E1500: Cannot mix positional and non-positional arguments: %s"));
EXTERN char e_fmt_arg_nr_unused_str[]
Expand Down
25 changes: 25 additions & 0 deletions src/testdir/test_vim9_assign.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3174,6 +3174,31 @@ def Test_type_check()
END
v9.CheckSourceSuccess(lines)
endif

lines =<< trim END
vim9script
class A
endclass

def F()
A += 3
enddef
F()
END
v9.CheckScriptFailure(lines, 'E1405: Class "A" cannot be used as a value')

lines =<< trim END
vim9script
class A
endclass

var o = A.new()
def F()
o += 4
enddef
F()
END
v9.CheckScriptFailure(lines, 'E1411: Missing dot after object "o"')
enddef

" Test for checking the argument type of a def function
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2181,
/**/
2180,
/**/
Expand Down
6 changes: 6 additions & 0 deletions src/vim9compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,10 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u *var_start, cctx_T *cctx)
// Also for "obj.value".
char_u *dot = vim_strchr(var_start, '.');
if (dot == NULL)
{
semsg(_(e_missing_dot_after_object_str), lhs->lhs_name);
return FAIL;
}

class_T *cl = lhs->lhs_type->tt_class;
type_T *type = oc_member_type(cl, TRUE, dot + 1,
Expand Down Expand Up @@ -2294,7 +2297,10 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u *var_start, cctx_T *cctx)
// "<classname>.value": load class variable "classname.value"
char_u *dot = vim_strchr(var_start, '.');
if (dot == NULL)
{
check_type_is_value(lhs->lhs_type);
return FAIL;
}

class_T *cl = lhs->lhs_type->tt_class;
ocmember_T *m = class_member_lookup(cl, dot + 1,
Expand Down

0 comments on commit 5e13315

Please sign in to comment.