summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-01-01 20:31:30 +0000
committerBram Moolenaar <Bram@vim.org>2023-01-01 20:31:30 +0000
commit993dbc33a82a4ed877ee76265d6483b190e2feb1 (patch)
tree92141b73506eab3df700826ab4125d844d15e3c4
parent6acf757c6a11c0653b0132a17c22983856da5ad6 (diff)
downloadvim-git-993dbc33a82a4ed877ee76265d6483b190e2feb1.tar.gz
patch 9.0.1128: build failurev9.0.1128
Problem: Build failure. Solution: Add type cast. Add missing error messages.
-rw-r--r--src/errors.h6
-rw-r--r--src/version.c2
-rw-r--r--src/vim9class.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/src/errors.h b/src/errors.h
index e33f2e66b..26629b030 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3401,3 +3401,9 @@ EXTERN char e_member_not_found_on_class_str_str[]
EXTERN char e_cannot_add_textprop_with_text_after_using_textprop_with_negative_id[]
INIT(= N_("E1339: Cannot add a textprop with text after using a textprop with a negative id"));
#endif
+#ifdef FEAT_EVAL
+EXTERN char e_argument_already_declared_in_class_str[]
+ INIT(= N_("E1340: Argument already declared in the class: %s"));
+EXTERN char e_variable_already_declared_in_class_str[]
+ INIT(= N_("E1341: Variable already declared in the class: %s"));
+#endif
diff --git a/src/version.c b/src/version.c
index dc320bef6..5efbf60ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1128,
+/**/
1127,
/**/
1126,
diff --git a/src/vim9class.c b/src/vim9class.c
index 8e05a17f4..e764f7088 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -827,7 +827,8 @@ find_class_func(char_u **arg)
size_t len = name_end - name;
typval_T tv;
tv.v_type = VAR_UNKNOWN;
- if (eval_variable(name, len, 0, &tv, NULL, EVAL_VAR_NOAUTOLOAD) == FAIL)
+ if (eval_variable(name, (int)len,
+ 0, &tv, NULL, EVAL_VAR_NOAUTOLOAD) == FAIL)
return NULL;
if (tv.v_type != VAR_CLASS && tv.v_type != VAR_OBJECT)
goto fail_after_eval;