0
0
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00

patch 8.2.4582: useless code handling a type declaration

Problem:    Useless code handling a type declaration.
Solution:   Remove the code and give an error.
This commit is contained in:
Bram Moolenaar
2022-03-16 20:01:39 +00:00
parent d597ab00d7
commit 4c8b546da2
5 changed files with 40 additions and 22 deletions

View File

@@ -3252,4 +3252,6 @@ EXTERN char e_cannot_use_s_backslash_in_vim9_script[]
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
EXTERN char e_compiling_closure_without_context_str[] EXTERN char e_compiling_closure_without_context_str[]
INIT(= N_("E1271: compiling closure without context: %s")); INIT(= N_("E1271: compiling closure without context: %s"));
EXTERN char e_using_type_not_in_script_context_str[]
INIT(= N_("E1272: Using type not in a script context: %s"));
#endif #endif

View File

@@ -937,8 +937,6 @@ get_lval(
} }
if (*p == ':') if (*p == ':')
{ {
garray_T tmp_type_list;
garray_T *type_list;
char_u *tp = skipwhite(p + 1); char_u *tp = skipwhite(p + 1);
if (tp == p + 1 && !quiet) if (tp == p + 1 && !quiet)
@@ -947,27 +945,19 @@ get_lval(
return NULL; return NULL;
} }
if (SCRIPT_ID_VALID(current_sctx.sc_sid)) if (!SCRIPT_ID_VALID(current_sctx.sc_sid))
type_list = &SCRIPT_ITEM(current_sctx.sc_sid)->sn_type_list;
else
{ {
// TODO: should we give an error here? semsg(_(e_using_type_not_in_script_context_str), p);
type_list = &tmp_type_list; return NULL;
ga_init2(type_list, sizeof(type_T), 10);
} }
// parse the type after the name // parse the type after the name
lp->ll_type = parse_type(&tp, type_list, !quiet); lp->ll_type = parse_type(&tp,
&SCRIPT_ITEM(current_sctx.sc_sid)->sn_type_list,
!quiet);
if (lp->ll_type == NULL && !quiet) if (lp->ll_type == NULL && !quiet)
return NULL; return NULL;
lp->ll_name_end = tp; lp->ll_name_end = tp;
// drop the type when not in a script
if (type_list == &tmp_type_list)
{
lp->ll_type = NULL;
clear_type_list(type_list);
}
} }
} }
} }

View File

@@ -0,0 +1,6 @@
|~+0#4040ff13#ffffff0| @73
|~| @73
|~| @73
|~| @73
|E+0#ffffff16#e000002|1|2|7|2|:| |U|s|i|n|g| |t|y|p|e| |n|o|t| |i|n| |a| |s|c|r|i|p|t| |c|o|n|t|e|x|t|:| |:| |s|t|r|i|n|g| +0#0000000#ffffff0@23
|P+0#00e0003&|r|e|s@1| |E|N|T|E|R| |o|r| |t|y|p|e| |c|o|m@1|a|n|d| |t|o| |c|o|n|t|i|n|u|e> +0#0000000&@35

View File

@@ -3942,10 +3942,6 @@ def Test_profile_with_lambda()
enddef enddef
def Profile() def Profile()
profile start Xprofile.log
profile func ProfiledWithLambda
# mark ProfiledNested for profiling to avoid E1271
profile func ProfiledNested
ProfiledWithLambda() ProfiledWithLambda()
ProfiledNested() ProfiledNested()
@@ -3957,8 +3953,20 @@ def Test_profile_with_lambda()
profdel func * profdel func *
profile pause profile pause
enddef enddef
var result = 'done'
try
# mark functions for profiling now to avoid E1271
profile start Xprofile.log
profile func ProfiledWithLambda
profile func ProfiledNested
Profile() Profile()
writefile(['done'], 'Xdidprofile') catch
result = 'failed: ' .. v:exception
finally
writefile([result], 'Xdidprofile')
endtry
END END
writefile(lines, 'Xprofile.vim') writefile(lines, 'Xprofile.vim')
call system(g:GetVimCommand() call system(g:GetVimCommand()
@@ -3974,6 +3982,16 @@ def Test_profile_with_lambda()
delete('Xprofile.vim') delete('Xprofile.vim')
enddef enddef
def Test_misplaced_type()
writefile(['let g:somevar = "asdf"'], 'XTest_misplaced_type')
var buf = g:RunVimInTerminal('-S XTest_misplaced_type', {'rows': 6})
term_sendkeys(buf, ":vim9cmd echo islocked('g:somevar: string')\<CR>")
g:VerifyScreenDump(buf, 'Test_misplaced_type', {})
g:StopVimInTerminal(buf)
delete('XTest_misplaced_type')
enddef
" Keep this last, it messes up highlighting. " Keep this last, it messes up highlighting.
def Test_substitute_cmd() def Test_substitute_cmd()
new new

View File

@@ -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 */
/**/
4582,
/**/ /**/
4581, 4581,
/**/ /**/