Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix not evaluated dictionary access with scriptversion 2 is always error #4704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kuuote wants to merge 2 commits into from
Closed

Fix not evaluated dictionary access with scriptversion 2 is always error #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da19743
Fix not evaluated dictionary access with `scriptversion 2` is always …
kuuote Jul 20, 2019
1418180
Add test
kuuote Jul 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/eval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4059,7 +4059,7 @@ eval5(char_u **arg, typval_T *rettv, int evaluate)
// "." is only string concatenation when scriptversion is 1
op = **arg;
concat = op == '.'
&& (*(*arg + 1) == '.' || current_sctx.sc_version < 2);
&& (*(*arg + 1) == '.' || current_sctx.sc_version < 2 || !evaluate);
if (op != '+' && op != '-' && !concat)
break;

Expand Down
7 changes: 7 additions & 0 deletions src/testdir/test_eval_stuff.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ func Test_vvar_scriptversion2()
call assert_true(v:versionlong > 8011525)
endfunc

func Test_dict_access_scriptversion2()
let l:x = {'foo': 1}

call assert_false(0 && l:x.foo)
call assert_true(1 && l:x.foo)
endfunc

func Test_scriptversion()
call writefile(['scriptversion 9'], 'Xversionscript')
call assert_fails('source Xversionscript', 'E999:')
Expand Down