Patch 8.2.3186

[Bram Moolenaar]

Patch 8.2.3186
Problem: Vim9: not all failures for import tested
Solution: Test more import failures
Files: src/errors.h, src/evalvars.c, src/testdir/test_vim9_script.vim


*** ../vim-8.2.3185/src/errors.h 2021-07-19 20:07:16.701295618 +0200
--- src/errors.h 2021-07-19 21:30:27.913982889 +0200
***************
*** 511,517 ****
EXTERN char e_bool_required_for_argument_nr[]
INIT(= N_("E1212: Bool required for argument %d"));
EXTERN char e_redefining_imported_item_str[]
! INIT(= N_("E1213: Redefining imported item %s"));
#if defined(FEAT_DIGRAPHS) && defined(FEAT_EVAL)
EXTERN char e_digraph_must_be_just_two_characters_str[]
INIT(= N_("E1214: Digraph must be just two characters: %s"));
--- 511,517 ----
EXTERN char e_bool_required_for_argument_nr[]
INIT(= N_("E1212: Bool required for argument %d"));
EXTERN char e_redefining_imported_item_str[]
! INIT(= N_("E1213: Redefining imported item \"%s\""));
#if defined(FEAT_DIGRAPHS) && defined(FEAT_EVAL)
EXTERN char e_digraph_must_be_just_two_characters_str[]
INIT(= N_("E1214: Digraph must be just two characters: %s"));
*** ../vim-8.2.3185/src/evalvars.c 2021-07-18 21:24:46.866637807 +0200
--- src/evalvars.c 2021-07-19 21:41:35.105087773 +0200
***************
*** 3250,3255 ****
--- 3250,3256 ----
{
scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
svar_T *sv;
+ where_T where;

// imported variable from another script
if ((flags & ASSIGN_NO_DECL) == 0)
***************
*** 3257,3266 ****
semsg(_(e_redefining_imported_item_str), name);
goto failed;
}
! sv = ((svar_T *)si->sn_var_vals.ga_data)
! + import->imp_var_vals_idx;
! // TODO: check the type
! // TODO: check for const and locked
dest_tv = sv->sv_tv;
clear_tv(dest_tv);
}
--- 3258,3273 ----
semsg(_(e_redefining_imported_item_str), name);
goto failed;
}
! sv = ((svar_T *)si->sn_var_vals.ga_data) + import->imp_var_vals_idx;
!
! where.wt_index = 0;
! where.wt_variable = TRUE;
! if (check_typval_type(sv->sv_type, tv, where) == FAIL
! || value_check_lock(sv->sv_tv->v_lock, name, FALSE))
! {
! goto failed;
! }
!
dest_tv = sv->sv_tv;
clear_tv(dest_tv);
}
*** ../vim-8.2.3185/src/testdir/test_vim9_script.vim 2021-07-18 20:40:29.550272444 +0200
--- src/testdir/test_vim9_script.vim 2021-07-19 21:43:52.356890097 +0200
***************
*** 1375,1380 ****
--- 1375,1404 ----
writefile(import_missing_comma_lines, 'Ximport3.vim')
assert_fails('source Ximport3.vim', 'E1046:', '', 2, 'Ximport3.vim')

+ var import_redefining_lines =<< trim END
+ vim9script
+ import exported from './Xexport.vim'
+ var exported = 5
+ END
+ writefile(import_redefining_lines, 'Ximport.vim')
+ assert_fails('source Ximport.vim', 'E1213: Redefining imported item "exported"', '', 3)
+
+ var import_assign_wrong_type_lines =<< trim END
+ vim9script
+ import exported from './Xexport.vim'
+ exported = 'xxx'
+ END
+ writefile(import_assign_wrong_type_lines, 'Ximport.vim')
+ assert_fails('source Ximport.vim', 'E1012: Type mismatch; expected number but got string', '', 3)
+
+ var import_assign_const_lines =<< trim END
+ vim9script
+ import CONST from './Xexport.vim'
+ CONST = 4321
+ END
+ writefile(import_assign_const_lines, 'Ximport.vim')
+ assert_fails('source Ximport.vim', 'E741: Value is locked: CONST', '', 3)
+
delete('Ximport.vim')
delete('Ximport3.vim')
delete('Xexport.vim')
*** ../vim-8.2.3185/src/version.c 2021-07-19 21:04:20.179847743 +0200
--- src/version.c 2021-07-19 21:44:12.388861018 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3186,
/**/

--
hundred-and-one symptoms of being an internet addict:
187. You promise yourself that you'll only stay online for another
15 minutes...at least once every hour.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///