aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.0755: Vim9: No error when variable initializer is not a constant

Browse Source 
Problem:    Vim9: No error when variable initializer is not a constant.
Solution:   Return FAIL when trying to get a variable value.  Do not execute a
            script when an error is deteted in the first or second phase.
This commit is contained in:
Bram Moolenaar
2020-05-15 18:17:28 +02:00
parent a5d0077efb
commit 227a69de1e
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vim9script.c
View File

@@ -37,6 +37,7 @@ ex_vim9script(exarg_T *eap)
garray_T func_ga;
int idx;
ufunc_T *ufunc;
int start_called_emsg = called_emsg;
if (!getline_equal(eap->getline, eap->cookie, getsourceline))
{
@@ -66,7 +67,7 @@ ex_vim9script(exarg_T *eap)
// The types are recognized, so that they can be used when compiling a
// function.
gap = source_get_line_ga(eap->cookie);
for (;;)
while (called_emsg == start_called_emsg)
{
char_u *line;
char_u *p;
@@ -132,22 +133,29 @@ ex_vim9script(exarg_T *eap)
}
else if (checkforcmd(&p, "finish", 4))
{
// TODO: this should not happen below "if false".
// Use "if cond | finish | endif as a workaround.
break;
}
}
// Compile the :def functions.
for (idx = 0; idx < func_ga.ga_len; ++idx)
for (idx = 0; idx < func_ga.ga_len && called_emsg == start_called_emsg; ++idx)
{
ufunc = ((ufunc_T **)(func_ga.ga_data))[idx];
compile_def_function(ufunc, FALSE, NULL);
}
ga_clear(&func_ga);
// Return to process the commands at the script level.
source_use_line_ga(eap->cookie);
if (called_emsg == start_called_emsg)
{
// Return to process the commands at the script level.
source_use_line_ga(eap->cookie);
}
else
{
// If there was an error in the first or second phase then don't
// execute the script lines.
do_finish(eap, FALSE);
}
}
/*