]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.0.2181: Vim9: missing error messages v9.0.2181
authorErnie Rael <errael@raelity.com>
Tue, 19 Dec 2023 21:15:27 +0000 (22:15 +0100)
committerChristian Brabandt <cb@256bit.org>
Tue, 19 Dec 2023 21:15:27 +0000 (22:15 +0100)
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>
src/errors.h
src/testdir/test_vim9_assign.vim
src/version.c
src/vim9compile.c

index 5eac961237a9d3babdc2025cca20cbe011b68ec8..828e8de2493663aec77ba11423bfc70f266d2b28 100644 (file)
@@ -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[]
index c6828e32dffc5c6817752df47035aafff0178011..f904696110806b628e30ba422a32e6133cef9208 100644 (file)
@@ -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
index 3f636c7a340714e57f4242d69719d5085e61f52f..316e638920303ffe229c517c2a2e93c65a45a951 100644 (file)
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2181,
 /**/
     2180,
 /**/
index b896f43d308c2e49366a489993bfe377c1fcbd5d..17a3b6a5c336a175a019e057dfcd79e2bdc4160f 100644 (file)
@@ -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,
@@ -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,