summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-27 15:39:57 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-27 15:39:57 +0000
commit5da36052a4bb0f3a9747ec3a8ab9d85e058e39fa (patch)
tree9660c5a693b3d25c4b6db76ca79204b99c6bea2d /src
parentbf7ff61af490a2fbc0d9c7d42f3bb7eb7d37127e (diff)
patch 8.2.3913: help for expressions does not mention Vim9 syntaxv8.2.3913
Problem: Help for expressions does not mention Vim9 syntax. Solution: Add the rules for Vim9 to the expression help. Rename functions to match the help.
Diffstat (limited to 'src')
-rw-r--r--src/version.c2
-rw-r--r--src/vim9expr.c12
2 files changed, 8 insertions, 6 deletions
diff --git a/src/version.c b/src/version.c
index 06a0a33700..658d9be04f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3913,
+/**/
3912,
/**/
3911,
diff --git a/src/vim9expr.c b/src/vim9expr.c
index 6a1faf839f..1e87b8eae1 100644
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -1883,7 +1883,7 @@ compile_subscript(
* trailing ->name() method call
*/
static int
-compile_expr7(
+compile_expr8(
char_u **arg,
cctx_T *cctx,
ppconst_T *ppconst)
@@ -2119,10 +2119,10 @@ compile_expr7(
}
/*
- * <type>expr7: runtime type check / conversion
+ * <type>expr8: runtime type check / conversion
*/
static int
-compile_expr7t(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
+compile_expr7(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
{
type_T *want_type = NULL;
@@ -2147,7 +2147,7 @@ compile_expr7t(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
return FAIL;
}
- if (compile_expr7(arg, cctx, ppconst) == FAIL)
+ if (compile_expr8(arg, cctx, ppconst) == FAIL)
return FAIL;
if (want_type != NULL)
@@ -2182,7 +2182,7 @@ compile_expr6(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
int ppconst_used = ppconst->pp_used;
// get the first expression
- if (compile_expr7t(arg, cctx, ppconst) == FAIL)
+ if (compile_expr7(arg, cctx, ppconst) == FAIL)
return FAIL;
/*
@@ -2208,7 +2208,7 @@ compile_expr6(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
return FAIL;
// get the second expression
- if (compile_expr7t(arg, cctx, ppconst) == FAIL)
+ if (compile_expr7(arg, cctx, ppconst) == FAIL)
return FAIL;
if (ppconst->pp_used == ppconst_used + 2