commit 61a89816996a0cad0d711c91e6e7cea9a9101211
author Bram Moolenaar <Bram@vim.org> Thu May 07 16:58:17 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Thu May 07 16:58:17 2020 +0200
tree c1256b63ced7f3efb60548685764189fdef61889
parent f391586f3f6a304d3bb0160ab75bdd9d758bd2da

patch 8.2.0708: Vim9: constant expressions are not simplified

Problem:    Vim9: constant expressions are not simplified.
Solution:   Simplify string concatenation.

src/testdir/test_vim9_disassemble.vim

diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index 5c4ecd2..5cb7383 100644
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -996,9 +996,7 @@
         '\d PUSHS "message".*' ..
         '\d ECHOMSG 2.*' ..
         "echoerr 'went' .. 'wrong'.*" ..
-        '\d PUSHS "went".*' ..
-        '\d PUSHS "wrong".*' ..
-        '\d CONCAT.*' ..
+        '\d PUSHS "wentwrong".*' ..
         '\d ECHOERR 1.*' ..
         '\d PUSHNR 0.*' ..
         '\d RETURN',
@@ -1037,4 +1035,16 @@
         res3)
 enddef
 
+def s:ConcatStrings(): string
+  return 'one' .. 'two' .. 'three'
+enddef
+
+def Test_simplify_const_expr()
+  let res = execute('disass s:ConcatStrings')
+  assert_match('\<SNR>\d*_ConcatStrings.*' ..
+        '\d PUSHS "onetwothree".*' ..
+        '\d RETURN',
+        res)
+enddef
+
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker