patch 9.0.1625: "super" is not considered a reserved name

Problem:    "super" is not considered a reserved name.
Solution:   Add "super" to the list of reserved names. (closes #12515)

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 6db2718dafd2e981e4540cd1391e1d0e6fcdde4b..51a6c6f8d6d3b30c0fd20f33b695df011add0956 100644 (file)
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -311,6 +311,8 @@ def Test_reserved_name()
 
   for name in ['true',
                'false',
+               'this',
+               'super',
                'null',
                'null_blob',
                'null_dict',
@@ -322,6 +324,15 @@ def Test_reserved_name()
     v9.CheckDefExecAndScriptFailure(['var ' .. name .. ' =  0'], 'E1034:')
     v9.CheckDefExecAndScriptFailure(['var ' .. name .. ': bool'], 'E1034:')
   endfor
+
+  var lines =<< trim END
+      vim9script
+      def Foo(super: bool)
+       echo 'something'
+      enddef
+      defcompile
+  END
+  v9.CheckScriptFailure(lines, 'E1034:')
 enddef
 
 def Test_null_values()
@@ -1526,6 +1537,7 @@ def Test_assignment_failure()
   v9.CheckDefFailure(['var false = 1'], 'E1034:')
   v9.CheckDefFailure(['var null = 1'], 'E1034:')
   v9.CheckDefFailure(['var this = 1'], 'E1034:')
+  v9.CheckDefFailure(['var super = 1'], 'E1034:')
 
   v9.CheckDefFailure(['[a; b; c] = g:list'], 'E1001:')
   v9.CheckDefFailure(['var [a; b; c] = g:list'], 'E1080:')

diff --git a/src/userfunc.c b/src/userfunc.c
index 127588469accd06fdafe67d97de90db0b48f040f..47c3161512190b39d5acbc306fd6177f37b1fbf2 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -86,12 +86,23 @@ one_function_arg(
        return arg;
     }
 
-    // Vim9 script: cannot use script var name for argument. In function: also
-    // check local vars and arguments.
-    if (!skip && argtypes != NULL && check_defined(arg, p - arg,
-                              evalarg == NULL ? NULL : evalarg->eval_cctx,
+    // Extra checks in Vim9 script.
+    if (!skip && argtypes != NULL)
+    {
+       int c = *p;
+       *p = NUL;
+       int r = check_reserved_name(arg, FALSE);
+       *p = c;
+       if (r == FAIL)
+           return arg;
+
+       // Cannot use script var name for argument. In function: also check
+       // local vars and arguments.
+       if (check_defined(arg, p - arg,
+                                  evalarg == NULL ? NULL : evalarg->eval_cctx,
                               eap == NULL ? NULL : eap->cstack, TRUE) == FAIL)
-       return arg;
+           return arg;
+    }
 
     if (newargs != NULL && ga_grow(newargs, 1) == FAIL)
        return arg;

diff --git a/src/version.c b/src/version.c
index e8ff7e704bfb4da090cbf74ffd0c7540a5a3ab89..fa900c1abf5365e26b2c150e0f92393dbc461816 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1625,
 /**/
     1624,
 /**/

diff --git a/src/vim9script.c b/src/vim9script.c
index b1849db8e04a1943fb1286aedd11e5298b11b39a..a64ce7212680de47013f437268c9a83436f04146 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -1122,6 +1122,7 @@ static char *reserved[] = {
     "null_string",
     "null_channel",
     "null_job",
+    "super",
     "this",
     NULL
 };