commit d62d87d8f3f337a25b7da72abf55fc8a4bb6100c
author Bram Moolenaar <Bram@vim.org> Mon Jan 04 17:40:12 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 04 17:40:12 2021 +0100
tree 2f3fd08cc915f6828cd3eb58a6c333ed8b956acc
parent d1510ee9469f623c872a18b6e3c3666c0fb23c58

patch 8.2.2300: Vim9: wrong order on type stack when using dict

Problem:    Vim9: wrong order on type stack when using dict.
Solution:   Generate constants before a dict. (closes #7619)

src/testdir/test_vim9_expr.vim

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index e613f10..4941650 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1094,6 +1094,8 @@
 
       $ENVVAR = 'env'
       assert_equal('aenv', 'a' .. $ENVVAR)
+
+      assert_equal('val', '' .. {key: 'val'}['key'])
   END
   CheckDefAndScriptSuccess(lines)
 enddef

src/version.c

diff --git a/src/version.c b/src/version.c
index 07113c4..d106f3b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2300,
+/**/
     2299,
 /**/
     2298,

src/vim9compile.c

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 4007641..0d19b7d 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3027,6 +3027,8 @@
 
     if (d == NULL)
 	return FAIL;
+    if (generate_ppconst(cctx, ppconst) == FAIL)
+	return FAIL;
     for (;;)
     {
 	char_u	    *key = NULL;