forked from aniani/vim
patch 8.2.1980: Vim9: some tests are not done at the script level
Problem: Vim9: some tests are not done at the script level. Solution: Use CheckDefAndScriptSuccess() in more places. Fix uncovered problems.
This commit is contained in:
10
src/eval.c
10
src/eval.c
@@ -3438,7 +3438,15 @@ eval7_leader(
|
|||||||
}
|
}
|
||||||
#ifdef FEAT_FLOAT
|
#ifdef FEAT_FLOAT
|
||||||
if (rettv->v_type == VAR_FLOAT)
|
if (rettv->v_type == VAR_FLOAT)
|
||||||
f = !f;
|
{
|
||||||
|
if (in_vim9script())
|
||||||
|
{
|
||||||
|
rettv->v_type = VAR_BOOL;
|
||||||
|
val = f == 0.0 ? VVAL_TRUE : VVAL_FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
f = !f;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
@@ -1264,7 +1264,7 @@ eval_list(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
|
|||||||
had_comma = **arg == ',';
|
had_comma = **arg == ',';
|
||||||
if (had_comma)
|
if (had_comma)
|
||||||
{
|
{
|
||||||
if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]))
|
if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]) && (*arg)[1] != ']')
|
||||||
{
|
{
|
||||||
semsg(_(e_white_space_required_after_str), ",");
|
semsg(_(e_white_space_required_after_str), ",");
|
||||||
goto failret;
|
goto failret;
|
||||||
|
@@ -1332,7 +1332,10 @@ do_source(
|
|||||||
// set again.
|
// set again.
|
||||||
ht = &SCRIPT_VARS(sid);
|
ht = &SCRIPT_VARS(sid);
|
||||||
if (is_vim9)
|
if (is_vim9)
|
||||||
|
{
|
||||||
hashtab_free_contents(ht);
|
hashtab_free_contents(ht);
|
||||||
|
hash_init(ht);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int todo = (int)ht->ht_used;
|
int todo = (int)ht->ht_used;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1980,
|
||||||
/**/
|
/**/
|
||||||
1979,
|
1979,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user