From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 26 Jun 2021 19:52:02 +0000 (+0200)
Subject: patch 8.2.3058: Vim9: cannot use ternary operator in parenthesis
X-Git-Tag: v8.2.3058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=015cf103115f9a0380ae3e3e85a77792cfe87d49;p=vim

patch 8.2.3058: Vim9: cannot use ternary operator in parenthesis

Problem:    Vim9: cannot use ternary operator in parenthesis.
Solution:   Do not use "==" for a default argument value.  (closes #8462)
---

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index ee97e56ea..563b7bab8 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -923,6 +923,13 @@ def Test_call_lambda_args()
   END
   CheckDefAndScriptFailure(lines, 'E1172:')
 
+  lines =<< trim END
+      var a = 0
+      var b = (a == 0 ? 1 : 2)
+      assert_equal(1, b)
+  END
+  CheckDefAndScriptSuccess(lines)
+
   lines =<< trim END
       def ShadowLocal()
         var one = 1
diff --git a/src/userfunc.c b/src/userfunc.c
index cedd37b9a..3321f089c 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -266,13 +266,18 @@ get_function_args(
 	}
 	else
 	{
+	    char_u *np;
+
 	    arg = p;
 	    p = one_function_arg(p, newargs, argtypes, types_optional,
 							 evalarg, FALSE, skip);
 	    if (p == arg)
 		break;
 
-	    if (*skipwhite(p) == '=' && default_args != NULL)
+	    // Recognize " = expr" but not " == expr".  A lambda can have
+	    // "(a = expr" but "(a == expr" is not a lambda.
+	    np = skipwhite(p);
+	    if (*np == '=' && np[1] != '=' && default_args != NULL)
 	    {
 		typval_T	rettv;
 
diff --git a/src/version.c b/src/version.c
index 6069a397b..59f84d446 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3058,
 /**/
     3057,
 /**/