commit 0c35752d04f70408a3c560d5b3edbafcaddff302
author Bram Moolenaar <Bram@vim.org> Sun Jul 18 14:43:43 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 18 14:43:43 2021 +0200
tree f4db397f3be18ba9dc6082b73ed24e98affb15da
parent c6ba2f9dde6d01c8ab356c239c2259f7d83652a4

patch 8.2.3176: Vim9: no type error for comparing number with string

Problem:    Vim9: no type error for comparing number with string.
Solution:   Add a runtime type check. (closes #8571)

src/typval.c

diff --git a/src/typval.c b/src/typval.c
index 03891c8..9d5903f 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -937,7 +937,9 @@
 	}
     }
     else if (in_vim9script() && (typ1->v_type == VAR_BOOL
-						 || typ2->v_type == VAR_BOOL))
+				    || typ2->v_type == VAR_BOOL
+				    || (typ1->v_type == VAR_SPECIAL
+					      && typ2->v_type == VAR_SPECIAL)))
     {
 	if (typ1->v_type != typ2->v_type)
 	{
@@ -955,13 +957,23 @@
 	    case EXPR_ISNOT:
 	    case EXPR_NEQUAL:   n1 = (n1 != n2); break;
 	    default:
-		emsg(_(e_invalid_operation_for_bool));
+		semsg(_(e_invalid_operation_for_str),
+						   vartype_name(typ1->v_type));
 		clear_tv(typ1);
 		return FAIL;
 	}
     }
     else
     {
+	if (in_vim9script()
+	      && ((typ1->v_type != VAR_STRING && typ1->v_type != VAR_SPECIAL)
+	       || (typ2->v_type != VAR_STRING && typ2->v_type != VAR_SPECIAL)))
+	{
+	    semsg(_(e_cannot_compare_str_with_str),
+		       vartype_name(typ1->v_type), vartype_name(typ2->v_type));
+	    clear_tv(typ1);
+	    return FAIL;
+	}
 	s1 = tv_get_string_buf(typ1, buf1);
 	s2 = tv_get_string_buf(typ2, buf2);
 	if (type != EXPR_MATCH && type != EXPR_NOMATCH)