diff --git a/.cirrus.yml b/.cirrus.yml index 7a800207f6..b8d9c78525 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,7 +23,7 @@ freebsd_task: - sudo -u cirrus make test on_failure: test_artifacts: - name: "Cirrus-CI-freebsd-failed-tests" + name: "Cirrus-${CIRRUS_BUILD_ID}-freebsd-failed-tests" path: | runtime/indent/testdir/*.fail runtime/syntax/testdir/failed/* diff --git a/.github/actions/test_artifacts/action.yml b/.github/actions/test_artifacts/action.yml index 44738c505e..cbab486c69 100644 --- a/.github/actions/test_artifacts/action.yml +++ b/.github/actions/test_artifacts/action.yml @@ -7,7 +7,7 @@ runs: uses: actions/upload-artifact@v4 with: # Name of the artifact to upload. - name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests + name: GH-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests # A file, directory or wildcard pattern that describes what # to upload. diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim index 355f724d0f..cb4bb2c167 100644 --- a/runtime/autoload/ccomplete.vim +++ b/runtime/autoload/ccomplete.vim @@ -3,7 +3,7 @@ vim9script noclear # Vim completion script # Language: C # Maintainer: The Vim Project -# Last Change: 2024 Jun 06 +# Last Change: 2025 Jul 24 # Rewritten in Vim9 script by github user lacygoill # Former Maintainer: Bram Moolenaar @@ -121,6 +121,10 @@ export def Complete(findstart: bool, abase: string): any # {{{1 endif endwhile + if complete_check() + return v:none + endif + # Find the variable items[0]. # 1. in current function (like with "gd") # 2. in tags file(s) (like with ":tag") @@ -135,6 +139,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1 # Handle multiple declarations on the same line. var col2: number = col - 1 while line[col2] != ';' + if complete_check() + return res + endif --col2 endwhile line = line[col2 + 1 :] @@ -145,6 +152,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1 # declaration. var col2: number = col - 1 while line[col2] != ',' + if complete_check() + return res + endif --col2 endwhile if line[col2 + 1 : col - 1] =~ ' *[^ ][^ ]* *[^ ]' @@ -215,6 +225,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1 res = [] for i: number in len(diclist)->range() + if complete_check() + return res + endif # New ctags has the "typeref" field. Patched version has "typename". if diclist[i]->has_key('typename') res = res->extend(diclist[i]['typename']->StructMembers(items[1 :], true)) @@ -246,6 +259,9 @@ export def Complete(findstart: bool, abase: string): any # {{{1 var last: number = len(items) - 1 var brackets: string = '' while last >= 0 + if complete_check() + return res + endif if items[last][0] != '[' break endif @@ -311,6 +327,9 @@ def Dict2info(dict: dict): string # {{{1 # Use all the items in dictionary for the "info" entry. var info: string = '' for k: string in dict->keys()->sort() + if complete_check() + return info + endif info ..= k .. repeat(' ', 10 - strlen(k)) if k == 'cmd' info ..= dict['cmd'] @@ -346,6 +365,9 @@ def ParseTagline(line: string): dict # {{{1 endwhile endif for i: number in range(n + 1, len(l) - 1) + if complete_check() + return d + endif if l[i] == 'file:' d['static'] = 1 elseif l[i] !~ ':' @@ -441,6 +463,9 @@ def Nextitem( # {{{1 # Try to recognize the type of the variable. This is rough guessing... var res: list> for tidx: number in len(tokens)->range() + if complete_check() + return res + endif # Skip tokens starting with a non-ID character. if tokens[tidx] !~ '^\h' @@ -467,6 +492,11 @@ def Nextitem( # {{{1 # Use the tags file to find out if this is a typedef. var diclist: list> = taglist('^' .. tokens[tidx] .. '$') for tagidx: number in len(diclist)->range() + + if complete_check() + return res + endif + var item: dict = diclist[tagidx] # New ctags has the "typeref" field. Patched version has "typename". @@ -559,6 +589,9 @@ def StructMembers( # {{{1 endif if !cached while 1 + if complete_check() + return [] + endif execute 'silent! keepjumps noautocmd ' .. n .. 'vimgrep ' .. '/\t' .. typename .. '\(\t\|$\)/j ' .. fnames @@ -581,6 +614,9 @@ def StructMembers( # {{{1 var idx: number = 0 var target: string while 1 + if complete_check() + return [] + endif if idx >= len(items) target = '' # No further items, matching all members break @@ -619,6 +655,9 @@ def StructMembers( # {{{1 # Skip over next [...] items ++idx while 1 + if complete_check() + return matches + endif if idx >= len(items) return matches # No further items, return the result. endif @@ -646,6 +685,9 @@ def SearchMembers( # {{{1 # When "all" is true find all, otherwise just return 1 if there is any member. var res: list> for i: number in len(matches)->range() + if complete_check() + return res + endif var typename: string = '' var line: string if matches[i]->has_key('dict') diff --git a/runtime/autoload/dist/vimindent.vim b/runtime/autoload/dist/vimindent.vim index 37f2ee5e18..ff2f6d8823 100644 --- a/runtime/autoload/dist/vimindent.vim +++ b/runtime/autoload/dist/vimindent.vim @@ -2,12 +2,9 @@ vim9script # Language: Vim script # Maintainer: github user lacygoill -# Last Change: 2025 Apr 13 +# Last Change: 2025 Jul 25 # # Includes changes from The Vim Project: -# - 2024 Feb 09: Fix indent after literal Dict (A. Radev via #13966) -# - 2024 Nov 08: Fix indent after :silent! function (D. Kearns via #16009) -# - 2024 Dec 26: Fix indent for enums (Jim Zhou via #16293) # NOTE: Whenever you change the code, make sure the tests are still passing: # @@ -23,9 +20,8 @@ def IndentMoreInBracketBlock(): number # {{{2 if get(g:, 'vim_indent', {}) ->get('more_in_bracket_block', false) return shiftwidth() - else - return 0 endif + return 0 enddef def IndentMoreLineContinuation(): number # {{{2 @@ -35,9 +31,8 @@ def IndentMoreLineContinuation(): number # {{{2 if n->typename() == 'string' return n->eval() - else - return n endif + return n enddef # }}}2 @@ -145,7 +140,7 @@ const HEREDOC_OPERATOR: string = '\s=<<\s\@=\%(\s\+\%(trim\|eval\)\)\{,2}' # A better regex would be: # -# [^-+*/%.:# \t[:alnum:]\"|]\@=.\|->\@!\%(=\s\)\@!\|[+*/%]\%(=\s\)\@! +# [^-+*/%.:#[:blank:][:alnum:]\"|]\|->\@!\%(=\s\)\@!\|[+*/%]\%(=\s\)\@! # # But sometimes, it can be too costly and cause `E363` to be given. const PATTERN_DELIMITER: string = '[-+*/%]\%(=\s\)\@!' @@ -193,10 +188,9 @@ const MODIFIERS: dict = { patterns =<< trim eval END argdo\>!\= bufdo\>!\= - cdo\>!\= + [cl]f\=do\>!\= folddoc\%[losed]\> foldd\%[oopen]\> - ldo\=\>!\= tabdo\=\> windo\> au\%[tocmd]\>!\=.* @@ -290,9 +284,9 @@ patterns = [] for kwds: list in BLOCKS for kwd: string in kwds[0 : -2] if MODIFIERS->has_key(kwd->Unshorten()) - patterns += [$'\%({MODIFIERS[kwd]}\)\={kwd}'] + patterns->add($'\%({MODIFIERS[kwd]}\)\={kwd}') else - patterns += [kwd] + patterns->add(kwd) endif endfor endfor @@ -348,7 +342,8 @@ patterns =<< trim eval END {'\'}.*,$ {PLUS_MINUS_COMMAND} END @@ -430,6 +425,9 @@ export def Expr(lnum = v:lnum): number # {{{2 elseif line_A.lnum->IsRightBelow('HereDoc') var ind: number = b:vimindent.startindent unlet! b:vimindent + if line_A.text =~ ENDS_BLOCK_OR_CLAUSE + return ind - shiftwidth() + endif return ind endif @@ -444,9 +442,8 @@ export def Expr(lnum = v:lnum): number # {{{2 if line_A.text =~ BACKSLASH_AT_SOL if line_B.text =~ BACKSLASH_AT_SOL return Indent(line_B.lnum) - else - return Indent(line_B.lnum) + IndentMoreLineContinuation() endif + return Indent(line_B.lnum) + IndentMoreLineContinuation() endif if line_A->AtStartOf('FuncHeader') @@ -459,9 +456,8 @@ export def Expr(lnum = v:lnum): number # {{{2 unlet! b:vimindent if line_A.text =~ ENDS_FUNCTION return startindent - else - return startindent + shiftwidth() endif + return startindent + shiftwidth() endif var past_bracket_block: dict @@ -542,8 +538,9 @@ export def Expr(lnum = v:lnum): number # {{{2 if line_B.text =~ STARTS_CURLY_BLOCK return Indent(line_B.lnum) + shiftwidth() + IndentMoreInBracketBlock() + endif - elseif line_A.text =~ CLOSING_BRACKET_AT_SOL + if line_A.text =~ CLOSING_BRACKET_AT_SOL var start: number = MatchingOpenBracket(line_A) if start <= 0 return -1 @@ -565,9 +562,8 @@ export def Expr(lnum = v:lnum): number # {{{2 var block_start: number = SearchPairStart(start, middle, end) if block_start > 0 return Indent(block_start) - else - return -1 endif + return -1 endif var base_ind: number @@ -591,8 +587,7 @@ export def Expr(lnum = v:lnum): number # {{{2 endif endif - var ind: number = base_ind + Offset(line_A, line_B) - return [ind, 0]->max() + return base_ind + Offset(line_A, line_B) enddef def g:GetVimIndent(): number # {{{2 @@ -611,29 +606,31 @@ def Offset( # {{{2 if line_B->AtStartOf('FuncHeader') && IsInInterface() return 0 + endif # increase indentation inside a block - elseif line_B.text =~ STARTS_NAMED_BLOCK + if line_B.text =~ STARTS_NAMED_BLOCK || line_B->EndsWithCurlyBlock() # But don't indent if the line starting the block also closes it. if line_B->AlsoClosesBlock() return 0 + endif # Indent twice for a line continuation in the block header itself, so that # we can easily distinguish the end of the block header from the start of # the block body. - elseif (line_B->EndsWithLineContinuation() + if (line_B->EndsWithLineContinuation() && !line_A.isfirst) || (line_A.text =~ LINE_CONTINUATION_AT_SOL && line_A.text !~ PLUS_MINUS_COMMAND) || line_A.text->Is_IN_KeywordForLoop(line_B.text) return 2 * shiftwidth() - else - return shiftwidth() endif + return shiftwidth() + endif # increase indentation of a line if it's the continuation of a command which # started on a previous line - elseif !line_A.isfirst + if !line_A.isfirst && (line_B->EndsWithLineContinuation() || line_A.text =~ LINE_CONTINUATION_AT_SOL) && !(line_B->EndsWithComma() && line_A.lnum->IsInside('EnumBlock')) @@ -653,12 +650,11 @@ def HereDocIndent(line_A: string): number # {{{2 # will need to be indented relative to the start of the heredoc. It # must know where it starts; it needs the cache. return 0 - else - var ind: number = b:vimindent.startindent - # invalidate the cache so that it's not used for the next heredoc - unlet! b:vimindent - return ind endif + var ind: number = b:vimindent.startindent + # invalidate the cache so that it's not used for the next heredoc + unlet! b:vimindent + return ind endif # In a non-trimmed heredoc, all of leading whitespace is semantic. @@ -700,7 +696,7 @@ def HereDocIndent(line_A: string): number # {{{2 b:vimindent.startindent = new_startindent endif - return [0, Indent(v:lnum) + b:vimindent.offset]->max() + return Indent(v:lnum) + b:vimindent.offset enddef def CommentIndent(): number # {{{2 @@ -727,9 +723,8 @@ def CommentIndent(): number # {{{2 endif if getline(next) =~ ENDS_BLOCK return ind + shiftwidth() - else - return ind endif + return ind enddef def BracketBlockIndent(line_A: dict, block: dict): number # {{{2 diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 3f1daf4cc8..3a5a47d4df 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 9.1. Last change: 2025 Jul 21 +*builtin.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -12370,7 +12370,7 @@ wildtrigger() *wildtrigger()* produce a beep when no matches are found and generally operates more quietly. This makes it suitable for triggering completion automatically, such as from an |:autocmd|. - *cmdline-autocompletion* + *cmdline-autocompletion* Example: To make the completion menu pop up automatically as you type on the command line, use: > autocmd CmdlineChanged [:/?] call wildtrigger() diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 9fae2692ff..9b2e21b5d2 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 9.1. Last change: 2025 Jul 21 +*develop.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -297,16 +297,16 @@ count. ============================================================================== 3. Assumptions *design-assumptions* -The following sections define the portability and compatibility constraints that -all Vim code and build tools must adhere to. +The following sections define the portability and compatibility constraints +that all Vim code and build tools must adhere to. MAKEFILES *assumptions-makefiles* *POSIX.1-2001* -Vim’s main Makefiles target maximum portability, relying solely on features -defined in POSIX.1-2001 `make` and ignoring later POSIX standards or -GNU/BSD extensions. In practical terms, avoid: +Vim's main Makefiles target maximum portability, relying solely on features +defined in POSIX.1-2001 `make` and ignoring later POSIX standards or GNU/BSD +extensions. In practical terms, avoid: – % pattern rules – modern assignment (`:=`, `::=`) outside POSIX.1-2001 @@ -314,19 +314,18 @@ GNU/BSD extensions. In practical terms, avoid: – order-only prerequisites (`|`) or automatic directory creation – GNU/BSD conditionals (`ifdef`, `ifndef`, `.for`/`.endfor`, …) -Since POSIX.1-2001 supports only traditional suffix rules, every object -built in a separate directory must have an explicit rule. For example: +Since POSIX.1-2001 supports only traditional suffix rules, every object built +in a separate directory must have an explicit rule. For example: objects/evalbuffer.o: evalbuffer.c $(CCC) -o $@ evalbuffer.c -This verbosity ensures that the same Makefile builds Vim unchanged with -the default `make` on Linux, *BSD, macOS, Solaris, AIX, HP-UX and virtually -any Unix-like OS. +This verbosity ensures that the same Makefile builds Vim unchanged with the +default `make` on Linux, *BSD, macOS, Solaris, AIX, HP-UX and virtually any +Unix-like OS. -Some platform-specific Makefiles (e.g., for Windows, NSIS, or Cygwin) may -use more advanced features when compatibility with basic make is not -required. +Some platform-specific Makefiles (e.g., for Windows, NSIS, or Cygwin) may use +more advanced features when compatibility with basic make is not required. C COMPILER *assumptions-C-compiler* @@ -343,8 +342,8 @@ In addition, the following two `C99` features are explicitly allowed: – `//` comments, as required by |style-comments|; – the `_Bool` type. -Platform-specific code may use any newer compiler features supported on -that platform. +Platform-specific code may use any newer compiler features supported on that +platform. SIZE OF VARIABLES *assumptions-variables* diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 93fb9e1885..f6881d3951 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 9.1. Last change: 2025 Jul 20 +*eval.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3327,7 +3327,7 @@ text... CODE < *E121* -:let {var-name} .. List the value of variable {var-name}. Multiple +:let {var-name} ... List the value of variable {var-name}. Multiple variable names may be given. Special names recognized here: *E738* g: global variables diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index b4fe510b38..fd0b4f3297 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 9.1. Last change: 2024 Nov 17 +*gui_x11.txt* For Vim version 9.1. Last change: 2025 Jul 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -658,9 +658,8 @@ X11R5 with a library for X11R6 probably doesn't work (although the linking won't give an error message, Vim will crash later). *gui-wayland* -Initial support for the Wayland display server protocol has landed in patch -9.1.0064. To enable it, you need to set the environment variable -"$GVIM_ENABLE_WAYLAND" in your shell. +Support for the Wayland display server protocol has landed in patch +9.1.0064. Note: The Wayland protocol is subject to some restrictions, so the following functions won't work: |getwinpos()|, |getwinposx()|, |getwinposy()| and the diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 80b6041558..ec896809ef 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 9.1. Last change: 2025 Jul 17 +*insert.txt* For Vim version 9.1. Last change: 2025 Jul 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1133,6 +1133,22 @@ Stop completion *compl-stop* CTRL-X CTRL-Z Stop completion without changing the text. +AUTOCOMPLETION *ins-autocompletion* + +Vim can display a completion menu as you type, similar to using |i_CTRL-N|, +but triggered automatically. See |'autocomplete'|. The menu items are +collected from the sources listed in the |'complete'| option. + +Unlike manual |i_CTRL-N| completion, this mode uses a decaying timeout to keep +Vim responsive. Sources earlier in the |'complete'| list are given more time +(higher priority), but every source is guaranteed a time slice, however small. + +This mode is fully compatible with other completion modes. You can invoke +any of them at any time by typing |CTRL-X|, which temporarily suspends +autocompletion. To use |i_CTRL-N| specifically, press |CTRL-E| first to +dismiss the popup menu (see |complete_CTRL-E|). + + FUNCTIONS FOR FINDING COMPLETIONS *complete-functions* This applies to 'completefunc', 'thesaurusfunc' and 'omnifunc'. @@ -1475,7 +1491,7 @@ Universal Ctags is preferred, Exuberant Ctags is no longer being developed. For Exuberant ctags, version 5.6 or later is recommended. For version 5.5.4 you should add a patch that adds the "typename:" field: - ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch + https://ftp.nluug.nl/pub/vim/unstable/patches/ctags-5.5.4.patch A compiled .exe for MS-Windows can be found at: http://ctags.sourceforge.net/ https://github.com/universal-ctags/ctags-win32 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 662bd0b8be..42538bb9c4 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2025 Jul 21 +*options.txt* For Vim version 9.1. Last change: 2025 Jul 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -908,6 +908,13 @@ A jump table for the options with a short description can be found at |Q_op|. the current directory won't change when navigating to it. Note: When this option is on some plugins may not work. + *'autocomplete'* *'ac'* *'noautocomplete'* *'noac'* +'autocomplete' 'ac' boolean (default off) + global + {only available on platforms with timing support} + When on, Vim shows a completion menu as you type, similar to using + |i_CTRL-N|, but triggered automatically. See |ins-autocompletion|. + *'autoindent'* *'ai'* *'noautoindent'* *'noai'* 'autoindent' 'ai' boolean (default off) local to buffer @@ -2144,9 +2151,9 @@ A jump table for the options with a short description can be found at |Q_op|. If the Dict returned by the {func} includes {"refresh": "always"}, the function will be invoked again whenever the leading text changes. - If generating matches is potentially slow, |complete_check()| - should be used to avoid blocking and preserve editor - responsiveness. + If generating matches is potentially slow, call + |complete_check()| periodically to keep Vim responsive. This + is especially important for |ins-autocompletion|. F equivalent to using "F{func}", where the function is taken from the 'completefunc' option. o equivalent to using "F{func}", where the function is taken from @@ -2293,6 +2300,9 @@ A jump table for the options with a short description can be found at |Q_op|. completion in the preview window. Only works in combination with "menu" or "menuone". + Only "fuzzy", "popup", "popuphidden" and "preview" have an effect when + 'autocomplete' is enabled. + This option does not apply to |cmdline-completion|. See 'wildoptions' for that. diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index 32d460281c..cea3a3e05c 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 9.1. Last change: 2010 Aug 14 +*os_amiga.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -111,12 +111,12 @@ would be better to enter: vim --noplugins -Installation ~ +Installation of a binary archive ~ 1) Please copy the binary 'VIM' file to c: -2) Get the Vim runtime package from: +2) Get the Vim runtime package from (Note: that server is no longer updated): - ftp://ftp.vim.org/pub/vim/amiga/vim62rt.tgz + https://ftp.nluug.nl/pub/vim/amiga/vim90src.tgz and unpack it in your 'Apps' directory of the MorphOS installation. For me this would create following directory hierarchy: @@ -143,5 +143,13 @@ Installation ~ Cls ;End VIM +Compiling~ + +You can download the Vim source code from the official Vim site: + https://github.com/vim/vim/archive/refs/heads/master.zip +Or using git: > + git clone https://github.com/vim/vim.git + +For compiling see "src/INSTALLami.txt" vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 4549c00189..8951d9e516 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 9.1. Last change: 2024 May 11 +*os_vms.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL @@ -33,10 +33,18 @@ Vim on other operating systems. 2. Download files *vms-download* -You can download the Vim source code by ftp from the official Vim site: - ftp://ftp.vim.org/pub/vim/ +You can download the Vim source code from the official Vim site: + https://github.com/vim/vim/archive/refs/heads/master.zip +Or using git: > + git clone https://github.com/vim/vim.git + +Older release archives are also available at: + https://ftp.nluug.nl/pub/vim/ + ftp://ftp.nluug.nl/pub/vim/ Or use one of the mirrors: - ftp://ftp.vim.org/pub/vim/MIRRORS + https://ftp.nluug.nl/pub/vim/MIRRORS + +Note: the ftp server has been retired and is no longer updated. You can download precompiled executables from: http://www.polarhome.com/vim/ diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 56825de17e..7a81044bde 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -90,7 +90,6 @@ Copyright: Copyright (C) 2017 Charles E Campbell *netrw-copyright* Marked Files: Grep..................................|netrw-mg| Marked Files: Hiding and Unhiding by Suffix.........|netrw-mh| Marked Files: Moving................................|netrw-mm| - Marked Files: Printing..............................|netrw-mp| Marked Files: Sourcing..............................|netrw-ms| Marked Files: Setting the Target Directory..........|netrw-mt| Marked Files: Tagging...............................|netrw-mT| @@ -1066,7 +1065,6 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2 mg Apply vimgrep to marked files |netrw-mg| mh Toggle marked file suffices' presence on hiding list |netrw-mh| mm Move marked files to marked-file target directory |netrw-mm| - mp Print marked files |netrw-mp| mr Mark files using a shell-style |regexp| |netrw-mr| mt Current browsing directory becomes markfile target |netrw-mt| mT Apply ctags to marked files |netrw-mT| @@ -2001,7 +1999,6 @@ The following netrw maps make use of marked files: |netrw-mF| Unmark marked files |netrw-mg| Apply vimgrep to marked files |netrw-mm| Move marked files to target - |netrw-mp| Print marked files |netrw-ms| Netrw will source marked files |netrw-mt| Set target for |netrw-mm| and |netrw-mc| |netrw-mT| Generate tags using marked files @@ -2266,15 +2263,6 @@ from the current window (where one does the mf) to the target. Associated setting variable: |g:netrw_localmovecmd| |g:netrw_ssh_cmd| -MARKED FILES: PRINTING *netrw-mp* {{{2 - (See |netrw-mf| and |netrw-mr| for how to mark files) - (uses the local marked file list) - -When "mp" is used, netrw will apply the |:hardcopy| command to marked files. -What netrw does is open each file in a one-line window, execute hardcopy, then -close the one-line window. - - MARKED FILES: SOURCING *netrw-ms* {{{2 (See |netrw-mf| and |netrw-mr| for how to mark files) (uses the local marked file list) diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 91c3163e0c..37c61f6b11 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 9.1. Last change: 2025 Jul 16 +*quickref.txt* For Vim version 9.1. Last change: 2025 Jul 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -607,6 +607,7 @@ Short explanation of each option: *option-list* 'arabic' 'arab' for Arabic as a default second language 'arabicshape' 'arshape' do shaping for Arabic characters 'autochdir' 'acd' change directory to the file in the current window +'autocomplete' 'ac' automatic completion in insert mode 'autoindent' 'ai' take indent for new line from previous line 'autoread' 'ar' autom. read file when changed outside of Vim 'autoshelldir' 'asd' change directory to the shell's current directory diff --git a/runtime/doc/tags b/runtime/doc/tags index 3dd790fde8..6ee54429ae 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -41,6 +41,7 @@ $quote eval.txt /*$quote* '] motion.txt /*']* '^ motion.txt /*'^* 'a motion.txt /*'a* +'ac' options.txt /*'ac'* 'acd' options.txt /*'acd'* 'ai' options.txt /*'ai'* 'akm' options.txt /*'akm'* @@ -62,6 +63,7 @@ $quote eval.txt /*$quote* 'as' todo.txt /*'as'* 'asd' options.txt /*'asd'* 'autochdir' options.txt /*'autochdir'* +'autocomplete' options.txt /*'autocomplete'* 'autoindent' options.txt /*'autoindent'* 'autoprint' vi_diff.txt /*'autoprint'* 'autoread' options.txt /*'autoread'* @@ -567,6 +569,7 @@ $quote eval.txt /*$quote* 'mzschemedll' options.txt /*'mzschemedll'* 'mzschemegcdll' options.txt /*'mzschemegcdll'* 'nf' options.txt /*'nf'* +'noac' options.txt /*'noac'* 'noacd' options.txt /*'noacd'* 'noai' options.txt /*'noai'* 'noakm' options.txt /*'noakm'* @@ -583,6 +586,7 @@ $quote eval.txt /*$quote* 'noas' todo.txt /*'noas'* 'noasd' options.txt /*'noasd'* 'noautochdir' options.txt /*'noautochdir'* +'noautocomplete' options.txt /*'noautocomplete'* 'noautoindent' options.txt /*'noautoindent'* 'noautoread' options.txt /*'noautoread'* 'noautosave' todo.txt /*'noautosave'* @@ -4671,6 +4675,8 @@ E143 autocmd.txt /*E143* E1432 vim9.txt /*E1432* E1433 vim9.txt /*E1433* E1434 vim9.txt /*E1434* +E1435 vim9class.txt /*E1435* +E1436 vim9class.txt /*E1436* E144 various.txt /*E144* E145 starting.txt /*E145* E146 change.txt /*E146* @@ -8693,6 +8699,7 @@ inputlist() builtin.txt /*inputlist()* inputrestore() builtin.txt /*inputrestore()* inputsave() builtin.txt /*inputsave()* inputsecret() builtin.txt /*inputsecret()* +ins-autocompletion insert.txt /*ins-autocompletion* ins-completion insert.txt /*ins-completion* ins-completion-menu insert.txt /*ins-completion-menu* ins-expandtab insert.txt /*ins-expandtab* @@ -9371,7 +9378,6 @@ netrw-mm pi_netrw.txt /*netrw-mm* netrw-modify pi_netrw.txt /*netrw-modify* netrw-mouse pi_netrw.txt /*netrw-mouse* netrw-move pi_netrw.txt /*netrw-move* -netrw-mp pi_netrw.txt /*netrw-mp* netrw-mr pi_netrw.txt /*netrw-mr* netrw-ms pi_netrw.txt /*netrw-ms* netrw-mt pi_netrw.txt /*netrw-mt* diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index af1cd619b8..76b0ae230a 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 9.1. Last change: 2025 Jun 03 +*usr_02.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM USER MANUAL - by Bram Moolenaar @@ -614,7 +614,7 @@ Summary: *help-summary* > < for how the '|' is handled in mappings. 15) Command definitions are talked about :h command-topic, so use > - :help command-bar + :help command-bang < to find out about the '!' argument for custom commands. 16) Window management commands always start with CTRL-W, so you find the diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 016f74295b..335c073f1f 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 9.1. Last change: 2020 Dec 19 +*usr_23.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM USER MANUAL - by Bram Moolenaar @@ -118,7 +118,7 @@ Someone sends you an e-mail message, which refers to a file by its URL. For example: You can find the information here: ~ - ftp://ftp.vim.org/pub/vim/README ~ + https://ftp.nluug.nl/pub/vim/README You could start a program to download the file, save it on your local disk and then start Vim to edit it. diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index d144303ee2..980cdedbad 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 9.1. Last change: 2025 Mar 03 +*usr_90.txt* For Vim version 9.1. Last change: 2025 Jul 24 VIM USER MANUAL - by Bram Moolenaar @@ -189,69 +189,49 @@ source code yourself! ============================================================================== *90.2* MS-Windows -There are two ways to install the Vim program for Microsoft Windows. You can -uncompress several archives, or use a self-installing big archive. Most users -with fairly recent computers will prefer the second method. For the first -one, you will need: +There are several ways to install the Vim program for Microsoft Windows: - - An archive with binaries for Vim. - - The Vim runtime archive. - - A program to unpack the zip files. + 1. Official Website Download (Stable)~ -To get the Vim archives, look in this file for a mirror near you, this should -provide the fastest download: +Visit the official Vim website at https://www.vim.org to download the latest +stable version. The site links to the Windows installer that works out of the +box for most users. - ftp://ftp.vim.org/pub/vim/MIRRORS + 2. Using winget (Windows Package Manager) ~ -Or use the home site ftp.vim.org, if you think it's fast enough. Go to the -"pc" directory and you'll find a list of files there. The version number is -embedded in the file name. You will want to get the most recent version. -We will use "82" here, which is version 8.2. +If you prefer using the command line, you can quickly install Vim using +Windows' built-in package manager for the stable version: > - gvim82.exe The self-installing archive. + winget install vim.vim -This is all you need for the second method. Just launch the executable, and -follow the prompts. +Or to download the latest nightly version, use: > -For the first method you must choose one of the binary archives. These are -available: + winget install vim.vim.nightly - gvim82.zip The normal MS-Windows GUI version. - gvim82ole.zip The MS-Windows GUI version with OLE support. - Uses more memory, supports interfacing with - other OLE applications. - vim82w32.zip 32 bit MS-Windows console version. +This method ensures you get an up-to-date version with minimal hassle. -You only need one of them. Although you could install both a GUI and a -console version. You always need to get the archive with runtime files. + 3. GitHub Installer (All Architectures) ~ - vim82rt.zip The runtime files. +For more control over the installation (or if you're using a specific CPU +architecture like ARM), visit the official GitHub repository: -Use your un-zip program to unpack the files. For example, using the "unzip" -program: > + https://github.com/vim/vim-win32-installer/ - cd c:\ - unzip path\gvim82.zip - unzip path\vim82rt.zip +This repo provides daily installer and portable zip archives for: -This will unpack the files in the directory "c:\vim\vim82". If you already -have a "vim" directory somewhere, you will want to move to the directory just -above it. - Now change to the "vim\vim82" directory and run the install program: > + - x86 (32-bit) + - x64 (64-bit) + - ARM64 - install - -Carefully look through the messages and select the options you want to use. -If you finally select "do it" the install program will carry out the actions -you selected. - The install program doesn't move the runtime files. They remain where you -unpacked them. +It's a great option if you want nightly builds or specific configuration In case you are not satisfied with the features included in the supplied binaries, you could try compiling Vim yourself. Get the source archive from the same location as where the binaries are. You need a compiler for which a makefile exists. Microsoft Visual C, MinGW and Cygwin compilers can be used. -Check the file src/INSTALLpc.txt for hints. +Check the file src/INSTALLpc.txt for hints. You can get the source from: + + https://github.com/vim/vim ============================================================================== *90.3* Upgrading diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index f4d2a98585..5f6f0c0e8f 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 9.1. Last change: 2022 Apr 06 +*version6.txt* For Vim version 9.1. Last change: 2025 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -12624,7 +12624,7 @@ Solution: Use ":compiler!" to set a compiler globally, otherwise it's local to the buffer and "b:current_compiler" is used. Give an error when no compiler script could be found. Note: updated compiler plugins can be found at - ftp://ftp.vim.org/pub/vim/runtime/compiler/ + https://github.com/vim/vim/tree/master/runtime/compiler Files: runtime/compiler/msvc.vim, runtime/doc/quickfix.txt, src/eval.c, src/ex_cmds2.c diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt index 10b47424fa..a82676c424 100644 --- a/runtime/doc/version9.txt +++ b/runtime/doc/version9.txt @@ -1,4 +1,4 @@ -*version9.txt* For Vim version 9.1. Last change: 2025 Jul 21 +*version9.txt* For Vim version 9.1. Last change: 2025 Jul 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -41604,6 +41604,7 @@ Completion~ "preinsert" - highlight to be inserted values "nearest" - sort completion results by distance to cursor - new function |wildtrigger()| to trigger wildcard expansion +- Support for Autocompletion has been added |ins-autocompletion| Platform specific~ ----------------- @@ -41809,6 +41810,7 @@ Ex-Commands: ~ Options: ~ +'autocompletion' Enable auto completion |ins-autocompletion| 'chistory' Size of the quickfix stack |quickfix-stack|. 'completefuzzycollect' Enable fuzzy collection of candidates for (some) |ins-completion| modes diff --git a/runtime/doc/vim9class.txt b/runtime/doc/vim9class.txt index d2f43aefb2..82c7573b30 100644 --- a/runtime/doc/vim9class.txt +++ b/runtime/doc/vim9class.txt @@ -1,4 +1,4 @@ -*vim9class.txt* For Vim version 9.1. Last change: 2025 Apr 21 +*vim9class.txt* For Vim version 9.1. Last change: 2025 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -584,6 +584,8 @@ protected object methods, class variables and class methods. An interface can extend another interface using "extends". The sub-interface inherits all the instance variables and methods from the super interface. +An interface cannot be defined inside a function. *E1436* + ============================================================================== 6. More class details *Vim9-class* *Class* *class* @@ -971,7 +973,7 @@ of that class. Unlike typical object instantiation with the |new()| method, enum instances cannot be created this way. An enum can only be defined in a |Vim9| script file. *E1414* -An enum cannot be defined inside a function. +An enum cannot be defined inside a function. *E1435* *E1415* An enum name must start with an uppercase letter. The name of an enum value diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim index bb4e0c9a19..82ba10e679 100644 --- a/runtime/ftplugin/gpg.vim +++ b/runtime/ftplugin/gpg.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: gpg(1) configuration file +" Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -17,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 GpgKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . . '\b', '\') . ''' --hilite-search" man ' . 'gpg' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . . '\b', '\') . ''' --hilite-search" man ' . 'gpg' setlocal iskeyword+=- setlocal keywordprg=:GpgKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer GpgKeywordPrg' diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim index 68ce69a446..5843552534 100644 --- a/runtime/ftplugin/modconf.vim +++ b/runtime/ftplugin/modconf.vim @@ -2,7 +2,7 @@ " Language: modules.conf(5) configuration file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-20 (remove erroneous endif) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -19,7 +19,7 @@ setlocal formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 ModconfKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d' setlocal iskeyword+=- setlocal keywordprg=:ModconfKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ModconfKeywordPrg' diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim index 7df61580bf..84dfd63fc2 100644 --- a/runtime/ftplugin/muttrc.vim +++ b/runtime/ftplugin/muttrc.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file " Language: mutt RC File +" Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -20,7 +21,7 @@ let &l:include = '^\s*source\>' if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 MuttrcKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' setlocal iskeyword+=- setlocal keywordprg=:MuttrcKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg' diff --git a/runtime/ftplugin/ps1.vim b/runtime/ftplugin/ps1.vim index e09bbf86dc..f1fe78df4c 100644 --- a/runtime/ftplugin/ps1.vim +++ b/runtime/ftplugin/ps1.vim @@ -5,6 +5,7 @@ " 2024 Jan 14 by Vim Project (browsefilter) " 2024 May 23 by Riley Bruins ('commentstring') " 2024 Sep 19 by Konfekt (simplify keywordprg #15696) +" 2025 Jul 22 by phanium (use :hor term #17822) " Only do this when not done yet for this buffer if exists("b:did_ftplugin") | finish | endif @@ -51,7 +52,7 @@ endif if exists('s:pwsh_cmd') if exists(':terminal') == 2 - command! -buffer -nargs=1 GetHelp silent exe 'term ' . s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full ""' . (executable('less') ? ' | less' : '') + command! -buffer -nargs=1 GetHelp silent exe 'hor term ' . s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full ""' . (executable('less') ? ' | less' : '') else command! -buffer -nargs=1 GetHelp echo system(s:pwsh_cmd . ' -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command Get-Help -Full ') endif diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim index 77fab2a611..d0b6c2d654 100644 --- a/runtime/ftplugin/readline.vim +++ b/runtime/ftplugin/readline.vim @@ -3,6 +3,7 @@ " Maintainer: Doug Kearns " Previous Maintainer: Nikolai Weibull " Last Change: 2024 Sep 19 (simplify keywordprg #15696) +" 2024 Jul 22 by Vim project (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -36,7 +37,7 @@ endif if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 ReadlineKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' setlocal iskeyword+=- setlocal keywordprg=:ReadlineKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg' diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index 0038ee7dd4..18cd219cdc 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -7,6 +7,7 @@ " Last Change: 2024 Sep 19 by Vim Project (compiler shellcheck) " 2024 Dec 29 by Vim Project (improve setting shellcheck compiler) " 2025 Mar 09 by Vim Project (set b:match_skip) +" 2025 Jul 22 by phanium (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -53,7 +54,7 @@ let s:is_kornshell = get(b:, "is_kornshell", get(g:, "is_kornshell", 0)) if s:is_bash if exists(':terminal') == 2 - command! -buffer -nargs=1 ShKeywordPrg silent exe ':term bash -c "help "" 2>/dev/null || man """' + command! -buffer -nargs=1 ShKeywordPrg silent exe ':hor term bash -c "help "" 2>/dev/null || man """' else command! -buffer -nargs=1 ShKeywordPrg echo system('bash -c "help " 2>/dev/null || MANPAGER= man ""') endif diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim index 1cc4e609b0..8a7b078309 100644 --- a/runtime/ftplugin/sshconfig.vim +++ b/runtime/ftplugin/sshconfig.vim @@ -2,7 +2,7 @@ " Language: OpenSSH client configuration file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -17,7 +17,7 @@ let b:undo_ftplugin = 'setlocal com< cms< fo<' if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 SshconfigKeywordPrg - \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' + \ silent exe 'hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' setlocal iskeyword+=- setlocal keywordprg=:SshconfigKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SshconfigKeywordPrg' diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim index e87fedaa01..32c08b19af 100644 --- a/runtime/ftplugin/sudoers.vim +++ b/runtime/ftplugin/sudoers.vim @@ -2,7 +2,7 @@ " Language: sudoers(5) configuration files " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -18,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 SudoersKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . . '\b', '\') . ''' --hilite-search" man ' . 'sudoers' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . . '\b', '\') . ''' --hilite-search" man ' . 'sudoers' setlocal iskeyword+=- setlocal keywordprg=:SudoersKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SudoersKeywordPrg' diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim index e6c7f113c2..48f36e3dbe 100644 --- a/runtime/ftplugin/udevrules.vim +++ b/runtime/ftplugin/udevrules.vim @@ -2,7 +2,7 @@ " Language: udev(8) rules file " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024-09-19 (simplify keywordprg #15696) +" Latest Revision: 2025-07-22 (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -18,7 +18,7 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql if has('unix') && executable('less') && exists(':terminal') == 2 command -buffer -nargs=1 UdevrulesKeywordPrg - \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'udev' + \ silent exe ':hor term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'udev' setlocal iskeyword+=- setlocal keywordprg=:UdevrulesKeywordPrg let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer UdevrulesKeywordPrg' diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim index 5d4f4fe256..65e9f377bf 100644 --- a/runtime/ftplugin/zsh.vim +++ b/runtime/ftplugin/zsh.vim @@ -5,6 +5,8 @@ " Latest Revision: 2024 Sep 19 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-zsh +" Last Change: +" 2025 Jul 23 by Vim Project (use :hor term #17822) if exists("b:did_ftplugin") finish @@ -20,7 +22,7 @@ let b:undo_ftplugin = "setl com< cms< fo< " if executable('zsh') && &shell !~# '/\%(nologin\|false\)$' if exists(':terminal') == 2 - command! -buffer -nargs=1 ZshKeywordPrg silent exe ':term zsh -c "autoload -Uz run-help; run-help "' + command! -buffer -nargs=1 ZshKeywordPrg silent exe ':hor term zsh -c "autoload -Uz run-help; run-help "' else command! -buffer -nargs=1 ZshKeywordPrg echo system('MANPAGER= zsh -c "autoload -Uz run-help; run-help 2>/dev/null"') endif diff --git a/runtime/indent/testdir/vim.in b/runtime/indent/testdir/vim.in index d5cae222fb..0cccbbbb97 100644 --- a/runtime/indent/testdir/vim.in +++ b/runtime/indent/testdir/vim.in @@ -196,3 +196,25 @@ silent! function Bar() return 42 endfunction " END_INDENT + +" START_INDENT +if true +nmap xxx, +else +endif +" END_INDENT + +" START_INDENT +if true + var heredoc =<< END + foo + bar + baz + END +endif +" END_INDENT + +" START_INDENT +set path=.,, +set clipboard=unnamed,unnamedplus +" END_INDENT diff --git a/runtime/indent/testdir/vim.ok b/runtime/indent/testdir/vim.ok index d52eda6f5b..7d490ad326 100644 --- a/runtime/indent/testdir/vim.ok +++ b/runtime/indent/testdir/vim.ok @@ -196,3 +196,25 @@ silent! function Bar() return 42 endfunction " END_INDENT + +" START_INDENT +if true + nmap xxx, +else +endif +" END_INDENT + +" START_INDENT +if true + var heredoc =<< END + foo + bar + baz +END +endif +" END_INDENT + +" START_INDENT +set path=.,, +set clipboard=unnamed,unnamedplus +" END_INDENT diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 34f465c74a..4935b83b3b 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: The Vim Project -" Last Change: 2025 Jul 16 +" Last Change: 2025 Jul 25 " Former Maintainer: Bram Moolenaar " If there already is an option window, jump to that one. @@ -892,13 +892,15 @@ endif if has("insert_expand") call AddOption("complete", gettext("specifies how Insert mode completion works for CTRL-N and CTRL-P")) call append("$", "\t" .. s:local_to_buffer) - call OptionL("cfc") - call AddOption("completefuzzycollect", gettext("use fuzzy collection for specific completion modes")) call OptionL("cpt") + call AddOption("autocomplete", gettext("automatic completion in insert mode")) + call BinOptionG("ac", &ac) call AddOption("completeopt", gettext("whether to use a popup menu for Insert mode completion")) call OptionL("cot") call AddOption("completeitemalign", gettext("popup menu item align order")) call OptionG("cia", &cia) + call AddOption("completefuzzycollect", gettext("use fuzzy collection for specific completion modes")) + call OptionL("cfc") if exists("+completepopup") call AddOption("completepopup", gettext("options for the Insert mode completion info popup")) call OptionG("cpp", &cpp) diff --git a/runtime/pack/dist/opt/editorconfig/mkzip.sh b/runtime/pack/dist/opt/editorconfig/mkzip.sh deleted file mode 100755 index fe5b2e3c33..0000000000 --- a/runtime/pack/dist/opt/editorconfig/mkzip.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -zip -r editorconfig-vim-$*.zip autoload/* doc/* ftdetect/* plugin/* diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim index c412858556..93033e742e 100644 --- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim +++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim @@ -19,7 +19,7 @@ if &cp || exists("g:loaded_netrw") finish endif -let g:loaded_netrw = "v183" +let g:loaded_netrw = "v184" if !has("patch-9.1.1054") && !has('nvim') echoerr 'netrw needs Vim v9.1.1054' @@ -4861,7 +4861,6 @@ function s:NetrwMaps(islocal) nnoremap mg :call NetrwMarkFileGrep(1) nnoremap mh :call NetrwMarkHideSfx(1) nnoremap mm :call NetrwMarkFileMove(1) - nnoremap mp :call NetrwMarkFilePrint(1) nnoremap mr :call NetrwMarkFileRegexp(1) nnoremap ms :call NetrwMarkFileSource(1) nnoremap mT :call NetrwMarkFileTag(1) @@ -4973,7 +4972,6 @@ function s:NetrwMaps(islocal) nnoremap mg :call NetrwMarkFileGrep(0) nnoremap mh :call NetrwMarkHideSfx(0) nnoremap mm :call NetrwMarkFileMove(0) - nnoremap mp :call NetrwMarkFilePrint(0) nnoremap mr :call NetrwMarkFileRegexp(0) nnoremap ms :call NetrwMarkFileSource(0) nnoremap mT :call NetrwMarkFileTag(0) @@ -5932,39 +5930,6 @@ function s:NetrwMarkFileMove(islocal) endfunction -" s:NetrwMarkFilePrint: (invoked by mp) This function prints marked files {{{2 -" using the hardcopy command. Local marked-file list only. -function s:NetrwMarkFilePrint(islocal) - let curbufnr= bufnr("%") - - " sanity check - if !exists("s:netrwmarkfilelist_{curbufnr}") || empty(s:netrwmarkfilelist_{curbufnr}) - call netrw#msg#Notify('ERROR', 'there are no marked files in this window (:help netrw-mf)') - return - endif - let curdir= s:NetrwGetCurdir(a:islocal) - - if exists("s:netrwmarkfilelist_{curbufnr}") - let netrwmarkfilelist = s:netrwmarkfilelist_{curbufnr} - call s:NetrwUnmarkList(curbufnr,curdir) - for fname in netrwmarkfilelist - if a:islocal - if g:netrw_keepdir - let fname= netrw#fs#ComposePath(curdir,fname) - endif - else - let fname= curdir.fname - endif - 1split - " the autocmds will handle both local and remote files - exe "sil NetrwKeepj e ".fnameescape(fname) - hardcopy - q - endfor - 2match none - endif -endfunction - " s:NetrwMarkFileRegexp: (invoked by mr) This function is used to mark {{{2 " files when given a regexp (for which a prompt is " issued) (matches to name of files). @@ -6195,37 +6160,20 @@ endfunction " s:NetrwOpenFile: query user for a filename and open it {{{2 function s:NetrwOpenFile(islocal) - let ykeep= @@ call inputsave() - let fname= input("Enter filename: ") + let fname = input("Enter filename: ") call inputrestore() - " determine if Lexplore is in use - if exists("t:netrw_lexbufnr") - " check if t:netrw_lexbufnr refers to a netrw window - let lexwinnr = bufwinnr(t:netrw_lexbufnr) - if lexwinnr != -1 && exists("g:netrw_chgwin") && g:netrw_chgwin != -1 - exe "NetrwKeepj keepalt ".g:netrw_chgwin."wincmd w" - exe "NetrwKeepj e ".fnameescape(fname) - let @@= ykeep - endif + if empty(fname) + return endif - " Does the filename contain a path? - if fname !~ '[/\\]' - if exists("b:netrw_curdir") - " save position for benefit of Rexplore - let s:rexposn_{bufnr("%")}= winsaveview() - if b:netrw_curdir =~ '/$' - exe "NetrwKeepj e ".fnameescape(b:netrw_curdir.fname) - else - exe "e ".fnameescape(b:netrw_curdir."/".fname) - endif - endif - else - exe "NetrwKeepj e ".fnameescape(fname) - endif - let @@= ykeep + " save position for benefit of Rexplore + let s:rexposn_{bufnr("%")}= winsaveview() + + execute "NetrwKeepj e " . fnameescape(!isabsolutepath(fname) + \ ? netrw#fs#ComposePath(b:netrw_curdir, fname) + \ : fname) endfunction " netrw#Shrink: shrinks/expands a netrw or Lexplorer window {{{2 @@ -6425,7 +6373,6 @@ function s:NetrwMenu(domenu) exe 'sil! menu '.g:NetrwMenuPriority.'.14.8 '.g:NetrwTopLvlMenu.'Marked\ Files.Exe\ Cmdmx mx' exe 'sil! menu '.g:NetrwMenuPriority.'.14.9 '.g:NetrwTopLvlMenu.'Marked\ Files.Move\ To\ Targetmm mm' exe 'sil! menu '.g:NetrwMenuPriority.'.14.10 '.g:NetrwTopLvlMenu.'Marked\ Files.ObtainO O' - exe 'sil! menu '.g:NetrwMenuPriority.'.14.11 '.g:NetrwTopLvlMenu.'Marked\ Files.Printmp mp' exe 'sil! menu '.g:NetrwMenuPriority.'.14.12 '.g:NetrwTopLvlMenu.'Marked\ Files.ReplaceR R' exe 'sil! menu '.g:NetrwMenuPriority.'.14.13 '.g:NetrwTopLvlMenu.'Marked\ Files.Set\ Targetmt mt' exe 'sil! menu '.g:NetrwMenuPriority.'.14.14 '.g:NetrwTopLvlMenu.'Marked\ Files.TagmT mT' diff --git a/runtime/pack/dist/opt/netrw/doc/netrw.txt b/runtime/pack/dist/opt/netrw/doc/netrw.txt index 5db2cd8ad3..e041a9acc4 100644 --- a/runtime/pack/dist/opt/netrw/doc/netrw.txt +++ b/runtime/pack/dist/opt/netrw/doc/netrw.txt @@ -90,7 +90,6 @@ Copyright: Copyright (C) 2017 Charles E Campbell *netrw-copyright* Marked Files: Grep..................................|netrw-mg| Marked Files: Hiding and Unhiding by Suffix.........|netrw-mh| Marked Files: Moving................................|netrw-mm| - Marked Files: Printing..............................|netrw-mp| Marked Files: Sourcing..............................|netrw-ms| Marked Files: Setting the Target Directory..........|netrw-mt| Marked Files: Tagging...............................|netrw-mT| @@ -1066,7 +1065,6 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2 mg Apply vimgrep to marked files |netrw-mg| mh Toggle marked file suffices' presence on hiding list |netrw-mh| mm Move marked files to marked-file target directory |netrw-mm| - mp Print marked files |netrw-mp| mr Mark files using a shell-style |regexp| |netrw-mr| mt Current browsing directory becomes markfile target |netrw-mt| mT Apply ctags to marked files |netrw-mT| @@ -2001,7 +1999,6 @@ The following netrw maps make use of marked files: |netrw-mF| Unmark marked files |netrw-mg| Apply vimgrep to marked files |netrw-mm| Move marked files to target - |netrw-mp| Print marked files |netrw-ms| Netrw will source marked files |netrw-mt| Set target for |netrw-mm| and |netrw-mc| |netrw-mT| Generate tags using marked files @@ -2266,15 +2263,6 @@ from the current window (where one does the mf) to the target. Associated setting variable: |g:netrw_localmovecmd| |g:netrw_ssh_cmd| -MARKED FILES: PRINTING *netrw-mp* {{{2 - (See |netrw-mf| and |netrw-mr| for how to mark files) - (uses the local marked file list) - -When "mp" is used, netrw will apply the |:hardcopy| command to marked files. -What netrw does is open each file in a one-line window, execute hardcopy, then -close the one-line window. - - MARKED FILES: SOURCING *netrw-ms* {{{2 (See |netrw-mf| and |netrw-mr| for how to mark files) (uses the local marked file list) diff --git a/runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim b/runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim index 2879f8b641..2d854e7262 100644 --- a/runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim +++ b/runtime/pack/dist/opt/netrw/plugin/netrwPlugin.vim @@ -15,7 +15,7 @@ if &cp || exists("g:loaded_netrwPlugin") finish endif -let g:loaded_netrwPlugin = "v183" +let g:loaded_netrwPlugin = "v184" let s:keepcpo = &cpo set cpo&vim diff --git a/runtime/spell/pt/main.aap b/runtime/spell/pt/main.aap index d7be7640e3..7b83298365 100644 --- a/runtime/spell/pt/main.aap +++ b/runtime/spell/pt/main.aap @@ -1,5 +1,5 @@ # Aap recipe for Portuguese Vim spell files. -# See ftp://ftp.vim.org/pub/vim/runtime/spell/README.txt +# See https://github.com/vim/vim/blob/master/runtime/spell/README.txt # Use a freshly compiled Vim if it exists. @if os.path.exists('../../../src/vim'): diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile index 9392b8dc98..c18369a0bf 100644 --- a/runtime/syntax/Makefile +++ b/runtime/syntax/Makefile @@ -13,7 +13,7 @@ VIMRUNTIME = ../.. # Uncomment this line to use valgrind for memory leaks and extra warnings. # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$* -# Trace ruler liveness on demand. +# Trace liveness on demand. # VIM_SYNTAX_TEST_LOG = `pwd`/testdir/failed/00-TRACE_LOG # ENVVARS = LC_ALL=C VIM_SYNTAX_TEST_LOG="$(VIM_SYNTAX_TEST_LOG)" @@ -39,7 +39,7 @@ test: @# the "vimcmd" file is used by the screendump utils @echo "../$(VIMPROG)" > testdir/vimcmd @echo "$(RUN_VIMTEST)" >> testdir/vimcmd - @# Trace ruler liveness on demand. + @# Trace liveness on demand. @#mkdir -p testdir/failed @#touch "$(VIM_SYNTAX_TEST_LOG)" VIMRUNTIME=$(VIMRUNTIME) $(ENVVARS) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim > /dev/null diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 63c1bb5c91..088783e519 100644 --- a/runtime/syntax/generator/vim.vim.base +++ b/runtime/syntax/generator/vim.vim.base @@ -2,7 +2,7 @@ " Language: Vim script " Maintainer: Hirohito Higashi " Doug Kearns -" Last Change: 2025 Jul 18 +" Last Change: 2025 Aug 01 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -109,6 +109,7 @@ syn case match " Function Names {{{2 " GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained', END_STR='' + " Predefined variable names {{{2 " GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR='' @@ -120,6 +121,8 @@ syn case match if s:has("nvim") syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight + syn keyword vimFuncName contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait + syn match vimFuncName contained "\" syn keyword vimVimVarName contained lua msgpack_types relnum stderr termrequest virtnum endif @@ -267,6 +270,8 @@ syn match vimVimVar "\\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+" - \ nextgroup=vimDefParams,vimCmdSep,vimComment,vim9Comment + \ nextgroup=vimDefTypeParams,vimDefParams,vimCmdSep,vimComment,vim9Comment \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag syn match vimFunction "\" skipwhite nextgroup=vimFunctionBang,vimFunctionName,vimFunctionPattern,vimCmdSep,vimComment @@ -498,8 +503,15 @@ syn region vimDefParams contained \ end=")" \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimReturnType,vimCommentError \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals,vimOperParen +syn region vimDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vimDefParams + \ contains=vim9DefTypeParam syn match vimFunctionParam contained "\<\h\w*\>\|\.\.\." skipwhite nextgroup=vimFunctionParamEquals syn match vimDefParam contained "\<\h\w*\>" skipwhite nextgroup=vimParamType,vimFunctionParamEquals +syn match vim9DefTypeParam contained "\<\u\w*\>" syn match vimFunctionParamEquals contained "=" skipwhite nextgroup=@vimExprList syn match vimFunctionMod contained "\<\%(abort\|closure\|dict\|range\)\>" skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError @@ -531,7 +543,7 @@ if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f' syn region vimDefFold \ start="\" skipwhite nextgroup=vim9MethodDefName,vim9ConstructorDefName - syn match vim9MethodDefName contained "\<\h\w*\>" nextgroup=vim9MethodDefParams contains=@vim9MethodName + syn match vim9MethodDefName contained "\<\h\w*\>" nextgroup=vim9MethodDefParams,vim9MethodDefTypeParams contains=@vim9MethodName syn region vim9MethodDefParams contained \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vim9MethodDefReturnType,vimCommentError \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals + syn region vim9MethodDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9MethodDefParams + \ contains=vim9DefTypeParam syn match vim9ConstructorDefName contained "\<_\=new\w*\>" - \ nextgroup=vim9ConstructorDefParams + \ nextgroup=vim9ConstructorDefParams,vim9ConstuctorDefTypeParams \ contains=@vim9MethodName syn match vim9ConstructorDefParam contained "\<\%(this\.\)\=\h\w*\>" \ skipwhite nextgroup=vimParamType,vimFunctionParamEquals @@ -589,6 +607,12 @@ if s:vim9script \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError \ contains=vim9ConstructorDefParam,vim9Comment,vimFunctionParamEquals + syn region vim9ConstuctorDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9ConstructorDefParams + \ contains=vim9DefTypeParam syn region vim9MethodDefReturnType contained \ start=":\%(\s\|\n\)\@=" @@ -622,8 +646,11 @@ if s:vim9script syn cluster vim9MethodName contains=vim9MethodName,vim9MethodNameError if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f' - syn region vim9MethodDefFold contained start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\i*(" end="^\s*:\=enddef\>" contains=vim9MethodDef fold keepend extend transparent - syn region vim9MethodDefFold contained start="^\s*:\=def\s\+_\=new\i*(" end="^\s*:\=enddef\>" contains=vim9MethodDef fold keepend extend transparent + syn region vim9MethodDefFold contained + \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]" + \ end="^\s*:\=enddef\>" + \ contains=vim9MethodDef + \ fold keepend extend transparent endif syn cluster vim9MethodDef contains=vim9MethodDef,vim9MethodDefFold @@ -674,12 +701,19 @@ if s:vim9script syn cluster vim9EnumNameContinue contains=vim9EnumNameContinue,vim9EnumNameContinueComment " enforce enum value list location - syn match vim9EnumValue contained "\<\a\w*\>" nextgroup=vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment + syn match vim9EnumValue contained "\<\a\w*\>" nextgroup=vim9EnumValueTypeArgs,vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment syn match vim9EnumValueListComma contained "," skipwhite skipempty nextgroup=vim9EnumValue,vim9EnumValueListCommaComment syn region vim9EnumValueListCommaComment contained \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$" \ skipwhite skipempty nextgroup=vim9EnumValueListCommaComment,vim9EnumValue \ contains=@vimCommentGroup,vimCommentString + syn region vim9EnumValueTypeArgs contained + \ matchgroup=Delimiter + \ start="<\ze\a" + \ end=">" + \ nextgroup=vim9EnumValueArgList + \ contains=@vimType + \ oneline syn region vim9EnumValueArgList contained \ matchgroup=vimParenSep start="(" end=")" \ nextgroup=vim9EnumValueListComma @@ -703,7 +737,7 @@ if s:vim9script syn match vim9InterfaceName contained "\<\u\w*\>" skipwhite skipnl nextgroup=vim9Extends syn keyword vim9AbstractDef contained def skipwhite nextgroup=vim9AbstractDefName - syn match vim9AbstractDefName contained "\<\h\w*\>" skipwhite nextgroup=vim9AbstractDefParams contains=@vim9MethodName + syn match vim9AbstractDefName contained "\<\h\w*\>" skipwhite nextgroup=vim9AbstractDefParams,vim9AbstractDefTypeParams contains=@vim9MethodName syn region vim9AbstractDefParams contained \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vimDefComment,vim9AbstractDefReturnType,vimCommentError @@ -713,6 +747,12 @@ if s:vim9script \ skipwhite skipnl nextgroup=vimDefComment,vimCommentError \ contains=vimTypeSep \ transparent + syn region vim9AbstractDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9AbstractDefParams + \ contains=vim9DefTypeParam VimFoldi syn region vim9InterfaceBody start="\" matchgroup=vimCommand end="\" contains=@vim9InterfaceBodyList transparent @@ -1368,9 +1408,20 @@ syn match vimMapLhs contained "\%(.\|\S\)\+" contains=vimCtrlChar,vimNotation, syn match vimMapLhs contained "\%(.\|\S\)\+\ze\s*$" contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite skipnl nextgroup=vimMapRhsContinue syn match vimMapBang contained "\a\@1<=!" skipwhite nextgroup=vimMapMod,vimMapLhs syn match vimMapMod contained "\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs -syn region vimMapRhs contained start="\S" skip=+\\|\|\@1<=|\|\n\s*\\\|\n\s*"\\ + end="|" end="$" contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader skipnl nextgroup=vimMapRhsContinue -" assume a continuation comment introduces the RHS -syn region vimMapRhsContinue contained start=+^\s*\%(\\\|"\\ \)+ skip=+\\|\|\@1<=|\|\n\s*\\\|\n\s*"\\ + end="|" end="$" contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader +syn region vimMapRhs contained + \ start="\S" + \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+ + \ end="\ze|" + \ end="$" + \ nextgroup=vimCmdSep + \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader +syn region vimMapRhsContinue contained + \ start=+^\s*\%(\\\|["#]\\ \)+ + \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+ + \ end="\ze|" + \ end="$" + \ nextgroup=vimCmdSep + \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader syn match vimMapLeader contained "\%#=1\c<\%(local\)\=leader>" contains=vimMapLeaderKey syn keyword vimMapModKey contained buffer expr nowait script silent special unique syn case ignore @@ -1431,7 +1482,7 @@ syn match vimBracket contained "[\\<>]" syn case match " User Command Highlighting: {{{2 -syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' +syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' " Vim user commands @@ -2088,18 +2139,26 @@ unlet s:interfaces " Function Call Highlighting: {{{2 " (following Gautam Iyer's suggestion) " ========================== -syn match vimFunc contained "\<\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimFuncName -syn match vimUserFunc contained "\.\@1<=\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen -syn match vimUserFunc contained "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vim9MethodName,vim9Super,vim9This -syn match vimUserFunc contained "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimVarScope -syn match vimUserFunc contained "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation +syn match vimFunc contained "\<\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimFuncName +syn match vimUserFunc contained "\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs +syn match vimUserFunc contained "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vim9MethodName,vim9Super,vim9This +syn match vimUserFunc contained "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen contains=vimVarScope +syn match vimUserFunc contained "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vimVarScope,vimNotation -Vim9 syn match vim9UserFunc "^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This -Vim9 syn match vim9Func "^\s*\zs\l\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimFuncName +Vim9 syn match vim9UserFunc "^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This +Vim9 syn match vim9Func "^\s*\zs\l\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimFuncName syn cluster vimFunc contains=vimFunc,vimUserFunc syn cluster vim9Func contains=vim9Func,vim9UserFunc +syn region vim9TypeArgs contained + \ matchgroup=Delimiter + \ start="<\ze\a" + \ end=">" + \ nextgroup=vimOperParen + \ contains=@vimType + \ oneline + " Beginners - Patterns that involve ^ {{{2 " ========= Vim9 syn region vim9LineComment start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\\\|\n\s*#\\ + end="$" contains=@vimCommentGroup,vimCommentString,vim9CommentTitle extend diff --git a/runtime/syntax/testdir/README.txt b/runtime/syntax/testdir/README.txt index e4f3945c8f..98e59129e6 100644 --- a/runtime/syntax/testdir/README.txt +++ b/runtime/syntax/testdir/README.txt @@ -61,8 +61,6 @@ an "input/setup/java.vim" script file with the following lines: Both inline setup commands and setup scripts may be used at the same time, the script file will be sourced before any VIM_TEST_SETUP commands are executed. -Every line of a source file must not be longer than 1425 (19 x 75) characters. - If there is no further setup required, you can now run all tests: make test @@ -112,6 +110,20 @@ If they look OK, move them to the "dumps" directory: If you now run the test again, it will succeed. +Limitations for syntax plugin tests +----------------------------------- + +Do not compose ASCII lines that do not fit a 19 by 75 window (1425 columns). + +Use multibyte characters, if at all, sparingly (see #16559). When possible, +move multibyte characters closer to the end of a line and keep the line short: +no more than a 75-byte total of displayed characters. A poorly rendered line +may otherwise become wrapped when enough of spurious U+FFFD (0xEF 0xBF 0xBD) +characters claim more columns than are available (75) and then invalidate line +correspondence under test. Refrain from mixing non-spurious U+FFFD characters +with other multibyte characters in the same line. + + Adjusting a syntax plugin test ------------------------------ diff --git a/runtime/syntax/testdir/dumps/c_character_constant_00.vim b/runtime/syntax/testdir/dumps/c_character_constant_00.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_character_constant_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_character_constant_01.vim b/runtime/syntax/testdir/dumps/c_character_constant_01.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_character_constant_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_character_constant_02.vim b/runtime/syntax/testdir/dumps/c_character_constant_02.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_character_constant_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_string_literal_00.vim b/runtime/syntax/testdir/dumps/c_string_literal_00.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_string_literal_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_string_literal_01.vim b/runtime/syntax/testdir/dumps/c_string_literal_01.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_string_literal_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_string_literal_02.vim b/runtime/syntax/testdir/dumps/c_string_literal_02.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_string_literal_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/c_string_literal_03.vim b/runtime/syntax/testdir/dumps/c_string_literal_03.vim deleted file mode 100644 index 44191f8816..0000000000 --- a/runtime/syntax/testdir/dumps/c_string_literal_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[🍌猫�]+?+ge diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_06.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_06.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_06.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_06.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_06.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_06.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_06.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_06.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_06.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_00.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_00.vim b/runtime/syntax/testdir/dumps/java_methods_style_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_01.vim b/runtime/syntax/testdir/dumps/java_methods_style_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_02.vim b/runtime/syntax/testdir/dumps/java_methods_style_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_03.vim b/runtime/syntax/testdir/dumps/java_methods_style_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_04.vim b/runtime/syntax/testdir/dumps/java_methods_style_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_00.vim b/runtime/syntax/testdir/dumps/java_methods_style_signature_00.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_signature_00.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_01.vim b/runtime/syntax/testdir/dumps/java_methods_style_signature_01.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_signature_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_02.vim b/runtime/syntax/testdir/dumps/java_methods_style_signature_02.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_signature_02.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_03.vim b/runtime/syntax/testdir/dumps/java_methods_style_signature_03.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_signature_03.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_04.vim b/runtime/syntax/testdir/dumps/java_methods_style_signature_04.vim deleted file mode 100644 index 1509558b7b..0000000000 --- a/runtime/syntax/testdir/dumps/java_methods_style_signature_04.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[ƒɐɘʬʭΑ-Ωα-ω�]+?+Ige diff --git a/runtime/syntax/testdir/dumps/vim9_block_00.dump b/runtime/syntax/testdir/dumps/vim9_blocks_00.dump similarity index 82% rename from runtime/syntax/testdir/dumps/vim9_block_00.dump rename to runtime/syntax/testdir/dumps/vim9_blocks_00.dump index dfabed45ab..4b65f164ba 100644 --- a/runtime/syntax/testdir/dumps/vim9_block_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_blocks_00.dump @@ -1,7 +1,6 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 |#+0#0000e05&| |V|i|m|9| |b|l|o|c|k|s| +0#0000000&@61 -|#+0#0000e05&| |V|I|M|_|T|E|S|T|S|E|T|U|P| |s|e|t| |l|i|s|t| |l|i|s|t|c|h|a|r|s|=|t|a|b|:|>| |,|t|r|a|i|l|:|-|,|e|x|t|e|n|d|s|:|>|,|p|r|e|c|e|d|e|s|:|<|,|n|b|s|p -|:|+| +0#0000000&@72 +|#+0#0000e05&| |V|I|M|_|T|E|S|T|S|E|T|U|P| |s|e|t| |l|i|s|t| |l|i|s|t|c|h|a|r|s|=|t|r|a|i|l|:|-| +0#0000000&@32 @75 @75 |{+0#e000e06&| +0#0000000&@73 @@ -17,4 +16,5 @@ @6|}+0#e000e06&| +0#0000000&@67 @6|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@56 @4|}+0#e000e06&| +0#0000000&@69 +@4|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_block_01.dump b/runtime/syntax/testdir/dumps/vim9_blocks_01.dump similarity index 82% rename from runtime/syntax/testdir/dumps/vim9_block_01.dump rename to runtime/syntax/testdir/dumps/vim9_blocks_01.dump index 533eb91203..7eb90cc029 100644 --- a/runtime/syntax/testdir/dumps/vim9_block_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_blocks_01.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@3|{+0#e000e06&| +0#0000000&@69 -@6|{+0#e000e06&| +0#0000000&@67 +| +0&#ffffff0@5|{+0#e000e06&| +0#0000000&@67 @8|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@54 @6|}+0#e000e06&| +0#0000000&@67 @6|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@56 -@4>}+0#e000e06&| +0#0000000&@69 -@4|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58 +@4|}+0#e000e06&| +0#0000000&@69 +@4>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58 @2|}+0#e000e06&| +0#0000000&@71 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60 |}+0#e000e06&| +0#0000000&@73 @@ -17,4 +16,5 @@ @2|}+0#e000e06&| +0#0000000&@71 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 -@57|1|8|,|5| @9|4|0|%| +@75 +@57|1|9|,|5| @9|4|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_block_02.dump b/runtime/syntax/testdir/dumps/vim9_blocks_02.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim9_block_02.dump rename to runtime/syntax/testdir/dumps/vim9_blocks_02.dump index c91074ada1..df9b1f78f3 100644 --- a/runtime/syntax/testdir/dumps/vim9_block_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_blocks_02.dump @@ -1,10 +1,9 @@ | +0&#ffffff0@74 -@75 |#+0#0000e05&| |s|t|a|r|t|/|e|n|d| |p|a|t@1|e|r|n|s| +0#0000000&@54 @75 |{+0#e000e06&| +0#0000000&@73 -@2>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60 -|}+0#e000e06&| +0#0000000&@73 +@2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60 +>}+0#e000e06&| +0#0000000&@73 @75 |{+0#e000e06&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60 @@ -17,4 +16,5 @@ |#+0#0000e05&| |d|i|c|t|i|o|n|a|r|y| +0#0000000&@62 |{+0#e000e06&|}|-+0#af5f00255&|>|i+0#00e0e07&|t|e|m|s|(+0#e000e06&|)| +0#0000000&@63 @75 -@57|3|6|,|3| @9|B|o|t| +|~+0#4040ff13&| @73 +| +0#0000000&@56|3|7|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_00.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump similarity index 92% rename from runtime/syntax/testdir/dumps/vim_object_methods_00.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump index 8ac6f21450..39857166da 100644 --- a/runtime/syntax/testdir/dumps/vim_object_methods_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump @@ -1,10 +1,9 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 +|#+0#0000e05&| |V|i|m| |||b|u|i|l|t|i|n|-|o|b|j|e|c|t|-|m|e|t|h|o|d|s||| |a|n|d| |n|a|m|e|s|a|k|e| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@13 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|M|e|t|h|o|d|N|a|m|e| |S|p|e|c|i|a|l| +0#0000000&@27 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36 @75 @75 -|#+0#0000e05&| |V|i|m| |||b|u|i|l|t|i|n|-|o|b|j|e|c|t|-|m|e|t|h|o|d|s||| |a|n|d| |n|a|m|e|s|a|k|e| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s|.| +0#0000000&@12 |c+0#af5f00255&|l|a|s@1| +0#0000000&|P|a|i|r|C|l|a|s@1|T|e|s|t| @55 @8|p+0#af5f00255&|u|b|l|i|c| +0#0000000&|c+0#af5f00255&|o|n|s|t| +0#0000000&|a+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@47 @8|p+0#af5f00255&|u|b|l|i|c| +0#0000000&|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@47 @@ -17,4 +16,5 @@ @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 +@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_01.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump similarity index 80% rename from runtime/syntax/testdir/dumps/vim_object_methods_01.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump index 9af5000bf5..ff3e810322 100644 --- a/runtime/syntax/testdir/dumps/vim_object_methods_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@7| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|b+0#00e0e07&| +0#0000000&@48 -@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 +| +0&#ffffff0@7|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 @75 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46 -@8>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 -@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 +@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 +@8>d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&| +0#0000000&@50 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46 @@ -17,4 +16,5 @@ @75 @8|d+0#af5f00255&|e|f| +0#0000000&|N|o|O|p|(+0#e000e06&|)| +0#0000000&@56 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 +@75 @57|1|9|,|2|-|9| @7|3@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_02.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump similarity index 91% rename from runtime/syntax/testdir/dumps/vim_object_methods_02.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump index 4ecdffadbc..22c31e20fe 100644 --- a/runtime/syntax/testdir/dumps/vim_object_methods_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@7|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 -@75 +| +0&#ffffff0@74 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@47 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 -@8>d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 -@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50 +@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 +@16>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&@42 @@ -17,4 +16,5 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@32 |e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|l+0#e000e06&|e|n|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&@24 |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3 -@57|3|7|,|2|-|9| @7|7|9|%| +@75 +@57|3|7|,|3|-|1|7| @6|7|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_03.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump similarity index 77% rename from runtime/syntax/testdir/dumps/vim_object_methods_03.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump index 255c8b5571..ed7c835e02 100644 --- a/runtime/syntax/testdir/dumps/vim_object_methods_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump @@ -1,12 +1,12 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3 -@75 +| +0&#ffffff0@74 |c+0#af5f00255&|o|n|s|t| +0#0000000&|p+0#00e0e07&|a|i|r|:+0#0000000&| |P|a|i|r|C|l|a|s@1|T|e|s|t| |=+0#af5f00255&| +0#0000000&|P|a|i|r|C|l|a|s@1|T|e|s|t|.|n+0#e000e06&|e|w|(|0+0#e000002&|,+0#0000000&| |1+0#e000002&|)+0#e000e06&| +0#0000000&@23 |c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|2|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|p+0#0000000&|a|i|r|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@44 |c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|l+0#e000e06&|e|n|(|)| +0#0000000&@45 ->c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42 -|e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|2| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&@51 +|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42 +>e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|2| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&@44 |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&@27 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump similarity index 84% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump index 4a9295ff63..a2168b590d 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump @@ -1,5 +1,6 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -|#+0#0000e05&| |V|i|m|9| |s|p|e|c|i|a|l| |m|e|t|h|o|d|s| |n|e|w|*|(|)|,| |e|m|p|t|y|(|)|,| |l|e|n|(|)|,| |s|t|r|i|n|g|(|)| +0#0000000&@19 +|#+0#0000e05&| |V|i|m|9| |s|p|e|c|i|a|l| |m|e|t|h|o|d|s| |-| |n|e|w|*|(|)|,| |e|m|p|t|y|(|)|,| |l|e|n|(|)|,| |s|t|r|i|n|g|(|)| +0#0000000&@17 +@75 @75 |d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|(+0#e000e06#ffffff0|)| +0#0000000&@65 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @@ -16,5 +17,4 @@ @75 |d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@57 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64 -|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump similarity index 73% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump index eef981d2b6..360e0e356a 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61 +|d+0#af5f00255#ffffff0|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@57 +@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 |d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@57 -@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64 ->e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 +@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64 +|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 |d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@54 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@63 @@ -16,5 +17,4 @@ @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 -@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 -@57|1|9|,|1| @9|1|3|%| +@57|1|9|,|3| @9|1|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump similarity index 77% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump index ef8e3f5f3a..b2848bc9a7 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 +| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 -@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59 -@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@6>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59 +@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 @75 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@58 @@ -16,5 +17,4 @@ @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 -@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59 -@57|3|7|,|5| @9|3|2|%| +@57|3|7|,|7| @9|3|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump similarity index 73% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump index 84a201c3d4..f71c49c3d8 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59 +| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 +@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 @75 -@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53 -@4>d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55 +@2>d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53 +@4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57 @@ -16,5 +17,4 @@ @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 @75 -@2|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55 -@57|5@1|,|5| @9|5|2|%| +@57|5@1|,|3| @9|5|1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump similarity index 75% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump index 5528045109..0fd7af7c58 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55 +| +0&#ffffff0@74 +@2|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 -@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57 -@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@6>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57 +@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @@ -16,5 +17,4 @@ @2|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@55 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 -@4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 -@57|7|3|,|5| @9|7|1|%| +@57|7|3|,|7| @9|7|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump similarity index 74% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump index 0e5727f2db..69721afafc 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 +| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@55 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 -@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58 -@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@8>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58 +@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @@ -16,5 +17,4 @@ @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@55 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 -@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 -@57|9|1|,|5| @9|9|0|%| +@57|9|1|,|2|-|9| @7|8|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump similarity index 59% rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump index 479163b5ae..b9436311ba 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump +++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 +| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 -@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57 -@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +@8>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57 +@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@61 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|1|0|9|,|5| @8|B|o|t| +| +0#0000000&@56|1|0|9|,|2|-|9| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump similarity index 92% rename from runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump rename to runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump index ef9f580d95..e310e47c52 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump @@ -1,8 +1,8 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 -|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53 +|#+0#0000e05&| |V|i|m|9| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@52 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|t|r|u|e| +0#0000000&@20 @75 +@75 |#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@55 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump similarity index 79% rename from runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump rename to runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump index 6e0399127d..9ed03150e5 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump @@ -7,14 +7,14 @@ |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 @2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 +@75 +|{+0#e000e06&| +0#0000000&@73 +@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 +|}+0#e000e06&| +0#0000000&@73 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_comment_00.dump b/runtime/syntax/testdir/dumps/vim9_comments_00.dump similarity index 94% rename from runtime/syntax/testdir/dumps/vim9_comment_00.dump rename to runtime/syntax/testdir/dumps/vim9_comments_00.dump index 46d283f6ee..dc43347b0b 100644 --- a/runtime/syntax/testdir/dumps/vim9_comment_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_comments_00.dump @@ -1,6 +1,6 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |c|o|m@1|e|n|t|s| +0#0000000&@59 @75 -|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t|s| +0#0000000&@60 @75 |#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@53 @75 diff --git a/runtime/syntax/testdir/dumps/vim9_comment_01.dump b/runtime/syntax/testdir/dumps/vim9_comments_01.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_comment_01.dump rename to runtime/syntax/testdir/dumps/vim9_comments_01.dump diff --git a/runtime/syntax/testdir/dumps/vim9_comment_02.dump b/runtime/syntax/testdir/dumps/vim9_comments_02.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_comment_02.dump rename to runtime/syntax/testdir/dumps/vim9_comments_02.dump diff --git a/runtime/syntax/testdir/dumps/vim9_comment_03.dump b/runtime/syntax/testdir/dumps/vim9_comments_03.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_comment_03.dump rename to runtime/syntax/testdir/dumps/vim9_comments_03.dump diff --git a/runtime/syntax/testdir/dumps/vim9_comment_04.dump b/runtime/syntax/testdir/dumps/vim9_comments_04.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_comment_04.dump rename to runtime/syntax/testdir/dumps/vim9_comments_04.dump diff --git a/runtime/syntax/testdir/dumps/vim9_comment_05.dump b/runtime/syntax/testdir/dumps/vim9_comments_05.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_comment_05.dump rename to runtime/syntax/testdir/dumps/vim9_comments_05.dump diff --git a/runtime/syntax/testdir/dumps/vim9_constructor_00.dump b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump similarity index 90% rename from runtime/syntax/testdir/dumps/vim9_constructor_00.dump rename to runtime/syntax/testdir/dumps/vim9_constructors_00.dump index 1b30c562de..6aa0cba8d8 100644 --- a/runtime/syntax/testdir/dumps/vim9_constructor_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump @@ -1,6 +1,5 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 -|#+0#0000e05&| |V|i|m|9| |c|o|n|s|t|r|u|c|t|o|r| +0#0000000&@56 +|#+0#0000e05&| |V|i|m|9| |c|o|n|s|t|r|u|c|t|o|r|s| +0#0000000&@55 @75 @75 |c+0#af5f00255&|l|a|s@1| +0#0000000&|A| @67 @@ -17,4 +16,5 @@ @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 @75 -@57|1|,|1| @10|A|l@1| +|~+0#4040ff13&| @73 +| +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump index 82b97648bd..6c01f4271b 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump @@ -1,8 +1,9 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e|s| +0#0000000&@49 @75 -|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@37 @75 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65 +@75 @2|#+0#0000e05&| |D|e|c|l|a|r|a|t|i|o|n|s| +0#0000000&@58 @75 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @@ -16,5 +17,4 @@ @75 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @75 -@2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump index d5511cad47..e16bd69e59 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 +@75 @2|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @75 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 -@75 -@2>v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +> @74 +@2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @@ -16,5 +17,4 @@ @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|;+0#0000000&| |$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@43 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| @62 -@8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59 -@57|1|9|,|3| @10|6|%| +@57|1|9|,|0|-|1| @8|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump index 9bb006ed6a..891384240a 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59 +| +0&#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| @62 +@8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59 @8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @75 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 -|.+0#e000002&@2| +0#0000000&@71 ->E+0#e000e06&|N|D| +0#0000000&@71 +>.+0#e000002&@2| +0#0000000&@71 +|E+0#e000e06&|N|D| +0#0000000&@71 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 | +0#e000002&@1|.@2| +0#0000000&@69 | +0#e000e06&@1|E|N|D| +0#0000000&@69 @@ -16,5 +17,4 @@ @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@47 | +0#e000002&@3|.@2| +0#0000000&@67 | +0#e000e06&@1|E|N|D| +0#0000000&@69 -@75 -@57|3|7|,|1| @9|1|5|%| +@57|3|7|,|1| @9|1|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump index 938b20eb1f..48f1253284 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69 +@75 @2|#+0#0000e05&| |A|s@1|i|g|n|m|e|n|t|s| +0#0000000&@59 @75 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@62 -@75 -@1| +0#00e0e07&>f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +> @74 +@1| +0#00e0e07&|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @75 @1| +0#00e0e07&|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @1| +0#00e0e07&|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @@ -16,5 +17,4 @@ @1| +0#00e0e07&|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @1| +0#00e0e07&|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @1| +0#00e0e07&|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 -@1| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 -@57|5@1|,|3| @9|2|3|%| +@57|5@1|,|0|-|1| @7|2|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump index 7d28f18c7f..2c507e1ed0 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 +| +0&#ffffff0| +0#00e0e07&|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 +@1| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @1| +0#00e0e07&|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @1| +0#00e0e07&|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @75 -@2|b+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 -@2>g+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 +@2>b+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 +@2|g+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @75 @@ -16,5 +17,4 @@ @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -@75 @57|7|3|,|3| @9|3|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump index 57bb62f846..abf71b017e 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +@75 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -@2|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -> @74 +@2>w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +@75 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @@ -16,5 +17,4 @@ @75 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 -@2|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 -@57|9|1|,|0|-|1| @7|4|1|%| +@57|9|1|,|3| @9|4|1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump index a0ab49421b..85c8000a8c 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 +| +0&#ffffff0@1|g+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 +@2|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @75 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 -@2|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -> @74 +@2>$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +@75 @2|@+0#e000e06&|f| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@63 @2|@+0#e000e06&|f| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61 @75 @@ -16,5 +17,4 @@ @2|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @2|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @75 -@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -@57|1|0|9|,|0|-|1| @6|5|0|%| +@57|1|0|9|,|3| @8|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump index 6d92e190c9..928fc56aa9 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +| +0&#ffffff0@74 +@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @75 @2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -> @74 +@2>&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +@75 @2|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @75 @2|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @@ -16,5 +17,4 @@ @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@48 @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 -@2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@57|1|2|7|,|0|-|1| @6|5|8|%| +@57|1|2|7|,|3| @8|5|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump index 33dddb64e9..22c33e877c 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 +@2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| @66 @8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@2|[+0#e000e06&|$|f|o@1|,+0#0000000&| @66 -@8>\+0#e000e06&| +0#0000000&@1|$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +@2>[+0#e000e06&|$|f|o@1|,+0#0000000&| @66 +@8|\+0#e000e06&| +0#0000000&@1|$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|[+0#e000e06&|@|a|,+0#0000000&| |@+0#e000e06&|b|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|[+0#e000e06&|@|a|,+0#0000000&| @68 @8|\+0#e000e06&| +0#0000000&@1|@+0#e000e06&|a|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @@ -16,5 +17,4 @@ @2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#e000e06&| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 @2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 -@2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67 -@57|1|4|5|,|2|-|9| @6|6|7|%| +@57|1|4|5|,|3| @8|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump index 4cdfb12457..a8db5cd3ee 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67 +| +0&#ffffff0@1|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 +@2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @60 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@40 -@2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64 -@8>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| @56 +@2>[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64 +@8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| @56 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|n|o|n|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|;+0#0000000&| |$+0#e000e06&|b|a|z|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@47 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| @66 @@ -16,5 +17,4 @@ @2|[+0#e000e06&|@|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|[+0#e000e06&|@|a|,+0#0000000&| @68 @8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61 -@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@57|1|6|3|,|2|-|9| @6|7|6|%| +@57|1|6|3|,|3| @8|7|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump index c802c88d31..6d359140b5 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61 +@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@61 |.+0#e000002&@2| +0#0000000&@71 -|E+0#e000e06&|N|D| +0#0000000&@71 -@1| +0#00e0e07&>f|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@56 +>E+0#e000e06&|N|D| +0#0000000&@71 +@1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@56 | +0#e000002&@1|.@2| +0#0000000&@69 | +0#e000e06&@1|E|N|D| +0#0000000&@69 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@56 @@ -16,5 +17,4 @@ | +0#e000002&@3|.@2| +0#0000000&@67 | +0#e000e06&@1|E|N|D| +0#0000000&@69 @75 -@2|#+0#0000e05&| |:|f|o|r| +0#0000000&@66 -@57|1|8|1|,|3| @8|8|4|%| +@57|1|8|1|,|1| @8|8|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump index 496b3ed150..b416e91501 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|#+0#0000e05&| |:|f|o|r| +0#0000000&@66 +| +0&#ffffff0@74 +@2|#+0#0000e05&| |:|f|o|r| +0#0000000&@66 @75 @2|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66 -@75 -@2>f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 +> @74 +@2|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66 @75 |#+0#0000e05&| |S|c|o|p|e| |d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@54 @@ -16,5 +17,4 @@ @75 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 -|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 -@57|1|9@1|,|3| @8|9|3|%| +@57|1|9@1|,|0|-|1| @6|9|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump index ea9b184ae8..e2b3f2d6f4 100644 --- a/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump +++ b/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump @@ -1,9 +1,10 @@ -|f+0#af5f00255#ffffff0|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +|f+0#af5f00255#ffffff0|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|v+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 @75 -|#+0#0000e05&| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |v|a|r|i|a|b|l|e|s| |(|n|o|t| |h|i|g|h|l|i|g|h|t|e|d| |b|y| |d|e|f|a|u|l|t|)| +0#0000000&@18 -> @74 +>#+0#0000e05&| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |v|a|r|i|a|b|l|e|s| |(|n|o|t| |h|i|g|h|l|i|g|h|t|e|d| |b|y| |d|e|f|a|u|l|t|)| +0#0000000&@18 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|l+0#0000000&|u|a| |v+0#00e0e07&|:|m+0#0000000&|s|g|p|a|c|k|_|t|y|p|e|s| |v+0#00e0e07&|:|r+0#0000000&|e|l|n|u|m| |v+0#00e0e07&|:|s+0#0000000&|t|d|e|r@1| |v+0#00e0e07&|:|t+0#0000000&|e|r|m|r|e|q|u|e|s|t| |v+0#00e0e07&|:|v+0#0000000&|i|r|t|n|u|m| @6 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|2|1|7|,|0|-|1| @6|B|o|t| +| +0#0000000&@56|2|1|7|,|1| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump index 6d431a6b74..a370779d19 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump @@ -1,12 +1,13 @@ | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|c|l|a|s@1| |c|o|m@1|a|n|d| +0#0000000&@51 -| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|c|f|'| +0#0000000&@28 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|c|f|i|'| +0#0000000&@27 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52 -| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 -| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52 -| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|1| @60 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|3| @51 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump index 7dd62c8bdf..eb4ae910ee 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|2| @53 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|3| @51 -||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 -| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|4| @44 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|7| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @26 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|8| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @19 -@57|1|9|,|0|-|1| @7|2|5|%| +@57|1|9|,|1| @9|2|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump index 0c4b0c2006..31ab784ce1 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|8| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @19 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|9| @60 -|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@61 -|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@61 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@51 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|N|e|s|t|e|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@49 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|d+0#af5f00255&|e|f| +0#0000000&|N|e|s|t|e|d|2|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@47 @@ -16,5 +17,4 @@ |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|1|0| @50 -@57|3|7|,|3| @9|6|0|%| +@57|3|7|,|3| @9|5|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump index 7b7b8eac0a..97457ba72e 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump @@ -1,20 +1,20 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|1|0| @50 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@42 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@41 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|4|3|9|3| +0#0000000&@57 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|T|e|s|t|a|b|l|e| @54 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@57 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@54 -| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|T|e|s|t|a|b|l|e| @54 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@57 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@54 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t|T|e|m|p|l|a|t|e| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|T|e|s|t|a|b|l|e| @25 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|a|i|l|e|d|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|p+0#00e0e07&|a|s@1|e|d|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@48 -||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@45 -@57|5@1|,|0|-|1| @7|9|6|%| +@57|5@1|,|0|-|1| @7|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump index dbda81a26c..a7fcfe7daf 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump @@ -1,3 +1,4 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@48 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@45 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|7|0|,|0|-|1| @7|B|o|t| +| +0#0000000&@56|7|1|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump index af3fcfa0f3..6da90f8216 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump @@ -1,7 +1,7 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@56 @75 +@75 |#+0#0000e05&| |S|T|A|R|T| |N|O|T| |M|A|T|C|H|E|D| +0#0000000&@55 |:|@| @72 |:|@+0#e000e06&@1| +0#0000000&@71 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump index 9e3d0b0599..fa28754896 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump @@ -1,10 +1,9 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -|#+0#0000e05&| |V|i|m| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@55 +|#+0#0000e05&| |V|i|m|9| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@54 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|E|n|u|m|V|a|l|u|e| |T|o|d|o| +0#0000000&@31 -@75 -@75 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|3|6|5|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|5|7|1|4|2|0|5@1|1| +0#0000000&@6 @75 +@75 |e+0#af5f00255&|n|u|m| +0#0000000&|L|e|t@1|e|r| @63 @4|#+0#0000e05&| +0#0000000&@69 @4|#+0#0000e05&@40| +0#0000000&@29 @@ -17,4 +16,5 @@ @4|)+0#e000e06&|,+0#0000000&| |G+0#0000001#ffff4012| +0#0000000#ffffff0@66 @4|#+0#0000e05&|e|n|u|m| |N|o|t|S|u|p@1|o|r|t|e|d| +0#0000000&@52 @4|#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62 +@75 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump index 17e107e1d8..2b47e5723e 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@3|F+0#0000001#ffff4012|(+0#e000e06#ffffff0| +0#0000000&@68 -@4|"+0#e000002&|)|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|#+0#0000e05&| |F|A|,| +0#0000000&@58 +| +0&#ffffff0@3|"+0#e000002&|)|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|#+0#0000e05&| |F|A|,| +0#0000000&@58 @4|"+0#e000002&|(|"| +0#0000000&|#+0#0000e05&| |F|B|,| +0#0000000&@61 @4|)+0#e000e06&|,+0#0000000&| |G+0#0000001#ffff4012| +0#0000000#ffffff0@66 @4|#+0#0000e05&|e|n|u|m| |N|o|t|S|u|p@1|o|r|t|e|d| +0#0000000&@52 -@4>#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62 -@75 +@4|#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62 +> @74 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|v+0#00e0e07&|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|n|o|n|e|)+0#e000e06&| +0#0000000&@42 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @@ -17,4 +16,5 @@ @75 |e+0#af5f00255&|c|h|o| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#af5f00255&|D+0#00e0e07&| +0#0000000&@61 @75 -@57|1|9|,|5| @9|B|o|t| +|~+0#4040ff13&| @73 +| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump index 706820bec7..5842cffa2f 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump @@ -1,14 +1,14 @@ | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 -| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@53 -| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|e|f|'| +0#0000000&@28 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|e|f|i|'| +0#0000000&@27 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|E|n|u|m|V|a|l|u|e| |T|o|d|o| +0#0000000&@29 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52 -| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 -| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52 -| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|u|m| +0#0000000&|E|n|u|m|1| @62 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump index 3d1d628df6..5d5b08fedb 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump @@ -1,5 +1,4 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |:|f|o|r| |c|o|m@1|a|n|d| +0#0000000&@55 @75 @75 @@ -17,4 +16,5 @@ @75 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&@64 @6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59 +@6|e+0#00e0e07&|x|p|r| +0#0000000&@64 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump index 600b850631..5cf763707c 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump @@ -1,10 +1,9 @@ -|f+0#af5f00255#ffffff0|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 -@2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 +| +0&#ffffff0@1|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 @75 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&@64 -@6>#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59 -@6|e+0#00e0e07&|x|p|r| +0#0000000&@64 +@6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59 +@6>e+0#00e0e07&|x|p|r| +0#0000000&@64 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 @75 @@ -17,4 +16,5 @@ |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@39 @75 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |n+0#00e0e07&|u|m|b|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@31 -@57|1|9|,|7| @9|2|6|%| +@75 +@57|1|9|,|7| @9|2|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump index 5560a5b7b9..9e60ec45ba 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump @@ -1,10 +1,9 @@ -|f+0#af5f00255#ffffff0|o|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |n+0#00e0e07&|u|m|b|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@31 -@75 +| +0&#ffffff0@74 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&||| |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 -> @74 @75 +> @74 |#+0#0000e05&| |:|f|o|r| |[|{|v|a|r|1|}|,| |{|v|a|r|2|}|,| |.@2|]| |i|n| |{|l|i|s|t|l|i|s|t|}| +0#0000000&@32 @75 |v+0#af5f00255&|a|r| +0#0000000&|e+0#00e0e07&|x|p|r|2| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&@1|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|3|]+0#e000e06&@1| +0#0000000&@52 @@ -17,4 +16,5 @@ @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 @75 -@57|3|7|,|0|-|1| @7|6|3|%| +|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57 +@57|3|7|,|0|-|1| @7|6|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump index 8f16b2b524..1aecb92bbb 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@74 -|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57 +|f+0#af5f00255#ffffff0|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57 @6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59 @6|e+0#00e0e07&|x|p|r|2| +0#0000000&@63 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60 ->e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 -@75 +|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 +> @74 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r|2| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@27 @75 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&@1|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|3|]+0#e000e06&@1| +0#0000000&@46 @@ -17,4 +16,5 @@ @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 @75 -@57|5@1|,|1| @9|B|o|t| +|~+0#4040ff13&| @73 +| +0#0000000&@56|5@1|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump index b9b219e2d6..b3a368d48d 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump @@ -1,8 +1,8 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t| |e|r@1|o|r|s| +0#0000000&@29 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34 @75 +@75 |f+0#af5f00255&|u|n| +0#0000000&|T|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@14|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump index 896ab615c7..bfc9103cdb 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump @@ -17,4 +17,4 @@ @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56 -@57|1|9|,|1| @9|5|2|%| +@57|1|9|,|1| @9|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump index 71c31bf929..b7d3c83310 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump @@ -11,10 +11,10 @@ |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&| +0#0000000&@54 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@50 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|3|7|,|5| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump index 081c0a3edc..f50d4a5055 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump @@ -1,8 +1,8 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t|s| +0#0000000&@35 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34 @75 +@75 |f+0#af5f00255&|u|n| +0#0000000&|T|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@14|"+0#0000e05&| |f|u|n| +0#0000000&@37 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump index 30083bd4d0..5498379d35 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump @@ -17,4 +17,4 @@ @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56 -@57|1|9|,|1| @9|5|2|%| +@57|1|9|,|1| @9|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump index e9e8022b94..daaca61419 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump @@ -11,10 +11,10 @@ |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&| +0#0000000&@54 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@50 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|3|7|,|5| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump index 6e9dde7d1a..39aa281414 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump @@ -1,8 +1,9 @@ | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 -| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m| |:|i|n|t|e|r|f|a|c|e| |c|o|m@1|a|n|d| +0#0000000&@48 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|i|n|t|e|r|f|a|c|e| |c|o|m@1|a|n|d| +0#0000000&@47 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|i|'| +0#0000000&@29 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|3| @52 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 -||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump index 543ad01e36..9d89454ada 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|3| @52 -||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 -||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|4| @52 @@ -16,5 +17,4 @@ |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|5| @52 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54 -||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54 -@57|1|9|,|3| @9|7|6|%| +@57|1|9|,|3| @9|6|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump index 06b0359b67..ea070ef8ac 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump @@ -1,8 +1,10 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|2|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 ||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|3|6|,|1| @9|B|o|t| +| +0#0000000&@56|3|7|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump index 2901ba96e0..6694ed7194 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump @@ -1,4 +1,5 @@ | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |h|e|r|e|d|o|c| +0#0000000&@58 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|h|"| +0#0000000&@29 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 -||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump index 7531031632..e4881b8ee4 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 -||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69 +||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 +||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@48 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @61 @57|1|9|,|1| @10|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump index d4012e70de..aa40a19db3 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @61 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 -||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|i|g|n|m|e|n|t| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@61 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| |g+0#00e0e07#ffffff0|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59 -@57|3|7|,|0|-|1| @7|1@1|%| +@57|3|7|,|1| @9|1@1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump index 63446dd91d..9f70a8ce56 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |g+0#00e0e07#ffffff0|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0| +0#00e0e07&>g|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0| +0#00e0e07&|g|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 @@ -16,5 +17,4 @@ |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@52 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 -||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 -@57|5@1|,|3| @9|1|7|%| +@57|5@1|,|0|-|1| @7|1|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump index 579e5a6067..71897e5037 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|[+0#0000000#ffffff0|f+0#00e0e07&|o@1|,+0#0000000&| @67 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|\| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@52 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 -||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 +||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|[|f+0#00e0e07&|o@1|,+0#0000000&| @65 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -@57|7|3|,|1| @9|2|4|%| +@57|7|3|,|1| @9|2|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump index 18924f8954..d1a98e7553 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|[|g+0#00e0e07&|:|f|o@1|,+0#0000000&| |g+0#00e0e07&|:|b|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@48 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 -||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|[+0#0000000#ffffff0|g+0#00e0e07&|:|f|o@1|,+0#0000000&| @65 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|\| |g+0#00e0e07&|:|b|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -@57|9|1|,|0|-|1| @7|3|0|%| +@57|9|1|,|1| @9|3|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump index 1ed846b53c..0af6e896db 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump @@ -1,9 +1,10 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |t|y|p|e|d| +0#0000000&@65 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |l+0#00e0003&|i|s|t|<|s|t|r|i|n|g|>| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@43 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 -||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 +||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| |b+0#00e0e07&|a|r|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|]+0#0000000&| |=+0#e000e06&|<@1| |E|N|D| +0#0000000&@34 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |t|r|i|m| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 -||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65 @57|1|0|9|,|1| @8|3|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump index 0e8fac1495..72e34392be 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump @@ -1,9 +1,10 @@ +|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|2| +0#0000000&@65 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 -||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3>l|i|n|e|1| +0#0000000&@63 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 +||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|1| +0#0000000&@63 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|2| +0#0000000&@63 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@61 -@57|1|2|7|,|5| @8|4|3|%| +@57|1|2|7|,|3| @8|4|3|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump index b0423b32d8..4234423889 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump @@ -1,9 +1,10 @@ +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@61 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|1+0#e000002&|}+0#e000e06&| +0#0000000&@61 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47 -||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1>l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@59 +|-+0#0000e05#a8a8a8255| >v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47 +||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@59 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|1+0#e000002&|}+0#e000e06&| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59 -@57|1|4|5|,|3| @8|4|9|%| +@57|1|4|5|,|1| @8|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump index 937493194f..52af3d8259 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59 -||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59 +||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59 +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@55 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @57|1|6|3|,|1| @8|5|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump index 3ab0bf7312..c2158724ce 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump @@ -1,9 +1,10 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 -||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61 -||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{|1| |+| |1|}| +0#0000000&@61 +||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61 +||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |1|}| +0#0000000&@61 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@55 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{|1| |+| |1|}| +0#0000000&@59 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 @57|1|8|1|,|1| @8|6|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump index 65d18b6d1a..c29d680cd2 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{|1| |+| |0|}| +0#0000000&@57 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{|1| |+| |1|}| +0#0000000&@57 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |e|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0|E|N|D| | +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 -@57|1|9@1|,|0|-|1| @6|6|9|%| +@57|1|9@1|,|0|-|1| @6|6|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump index fe42476c9c..b1bc7cdbfa 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|E|N|D| | +0#0000000&@66 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1>#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 @@ -16,5 +17,4 @@ |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|E|N|D| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -@57|2|1|7|,|1| @8|7|5|%| +@57|2|1|7|,|0|-|1| @6|7|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump index 4456c104b6..b41c983297 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump @@ -1,9 +1,10 @@ +||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| +0#0000000&@65 -||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 -| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1>E|N|D| +0#0000000&@67 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| |E+0#e000002#ffffff0|N|D| | +0#0000000&@68 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@41 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 -||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64 -@57|2|3|4|,|0|-|1| @6|8|1|%| +@57|2|3|4|,|3| @8|8|1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump index f8547b1855..6c0659877c 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump @@ -1,9 +1,10 @@ +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 -|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 -||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@4>E|N|D| +0#0000000&@64 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 +||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@4|E|N|D| +0#0000000&@64 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@41 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |E+0#e000002#ffffff0|N|D| | +0#0000000&@68 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 -@57|2|5|2|,|6| @8|8@1|%| +@57|2|5|2|,|3| @8|8|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump index 7260f7eba2..383207f7ea 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0|E|N|D| +0#0000000&@68 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1>#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@2|E|N|D| +0#0000000&@66 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 @@ -16,5 +17,4 @@ ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |!+0#e000e06#ffffff0|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47 -@57|2|7|0|,|3| @8|9|4|%| +@57|2|7|0|,|0|-|1| @6|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump index 66baedcd09..80f70dd589 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump @@ -1,9 +1,10 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |0+0#e000e06#ffffff0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@59 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -|-+0#0000e05#a8a8a8255| >v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |A|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |A|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67 ||+0#0000e05#a8a8a8255| |A+0#e000e06#ffffff0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@59 @@ -16,5 +17,4 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |~+0#4040ff13&| @73 |~| @73 -|~| @73 -| +0#0000000&@56|2|8@1|,|1| @8|B|o|t| +| +0#0000000&@56|2|8@1|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump index 9e6247a6c1..ac066ec60b 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump @@ -1,6 +1,6 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@48 @75 -|#+0#0000e05&| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49 @75 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54 @75 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump index 1d0823fe61..4c68fac986 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump @@ -15,6 +15,6 @@ @1|e|n|t| +0#0000000&@70 |:| |#| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e |n|t| +0#0000000&@72 +@75 |~+0#4040ff13&| @73 -|~| @73 | +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.vim b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.vim deleted file mode 100644 index 546837cfb1..0000000000 --- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[“�]+?+ge diff --git a/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump index b52cb37a83..c5fa4c94e5 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump @@ -1,5 +1,6 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -|#+0#0000e05&| |V|i|m| |:|t|y|p|e| |c|o|m@1|a|n|d| +0#0000000&@55 +|#+0#0000e05&| |V|i|m|9| |:|t|y|p|e| |c|o|m@1|a|n|d| +0#0000000&@54 +@75 @75 |t+0#af5f00255&|y|p|e| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0003&|t|r|i|n|g| +0#0000000&@57 |t+0#af5f00255&|y|p|e| +0#0000000&|B|a|r| |=+0#af5f00255&| +0#0000000&|l+0#00e0003&|i|s|t|<|s|t|r|i|n|g|>| +0#0000000&@51 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim9_expr_00.dump b/runtime/syntax/testdir/dumps/vim9_expressions_00.dump similarity index 93% rename from runtime/syntax/testdir/dumps/vim9_expr_00.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_00.dump index 92bad1ab7c..f0683ccae4 100644 --- a/runtime/syntax/testdir/dumps/vim9_expr_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_expressions_00.dump @@ -1,5 +1,5 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@49 +|#+0#0000e05&| |V|i|m|9| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@56 @75 @75 |#+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66 diff --git a/runtime/syntax/testdir/dumps/vim9_expr_01.dump b/runtime/syntax/testdir/dumps/vim9_expressions_01.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_01.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_01.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_02.dump b/runtime/syntax/testdir/dumps/vim9_expressions_02.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_02.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_02.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_03.dump b/runtime/syntax/testdir/dumps/vim9_expressions_03.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_03.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_03.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_04.dump b/runtime/syntax/testdir/dumps/vim9_expressions_04.dump similarity index 98% rename from runtime/syntax/testdir/dumps/vim9_expr_04.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_04.dump index ffce205d7b..0d8becb495 100644 --- a/runtime/syntax/testdir/dumps/vim9_expr_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_expressions_04.dump @@ -1,6 +1,6 @@ |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |w+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |t+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |g+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |l+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |s+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |a+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |v+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2| +0#0000000&@1|}+0#e000e06&| +0#0000000&@10 @75 -|"| |R|e|g|i|s|t|e|r| @64 +|#+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|"| +0#0000000&|@+0#e000e06&@1| +0#0000000&@64 >e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40 diff --git a/runtime/syntax/testdir/dumps/vim9_expr_05.dump b/runtime/syntax/testdir/dumps/vim9_expressions_05.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_05.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_05.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_06.dump b/runtime/syntax/testdir/dumps/vim9_expressions_06.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_06.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_06.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_07.dump b/runtime/syntax/testdir/dumps/vim9_expressions_07.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_07.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_07.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_08.dump b/runtime/syntax/testdir/dumps/vim9_expressions_08.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_08.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_08.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_09.dump b/runtime/syntax/testdir/dumps/vim9_expressions_09.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_09.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_09.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_10.dump b/runtime/syntax/testdir/dumps/vim9_expressions_10.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_10.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_10.dump diff --git a/runtime/syntax/testdir/dumps/vim9_expr_11.dump b/runtime/syntax/testdir/dumps/vim9_expressions_11.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_expr_11.dump rename to runtime/syntax/testdir/dumps/vim9_expressions_11.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump similarity index 72% rename from runtime/syntax/testdir/dumps/vim9_function_call_00.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_00.dump index 5fec8133b2..8ca5f8b7f1 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump @@ -1,14 +1,14 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -|#+0#0000e05&| |V|i|m| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@54 -|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@26 -|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|9|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@25 +|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@53 +|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@33 +|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@32 @75 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62 |a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@67 @75 @75 -|#+0#0000e05&| |c|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44 +|#+0#0000e05&| |C|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44 @75 |#+0#0000e05&| |a|p@1|e|n|d| |b|r|o|w|s|e| |c|a|l@1| |c|h|d|i|r| |c|o|n|f|i|r|m| |c|o|p|y| |d|e|l|e|t|e| |e|v|a|l| |e|x|e|c|u|t|e| |f|i|l|t|e|r| |f|u|n|c|t|i|o|n |#| |i|n|s|e|r|t| |j|o|i|n| |m|a|p| |m|a|t|c|h| |m|o|d|e| |s|o|r|t| |s|p|l|i|t| |s|u|b|s|t|i|t|u|t|e| |s|w|a|p|n|a|m|e| |t|y|p|e| +0#0000000&@10 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_01.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_01.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_01.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_02.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_02.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_02.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_03.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_03.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_03.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_04.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_04.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_04.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_05.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_05.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_05.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_06.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_06.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_06.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_07.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_07.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_07.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_08.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_08.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_08.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim9_function_call_09.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_09.dump index 48d93d7f2f..9e02888b21 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump @@ -4,7 +4,7 @@ |u+0#af5f00255&|n|i|q| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65 @75 > @74 -|#+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66 +|#+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66 @75 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim9_function_call_10.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_10.dump index 26450a3a65..6624a78c2b 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump @@ -7,7 +7,7 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65 @75 @75 -|#+0#0000e05&| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61 +|#+0#0000e05&| |E|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61 @75 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57 @75 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim9_function_call_11.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_11.dump index a54617ec37..53e8445e1f 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump @@ -12,7 +12,7 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58 @75 @75 -|#+0#0000e05&| |s|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37 +|#+0#0000e05&| |S|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37 @75 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_12.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_12.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_12.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_13.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_13.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_13.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump similarity index 95% rename from runtime/syntax/testdir/dumps/vim9_function_call_14.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_14.dump index 3c8c147032..8511d6fe38 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump @@ -10,7 +10,7 @@ |g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58 @75 @75 -|#+0#0000e05&| |n|o|t| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@51 +|#+0#0000e05&| |U|s|e|r|,| |n|o|t| |b|u|i|l|t|i|n|,| |f|u|n|c|t|i|o|n|s| +0#0000000&@44 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_15.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_15.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_15.dump diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump similarity index 95% rename from runtime/syntax/testdir/dumps/vim9_function_call_16.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_16.dump index bbfe7516ce..31a186f251 100644 --- a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump +++ b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump @@ -11,7 +11,7 @@ |g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49 @75 @75 -|#+0#0000e05&| |c|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50 +|#+0#0000e05&| |C|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50 @75 |m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@56 |m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49 diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_17.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim9_function_call_17.dump rename to runtime/syntax/testdir/dumps/vim9_function_calls_17.dump diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump new file mode 100644 index 0000000000..165cc4c798 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@19 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|9|E|n|u|m|V|a|l|u|e| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@16 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|e|f|"| +0#0000000&@28 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|3|1|3|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|3@1|5|3|7|1|2|7| |(|A|l|i +| +0&#a8a8a8255@1|a+0&#ffffff0|k|s|e|i| |B|u|d|a|v|e|i|)| +0#0000000&@58 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|u|m| +0#0000000&|C|o|m@1|o|n|P|a|i|r| @57 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|H+0#00e0e07&|e|l@1|o|W|o|r|l|d|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|'+0#e000002&|h|e|l@1|o|'|,+0#0000000&| |'+0#e000002&|w|o|r|l|d|'|)+0#e000e06&|,+0#0000000&| @23 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|B+0#00e0e07&|o@1|l|e|a|n|s|<+0#e000e06&|b+0#00e0003&|o@1|l|,+0#0000000&| |b+0#00e0003&|o@1|l|>+0#e000e06&|(|t+0#e000002&|r|u|e|,+0#0000000&| |f+0#e000002&|a|l|s|e|)+0#e000e06&| +0#0000000&@35 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|f|s|t|:| |a+0#00e0003&|n|y| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|n|d|:| |a+0#00e0003&|n|y| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|f+0#0000000&|s|t|:| |T|,| |s|n|d|:| |U|)+0#e000e06&| +0#0000000&@39 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump new file mode 100644 index 0000000000..e7f1197014 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|f|s|t|:| |a+0#00e0003&|n|y| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|n|d|:| |a+0#00e0003&|n|y| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|f+0#0000000&|s|t|:| |T|,| |s|n|d|:| |U|)+0#e000e06&| +0#0000000&@39 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |T| @51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| @48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|c|o|n|d|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |T| @50 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| @48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p+0#00e0e07&|r|i|n|t|f|(+0#e000e06&|"+0#e000002&|(|%|s|,| |%|s|)|"|,+0#0000000&| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d|)+0#e000e06&| +0#0000000&@17 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +@57|1|8|,|9| @9|7|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump new file mode 100644 index 0000000000..4dde18a4f9 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.+0#af5f00255&|H+0#0000000&|e|l@1|o|W|o|r|l|d| @46 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.+0#af5f00255&|B+0#0000000&|o@1|l|e|a|n|s| @48 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|3|6|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump new file mode 100644 index 0000000000..875858659c --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|i|"| +0#0000000&@27 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|3|1|3|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|4|6@1|9|6|8|2|0| |(|A|l|i +| +0&#a8a8a8255@1|a+0&#ffffff0|k|s|e|i| |B|u|d|a|v|e|i|)| +0#0000000&@58 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |S|e@1| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6@1|0|4|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|5|2|0|2|8|4|5| |.| +0#0000000&@4 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|i+0#af5f00255&|n|t|e|r|f|a|c|e| +0#0000000&|L|i|s|t|a|b|l|e| @47 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|_+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @41 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump new file mode 100644 index 0000000000..fb51a8e22f --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|u|m| +0#0000000&|E|m|p|t|y|L|i|s|t| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|L|i|s|t|a|b|l|e| @38 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|I|N|S|T|A|N|C|E| @60 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|L|i|s|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|)+0#e000e06&| +0#0000000&@39 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@53 +@57|1|8|,|0|-|1| @8|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump new file mode 100644 index 0000000000..b797ebfd4e --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#e000002&|u|l@1| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@56 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@53 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65 +@57|3|6|,|5| @9|1|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump new file mode 100644 index 0000000000..2fc1beb437 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|L|i|s|t| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|L|i|s|t|a|b|l|e| @42 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|v|a|l|u|e|:| |a+0#00e0003&|n|y| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>v+0#af5f00255&|a|r| +0#0000000&|_|n|e|x|t|:| |L|i|s|t|a|b|l|e| @49 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&| +0#0000000&@48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&@50 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @33 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|,| |s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&@29 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|s|i|z|e| @47 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37 +@57|5|4|,|5| @9|2|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump new file mode 100644 index 0000000000..b8b324cefe --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump @@ -0,0 +1,20 @@ +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|c+0#af5f00255&|o|n|s|t| +0#0000000&|l|i|s|t|:| |L|i|s|t| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|,| |(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |++0#af5f00255&| +0#0000000&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@4 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@47 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l|i|s|t| @53 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@13 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r|e|s|u|l|t| |=+0#af5f00255&| +0#0000000&|r|e|s|u|l|t|.|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@20 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t| @51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48 +@57|7|2|,|0|-|1| @7|3@1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump new file mode 100644 index 0000000000..2269292539 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump @@ -0,0 +1,20 @@ +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| @47 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| @46 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&@1| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@40 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| @47 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i+0#af5f00255&|f| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49 +@57|9|0|,|2|-|9| @7|4|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump new file mode 100644 index 0000000000..508abd90d4 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|i|f| +0#0000000&@59 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|t|e|x|t|:| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|[|'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@5 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32 +|2+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|t|e|x|t| |.+0#af5f00255&@1|=| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@18 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|p|a|r|t|(+0#e000e06&|t+0#0000000&|e|x|t|,| |0+0#e000002&|,+0#0000000&| |(+0#e000e06&|s+0#00e0e07&|t|r|l|e|n|(+0#e000e06&|t+0#0000000&|e|x|t|)+0#e000e06&| +0#0000000&|-+0#af5f00255&| +0#0000000&|2+0#e000002&|)+0#e000e06&@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|]|'| +0#0000000&@14 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @36 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @43 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|1|0|8|,|0|-|1| @6|5|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump new file mode 100644 index 0000000000..881fb09688 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @30 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|L|i|s|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|)+0#e000e06&| +0#0000000&@43 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|p|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|l+0#0000000&|i|s|t|a|b|l|e|:| |L|i|s|t|a|b|l|e|,| |M|a|p@1|e|r|:| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |U|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @2 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @27 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|a|b|l|e| @39 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r|e|s|u|l|t| |=+0#af5f00255&| +0#0000000&|r|e|s|u|l|t|.|C|o|n|s|<+0#e000e06&|U+0#0000000&|>+0#e000e06&|(|M+0#0000000&|a|p@1|e|r|(+0#e000e06&|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|T+0#0000000&|>+0#e000e06&|(|)@2| +0#0000000&@16 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@46 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@60 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t|.|R|e|v|e|r|s|e|<+0#e000e06&|U+0#0000000&|>+0#e000e06&|(|)| +0#0000000&@42 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|i|l|t|e|r|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|l+0#0000000&|i|s|t|a|b|l|e|:| |L|i|s|t|a|b|l|e|,| |P|r|e|d|i|c|a|t|e|:| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a +|-+0#0000e05#a8a8a8255| |b+0#0000000#ffffff0|l|e| @69 +@57|1|2|6|,|1| @8|6|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump new file mode 100644 index 0000000000..c243859a68 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump @@ -0,0 +1,20 @@ +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|i|l|t|e|r|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|l+0#0000000&|i|s|t|a|b|l|e|:| |L|i|s|t|a|b|l|e|,| |P|r|e|d|i|c|a|t|e|:| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a +|-+0#0000e05#a8a8a8255| |b+0#0000000#ffffff0|l|e| @69 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @27 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|a|b|l|e| @39 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i+0#af5f00255&|f| +0#0000000&|P|r|e|d|i|c|a|t|e|(+0#e000e06&|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|T+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@35 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r|e|s|u|l|t| |=+0#af5f00255&| +0#0000000&|r|e|s|u|l|t|.|C|o|n|s|<+0#e000e06&|T+0#0000000&|>+0#e000e06&|(|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|T+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@20 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|i|f| +0#0000000&@59 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@46 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@60 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t|.|R|e|v|e|r|s|e|<+0#e000e06&|T+0#0000000&|>+0#e000e06&|(|)| +0#0000000&@42 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0@59| +0#0000000&@12 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)| +0#0000000&@52 +@57|1|4|2|,|5| @8|6|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump new file mode 100644 index 0000000000..4e41855706 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)| +0#0000000&@33 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@4 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|M|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&| +0#0000000&@29 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@20 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X| |=+0#af5f00255&@1| +0#0000000&|l|i|s|t|Y| @53 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X| @62 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X|.|R|e|v|e|r|s|e|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@44 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|.+0#af5f00255&|R+0#0000000&|e|v|e|r|s|e|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)| +0#0000000&@37 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|i|l|t|e|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|l+0#0000000&|i|s|t|X|,| |(+0#e000e06&|v+0#0000000&|a|l|u|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|v|a|l|u|e| |%+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|!+0#af5f00255&|=| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@11 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|p|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|l+0#0000000&|i|s|t|X|,| |(+0#e000e06&|v+0#0000000&|a|l|u|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|n+0#00e0e07&|r|2|c|h|a|r|(+0#e000e06&@1|v+0#0000000&|a|l|u|e| |++0#af5f00255&| +0#0000000&|6+0#e000002&|0|)+0#e000e06&|,+0#0000000&| +| +0#0000e05#a8a8a8255@1|1+0#e000002#ffffff0|)+0#e000e06&@1| +0#0000000&@69 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|4+0#e000002&| +0#0000000&|l|i|s|t|X|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|Y|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@42 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X| @62 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|Y| @62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|3|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@35 +@57|1|6|0|,|5| @8|7|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump new file mode 100644 index 0000000000..ffda6f920f --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|3|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@35 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|3|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|Y|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@35 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|3+0#e000002&| +0#0000000&|l|i|s|t|3|X|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|3|Y|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@40 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|3|X| @61 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|3|Y| @61 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|2|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|3|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|2|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|3|Y|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|2+0#e000002&| +0#0000000&|l|i|s|t|2|X|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|2|Y|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@40 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|2|X| @61 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|2|Y| @61 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|1|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|2|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|1|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|2|Y|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|l|i|s|t|1|X|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|1|Y|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@40 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|1|X| @61 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|1|Y| @61 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|1|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +@57|1|7@1|,|0|-|1| @6|8|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump new file mode 100644 index 0000000000..5a6e030712 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|1|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|1|Y|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|0+0#e000002&| +0#0000000&|l|i|s|t|0|X|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|0|Y|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@40 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|X| @61 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|Y| @61 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|X|_|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|0|X|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@33 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|Y|_|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|0|Y|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@33 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|0+0#e000002&| +0#0000000&|l|i|s|t|0|X|_|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|0|Y|_|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@38 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|X|_| @60 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|Y|_| @60 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|X|_@1|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|0|X|_|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@31 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|0|Y|_@1|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|0|Y|_|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@31 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|0+0#e000002&| +0#0000000&|l|i|s|t|0|X|_@1|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&|l|i|s|t|0|Y|_@1|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@36 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|X|_@1| @59 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|0|Y|_@1| @59 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|1|9|5|,|0|-|1| @6|9|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump new file mode 100644 index 0000000000..e4e65e3bf0 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|Z|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|M|a|k|e|L|i|s|t|<+0#e000e06&|L+0#0000000&|i|s|t|a|b|l|e|>+0#e000e06&|(|M+0#0000000&|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|-+0#af5f00255&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@8 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|Z@1|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|Z|.|C|o|n|s|<+0#e000e06&|L+0#0000000&|i|s|t|a|b|l|e|>+0#e000e06&|(|M+0#0000000&|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&@1| +0#0000000&@6 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|L+0#0000000&|i|s|t|a|b|l|e|>+0#e000e06&|(|M+0#0000000&|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@32 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|L+0#0000000&|i|s|t|a|b|l|e|>+0#e000e06&|(|M+0#0000000&|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&@1| +0#0000000&@32 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|L+0#0000000&|i|s|t|a|b|l|e|>+0#e000e06&|(|M+0#0000000&|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&@1| +0#0000000&@32 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|Z@1| @61 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|2|1|3|,|5| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump new file mode 100644 index 0000000000..ef792b5b3a --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|"| +0#0000000&@28 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|3|1|3|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|4|6@1|9|6|8|2|0| |(|A|l|i +| +0&#a8a8a8255@1|a+0&#ffffff0|k|s|e|i| |B|u|d|a|v|e|i|)| +0#0000000&@58 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |S|e@1| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|i|s@1|u|e|s|/|1|4|3@1|0|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|0|2|8|9|3|8|5|1|5| |.| +0#0000000&@1 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|S|e|t| @56 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|f+0#af5f00255&|i|n|a|l| +0#0000000&|_|e|l|e|m|e|n|t|s|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>| +0#0000000&@39 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|M|a|p@1|e|r|:| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@28 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@33 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@31 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |E| @2 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06& +|2+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump new file mode 100644 index 0000000000..d68c0a2ad3 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |E| @2 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06& +|2+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)| +0#0000000&@56 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@45 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(@1|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@12 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|a+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|a+0#0000000&|)+0#e000e06&| +0#0000000&@19 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@19 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @2 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@39|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&@2 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|e|l|e|m|e|n|t|s| @39 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|r+0#00e0e07&|e|d|u|c|e|(+0#e000e06&@2|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|d+0#0000000&|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>|,+0#0000000&| |v|:| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000& +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|{|[|F+0#0000000&|(+0#e000e06&|v+0#0000000&|)+0#e000e06&|]|:+0#0000000&| |1+0#e000002&|}+0#e000e06&|,+0#0000000&| |d|)+0#e000e06&@1|(|T+0#0000000&|o|S|t|r|i|n|g|e|r|)+0#e000e06&|,+0#0000000&| @20 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53 +@57|1|7|,|0|-|1| @8|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump new file mode 100644 index 0000000000..c9388ef44b --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r|)+0#e000e06&| +0#0000000&@25 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|T|o|S|t|r|i|n|g|e|r| @36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| @32 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|)+0#e000e06&|:+0#0000000&| |S|e|t| @28 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|e+0#0000000&|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r +|2+0#0000e05#a8a8a8255| |i+0#0000000#ffffff0|n|g|e|r|)+0#e000e06&| +0#0000000&@66 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|t|a|i|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|:| |E|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@35 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|(+0#e000e06&|e+0#0000000&|l|e|m|e|n|t|)+0#e000e06&@1| +0#0000000&@8 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|E|l|e|m|e|n|t|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&| +0#0000000&@42 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&|-+0#af5f00255&|>|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&| +0#0000000&@15 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +@57|3|5|,|0|-|1| @7|1|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump new file mode 100644 index 0000000000..84f58af60b --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@38 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&@29 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |⊇| |{|1|,| |2|}|.| +0#0000000&@47 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|p|e|r|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@39 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|>+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m +|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|@+0#4040ff13&@2 +| +0#0000000&@56|5|2|,|5| @9|2|8|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump new file mode 100644 index 0000000000..f0ef27db55 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m +|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#00e0e07&|h|i|s|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>#+0#0000e05&| |{|1|,| |2|}| |⊆| |{|1|,| |2|,| |3|}|.| +0#0000000&@47 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|b|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@41 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m +|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m +|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∪| |{|2|,| |3|,| |4|}| |=| |{|1|,| |2|,| |3|,| |4|}|.| +0#0000000&@29 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @43 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|{|}| +0#0000000&@35 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36 +@57|6|8|,|5| @9|3|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump new file mode 100644 index 0000000000..32901e8ee4 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∩| |{|2|,| |3|,| |4|}| |=| |{|2|,| |3|}|.| +0#0000000&@35 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n +|2+0#0000e05#a8a8a8255| |t+0#0000000#ffffff0|s| @70 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |\| |{|2|,| |3|,| |4|}| |=| |{|1|}|.| +0#0000000&@38 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|2|,| |3|,| |4|}| |\| |{|1|,| |2|,| |3|}| |=| |{|4|}|.| +0#0000000&@38 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @35 +@57|8|4|,|0|-|1| @7|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump new file mode 100644 index 0000000000..c613084a97 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump @@ -0,0 +1,20 @@ +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @35 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e +|2+0#0000e05#a8a8a8255| |n+0#0000000#ffffff0|t|s| @69 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15>-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |△| |{|2|,| |3|,| |4|}| |=| |{|1|,| |4|}|.| +0#0000000&@35 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|y|m@1|e|t|r|i|c|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @29 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@2 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0@59| +0#0000000&@12 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|T|o|S|t|r|:| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@12 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|F|r|o|m|S|t|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|2|n|r|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@10 +@57|1|0@1|,|3|-|1|7| @5|5|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump new file mode 100644 index 0000000000..8ce2d2becd --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|F|r|o|m|S|t|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|2|n|r|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@10 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|u|b|s|e|t|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@12 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@20 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|S+0#0000000&|u|b|s|e|t|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@9 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@20 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|u|p|e|r|s|e|t|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@7 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|u|p|e|r|s|e|t|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@10 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|U+0#0000000&|n|i|o|n|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@10 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|U+0#0000000&|n|i|o|n|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@10 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +@57|1@1|8|,|5| @8|7|0|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump new file mode 100644 index 0000000000..9e436a3740 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|I+0#0000000&|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@3 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|I+0#0000000&|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@3 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@2 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&@1| +0#0000000&@2 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|y|m@1|e|t|r|i|c|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t +| +0#0000e05#a8a8a8255@1|r+0#0000000#ffffff0|)+0#e000e06&@1| +0#0000000&@69 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +@57|1|3|6|,|5| @8|8|1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump new file mode 100644 index 0000000000..eadf090b10 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|2+0#e000002&|,+0#0000000&| |3+0#e000002&|,+0#0000000&| |4+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t|r|)+0#e000e06&| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|S+0#0000000&|y|m@1|e|t|r|i|c|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&|,+0#0000000&| |T|o|S|t|r|,| |F|r|o|m|S|t +| +0#0000e05#a8a8a8255@1|r+0#0000000#ffffff0|)+0#e000e06&@1| +0#0000000&@69 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|E+0#0000000&|l|e|m|e|n|t|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1>#+0&#ffffff0@59| +0#0000000&@12 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|n|o|n|e|:| |S|e|t| |=+0#af5f00255&| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)| +0#0000000&@40 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|n|o|n|e|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|n|o|n|e|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@55 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|n|o|n|e|.|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|n+0#0000000&|o|n|e|.|E|l|e|m|e|n|t|s|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&@39 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|s|e|t|s|:| |S|e|t| |=+0#af5f00255&| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|S+0#0000000&|e|t|>+0#e000e06&|(| +0#0000000&@33 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|[+0#e000e06&|S+0#0000000&|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)|,+0#0000000&| |S|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)|,+0#0000000&| |S|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)|,+0#0000000&| |S|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)|]|,+0#0000000&| @3 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|(+0#e000e06&|o+0#0000000&|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|o+0#0000000&|)+0#e000e06&|,+0#0000000&| @38 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|(+0#e000e06&|_+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |S|e|t| |=+0#af5f00255&|>| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&@33 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s|e|t|s|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s|e|t|s|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@55 +@57|1|5|2|,|1| @8|9|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump new file mode 100644 index 0000000000..b5c825be21 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s|e|t|s|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@55 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s|e|t|s|.|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|s+0#0000000&|e|t|s|.|E|l|e|m|e|n|t|s|<+0#e000e06&|S+0#0000000&|e|t|>+0#e000e06&|(|)@1| +0#0000000&@39 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|s|:| |S|e|t| |=+0#af5f00255&| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|l+0#00e0003&|i|s|t|<|a|n|y|>|>+0#e000e06&|(| +0#0000000&@26 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>[+0#e000e06&@4|]@4|,+0#0000000&| @57 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|(+0#e000e06&|o+0#0000000&|:| |l+0#00e0003&|i|s|t|<|a|n|y|>|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|o+0#0000000&|)+0#e000e06&|,+0#0000000&| @32 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|s|.|l+0#00e0e07&|e|n|(+0#e000e06&|)| +0#0000000&@56 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|s|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|s|.|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)| +0#0000000&@53 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|l+0#0000000&|i|s|t|s|.|E|l|e|m|e|n|t|s|<+0#e000e06&|l+0#00e0003&|i|s|t|<|a|n|y|>|>+0#e000e06&|(|)@1| +0#0000000&@32 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|7|0|,|5| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump new file mode 100644 index 0000000000..41fc359fd5 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |g|e|n|e|r|i|c| |f|u|n|c|t|i|o|n|s| +0#0000000&@48 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|"| +0#0000000&@28 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |:|h|e|l|p| |g|e|n|e|r|i|c|-|f|u|n|c|t|i|o|n|s| +0#0000000&@47 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|M|y|F|u|n|c|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |A+0#0000001#ffff4012|,+0#0000000#ffffff0| |B+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|p+0#0000000&|a|r|a|m|1|:| |T|)+0#e000e06&|:+0#0000000&| |T| @39 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|f|:| |A| @60 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|p|a|r|a|m|1| @54 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|x| @60 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|M+0#0000000#ffffff0|y|F|u|n|c|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|>+0#e000e06&|(|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|l|a|t@1|e|n|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|x+0#0000000&|:| |l+0#00e0003&|i|s|t|<|l|i|s|t|<|T+0#0000000&|>+0#00e0003&@1|)+0#e000e06&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|T+0#0000000&|>+0#00e0003&| +0#0000000&@31 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump new file mode 100644 index 0000000000..15d655b6a7 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|M+0#0000000#ffffff0|y|F|u|n|c|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|>+0#e000e06&|(|)| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| >d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|l|a|t@1|e|n|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|x+0#0000000&|:| |l+0#00e0003&|i|s|t|<|l|i|s|t|<|T+0#0000000&|>+0#00e0003&@1|)+0#e000e06&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|T+0#0000000&|>+0#00e0003&| +0#0000000&@31 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |l+0#00e0003&|i|s|t|<|T+0#0000000&|>+0#00e0003&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|]| +0#0000000&@44 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|f+0#af5f00255&|o|r| +0#0000000&|i|n@1|e|r| |i+0#af5f00255&|n| +0#0000000&|x| @54 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r|e|s|u|l|t| |++0#af5f00255&|=| +0#0000000&|i|n@1|e|r| @49 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@62 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t| @55 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|l|a|t@1|e|n|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[@1|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|3+0#e000002&|]+0#e000e06&@1|)| +0#0000000&@37 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|A| @65 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|<+0#e000e06&|X+0#0000001#ffff4012|,+0#0000000#ffffff0| |Y+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)| +0#0000000&@53 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +@57|1|9|,|1| @9|1|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump new file mode 100644 index 0000000000..e0029f6262 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|a| |=+0#af5f00255&| +0#0000000&|A|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0|.|F|o@1|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|)| +0#0000000&@49 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|M|a|k|e|E|c|h|o|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |T| @43 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|x+0#0000000&|:| |T|)+0#e000e06&|:+0#0000000&| |T| |=+0#af5f00255&|>| +0#0000000&|x| @47 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|E|c|h|o|N|u|m|b|e|r| |=+0#af5f00255&| +0#0000000&|M|a|k|e|E|c|h|o|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@37 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|E|c|h|o|N|u|m|b|e|r|(+0#e000e06&|1+0#e000002&|2|3|)+0#e000e06&| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|E|c|h|o|S|t|r|i|n|g| |=+0#af5f00255&| +0#0000000&|M|a|k|e|E|c|h|o|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|)| +0#0000000&@37 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|E|c|h|o|S|t|r|i|n|g|(+0#e000e06&|'+0#e000002&|a|b|c|'|)+0#e000e06&| +0#0000000&@50 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|F+0#0000001#ffff4012|I|X|M|E|:+0#e000e06#ffffff0| +0#0000e05&|a|d@1| |s|p|e|c|i|f|i|c| |c|o|m@1|a|n|d| |h|a|n|d|l|i|n|g| +0#0000000&@34 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |d|e|f|c|o|m|p|i|l|e| |M|y|F|u|n|c|<|n|u|m|b|e|r|,| |l|i|s|t|<|n|u|m|b|e|r|>|,| |d|i|c|t|<|s|t|r|i|n|g|>@1| +0#0000000&@17 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|3|7|,|0|-|1| @7|3|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump new file mode 100644 index 0000000000..e38ebf06bb --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |d|i|s|a|s@1|e|m|b|l|e| |M|y|F|u|n|c|<|s|t|r|i|n|g|,| |d|i|c|t|<|s|t|r|i|n|g|>@1| +0#0000000&@30 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |d|i|s|a|s@1|e|m|b|l|e| |M|y|F|u|n|c|<|n|u|m|b|e|r|,| |l|i|s|t|<|b|l|o|b|>@1| +0#0000000&@32 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1>#+0&#ffffff0| |f|u|n|c|r|e|f|s| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|B|a|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@51 +| +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|B+0#0000000&|a|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|)| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|b|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&| +0#0000000&@47 +| +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|b+0#0000000&|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|)| +0#0000000&@48 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|F|o@1| @63 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|a+0#0000000&|r|g|:| |T|)+0#e000e06&| +0#0000000&@47 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|c|h|o| +0#0000000&|a|r|g| @60 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|B|(+0#e000e06&|)| +0#0000000&@57 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39 +@57|5@1|,|1| @9|6|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump new file mode 100644 index 0000000000..791efc23c9 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump @@ -0,0 +1,20 @@ +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| >c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|B|a|r| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|F|o@1| @51 +|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|C|(+0#e000e06&|)| +0#0000000&@57 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@38 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59 +|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7@1|2@1|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|7|5@1|3|1|0|5|2| +0#0000000&@2 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|I|d|<+0#e000e06&|U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|U+0#0000000&|)+0#00e0003&|:+0#0000000&| |U| @42 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|X+0#0000000&|_|:| |U|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|X|_| @48 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|7|3|,|1| @9|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump new file mode 100644 index 0000000000..a804b2f192 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump @@ -0,0 +1,20 @@ +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|t|<+0#e000e06&|U+0#0000001#ffff4012|,+0#0000000#ffffff0| |V+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|U+0#0000000&|)+0#00e0003&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|V+0#0000000&|)+0#00e0003&|:+0#0000000&| |U| @27 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|X+0#0000000&|_|:| |U|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |V|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|X|_| @38 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|-+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|l|i|p|<+0#e000e06&|U+0#0000001#ffff4012|,+0#0000000#ffffff0| |V+0#0000001#ffff4012|,+0#0000000#ffffff0| |W+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|f|u|n|c|(|U+0#0000000&|)+0#00e0003&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|V+0#0000000&|)+0#00e0003&|:+0#0000000&| |W|)+0#00e0003&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|V+0#0000000&|)+0#00e0003&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|U+0#0000000&|)+0#00e0003&|:+0#0000000&| +|-+0#0000e05#a8a8a8255| |W+0#0000000#ffffff0| @71 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|F+0#0000000&|_|:| |f+0#00e0003&|u|n|c|(|U+0#0000000&|)+0#00e0003&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|V+0#0000000&|)+0#00e0003&|:+0#0000000&| |W|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|Y+0#0000000&|_|:| |V|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|X+0#0000000&|_|:| |U|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|F|_|(+0#e000e06&|X+0#0000000&|_|)+0#e000e06&|(|Y+0#0000000&|_|)+0#e000e06&| +0#0000000& +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|n|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |a+0#00e0003&|n|y|>+0#e000e06&|(|)|(|2+0#e000002&|)+0#e000e06&|(|n+0#e000002&|u|l@1|)+0#e000e06&| +0#0000000&@38 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|=+0#af5f00255&@1| +0#0000000&|F|l|i|p|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |a+0#00e0003&|n|y|,+0#0000000&| |n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)|(|C+0#0000000&|o|n|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |a+0#00e0003&|n|y|>+0#e000e06&|(|)@1|(|n+0#e000002&|u|l@1|)+0#e000e06&|(|2+0#e000002&|)+0#e000e06&| +0#0000000&@7 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|9|1|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_00.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim9_lambda_00.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_00.dump index 6f552c2e7d..3f189294a2 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump @@ -1,10 +1,9 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@49 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|L|a|m|b|d|a|O|p|e|r|a|t|o|r| |T|o|d|o| +0#0000000&@26 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|L|a|m|b|d|a|P|a|r|e|n| |T|o|d|o| +0#0000000&@29 @75 @75 -|#+0#0000e05&| |V|i|m| |9| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@48 -@75 |v+0#af5f00255&|a|r| +0#0000000&|F+0#00e0e07&|o@1|:+0#0000000&| |f+0#00e0003&|u|n|c| +0#0000000&@61 |v+0#af5f00255&|a|r| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@62 @75 @@ -17,4 +16,5 @@ |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51 +@75 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_01.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump similarity index 90% rename from runtime/syntax/testdir/dumps/vim9_lambda_01.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_01.dump index 2006c63734..4481e4774a 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump @@ -1,10 +1,9 @@ -|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57 -|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57 +|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51 ->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51 -@75 +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51 +> @74 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49 @@ -17,4 +16,5 @@ |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@38 @75 |#+0#0000e05&| |w|i|t|h| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@56 -@57|1|9|,|1| @10|9|%| +@75 +@57|1|9|,|0|-|1| @8|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_02.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump similarity index 89% rename from runtime/syntax/testdir/dumps/vim9_lambda_02.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_02.dump index 3c231f2ac9..d3016acb91 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_02.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump @@ -1,10 +1,9 @@ -|#+0#0000e05#ffffff0| |w|i|t|h| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@56 -@75 +| +0&#ffffff0@74 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@50 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49 -> @74 -|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@46 +@75 +>F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@46 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43 @75 @@ -17,4 +16,5 @@ |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@21 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@21 @75 -@57|3|7|,|0|-|1| @7|2|1|%| +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30 +@57|3|7|,|1| @9|2|1|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_03.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump similarity index 81% rename from runtime/syntax/testdir/dumps/vim9_lambda_03.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_03.dump index 63681bca4b..93d206708c 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_03.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@74 -|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30 +|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30 @75 |#+0#0000e05&| |w|i|t|h| |c|o|m|p|o|u|n|d| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@47 @75 ->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@44 -|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43 +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@44 +>F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@40 @@ -17,4 +16,5 @@ |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@35 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@26 +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15 @57|5@1|,|1| @9|3|4|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_04.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump similarity index 67% rename from runtime/syntax/testdir/dumps/vim9_lambda_04.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_04.dump index d0d3af8cce..63ed50fe01 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_04.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump @@ -1,11 +1,10 @@ -|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@26 -|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15 +|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@24 -> @74 @75 -|#+0#0000e05&| |p|o|s|t| |o|p|e|r|a|t|o|r| |c|o|m@1|e|n|t|s| +0#0000000&@50 +> @74 +|#+0#0000e05&| |P|o|s|t|-|o|p|e|r|a|t|o|r| |c|o|m@1|e|n|t|s| +0#0000000&@50 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 @2|e+0#00e0e07&|x|p|r| +0#0000000&@68 @@ -17,4 +16,5 @@ @2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63 @75 @2|e+0#00e0e07&|x|p|r| +0#0000000&@68 -@57|7|3|,|0|-|1| @7|4|6|%| +@75 +@57|7|3|,|0|-|1| @7|4|7|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_05.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump similarity index 85% rename from runtime/syntax/testdir/dumps/vim9_lambda_05.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_05.dump index 946ab590af..73e0237f4c 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_05.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@1|e+0#00e0e07&|x|p|r| +0#0000000&@68 +| +0&#ffffff0@74 @75 +|#+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 @75 -|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 -@75 ->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 -@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 +@6>\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@50 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 @@ -17,4 +16,5 @@ @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@42 @75 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 -@57|9|1|,|1| @9|5|9|%| +@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 +@57|9|1|,|7| @9|5|9|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_06.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump similarity index 70% rename from runtime/syntax/testdir/dumps/vim9_lambda_06.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_06.dump index 91109d6943..fc7f19b874 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_06.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump @@ -1,15 +1,14 @@ -|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 -@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50 @6|\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@59 @75 ->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 -@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 +|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57 +@6>\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| @57 @6|\+0#e000e06&| +0#0000000&|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@52 @75 @75 -|#+0#0000e05&| |f|u|n|c|r|e|f| |c|a|l@1| +0#0000000&@60 +|#+0#0000e05&| |F|u|n|c|r|e|f| |c|a|l@1| +0#0000000&@60 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|(+0#0000001#ffff4012|)| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|4+0#e000002&|2|)+0#e000e06&|(|)| +0#0000000&@57 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|4+0#e000002&|2|)+0#e000e06&|(|"+0#e000002&|f|o@1|"|)+0#e000e06&| +0#0000000&@35 @@ -17,4 +16,5 @@ @75 |#+0#0000e05&| |:|h|e|l|p| |v|i|m|9|-|l|a|m|b|d|a| +0#0000000&@55 @75 -@57|1|0|9|,|1| @8|7|2|%| +|v+0#af5f00255&|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54 +@57|1|0|9|,|7| @8|7|2|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_07.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump similarity index 80% rename from runtime/syntax/testdir/dumps/vim9_lambda_07.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_07.dump index 066cfdefb7..6b6e43d7d3 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_07.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@74 -|v+0#af5f00255&|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54 +|v+0#af5f00255#ffffff0|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0@47 @16|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@52 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| @53 -@6>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0@64 -@6|\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0@64 +@6>\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@57 @75 |v+0#af5f00255&|a|r| +0#0000000&|C+0#00e0e07&|a|l@1|b|a|c|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|_+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|'+0#e000002&|a|n|y|t|h|i|n|g|'| +0#0000000&@39 |e+0#af5f00255&|c|h|o| +0#0000000&|C|a|l@1|b|a|c|k|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|)+0#e000e06&| +0#0000000&@1|#| |d+0#00e0e07&|i|s|p|l|a|y|s| +0#0000000&|"+0#e000002&|a|n|y|t|h|i|n|g|"| +0#0000000&@29 @@ -17,4 +16,5 @@ |v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@61 |v+0#af5f00255&|a|r| +0#0000000&|t+0#00e0e07&|i|m|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|i|m|e|r|_|s|t|a|r|t|(+0#e000e06&|5+0#e000002&|0@1|,+0#0000000&| |(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@37 @8| +0#00e0e07&|c|o|u|n|t| +0#0000000&|++0#af5f00255&|=| +0#0000000&|1+0#e000002&| +0#0000000&@55 -@57|1|2|7|,|7| @8|8|4|%| +@9|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33 +@57|1|2|7|,|7| @8|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_08.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump similarity index 78% rename from runtime/syntax/testdir/dumps/vim9_lambda_08.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_08.dump index 88f739a8be..10fad7f49f 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_08.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@7| +0#00e0e07&|c|o|u|n|t| +0#0000000&|++0#af5f00255&|=| +0#0000000&|1+0#e000002&| +0#0000000&@55 -@9|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33 +| +0&#ffffff0@8|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33 @5|}+0#e000e06&|,+0#0000000&| |{+0#e000e06&|r+0#00e0e07&|e|p|e|a|t|:+0#0000000&| |3+0#e000002&|}+0#e000e06&|)| +0#0000000&@54 @75 |v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&|i|c|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@61 ->v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|d+0#00e0e07&|i|c|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@34 -@5|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|v|a|l|u|e|'| +0#0000000&@55 +|v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|d+0#00e0e07&|i|c|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@34 +@5>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|v|a|l|u|e|'| +0#0000000&@55 @3|}+0#e000e06&|)| +0#0000000&@69 @75 @75 @@ -17,4 +16,5 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&|#+0#0000e05&@22| |^| |v|i|m|C|o|m@1|a|n|d|?| +0#0000000&@30 @75 @75 -@57|1|4|5|,|1| @8|9|6|%| +|#+0#0000e05&| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|@+0#4040ff13&@2 +| +0#0000000&@56|1|4|5|,|6| @8|9|6|%| diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_09.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump similarity index 67% rename from runtime/syntax/testdir/dumps/vim9_lambda_09.dump rename to runtime/syntax/testdir/dumps/vim9_lambdas_09.dump index ea5823d2a0..3dbfd3cefa 100644 --- a/runtime/syntax/testdir/dumps/vim9_lambda_09.dump +++ b/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump @@ -1,10 +1,9 @@ -| +0&#ffffff0@74 -|#+0#0000e05&| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|a|l|s +|#+0#0000e05#ffffff0| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|a|l|s |e| |k|e|y|w|o|r|d|)| +0#0000000&@64 @75 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&| +0#0000000&|t+0#00e0e07&|i|m|e|r|_|s|t|a|r|t|(+0#e000e06&|0+0#e000002&|,+0#0000000&| |(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|f|#|a|(+0#e000e06&|f+0#e000002&|a|l|s|e|,+0#0000000&| |f+0#e000002&|a|l|s|e|)+0#e000e06&@1| +0#0000000&@16 ->a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67 -@75 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67 +> @74 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -17,4 +16,5 @@ |~| @73 |~| @73 |~| @73 -| +0#0000000&@56|1|6|1|,|1| @8|B|o|t| +|~| @73 +| +0#0000000&@56|1|6|1|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump index f9896e2a11..f01edc18fb 100644 --- a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump @@ -1,4 +1,7 @@ ->"+0#0000e05#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@65 +>"+0#0000e05#ffffff0| |V|i|m|9| |l|e|g|a|c|y| |s|c|r|i|p|t| |h|e|a|d|e|r| +0#0000000&@47 +@75 +@75 +|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65 @75 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@53 @2|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@58 @@ -14,7 +17,4 @@ @75 @1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31 @1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|,|1| @10|A|l@1| +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump new file mode 100644 index 0000000000..8c1c39c25d --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump @@ -0,0 +1,20 @@ +|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@56 +@75 +|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65 +@75 +@1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31 +@1>"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|9|,|2| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump index fe8e737ae8..89b32ceae0 100644 --- a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump @@ -1,20 +1,20 @@ ->++0#0000e05#a8a8a8255|-@1| |1@1| |l|i|n|e|s|:| |"| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"|H|"| ||| |s|e|t| |f|d|m|=|s|y|n|t|a|x|- -|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@56 -@75 -|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65 -@75 -@1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31 -@1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|,|1| @10|A|l@1| +|-+0#0000e05#a8a8a8255| >"+0&#ffffff0| |V|i|m|9| |l|e|g|a|c|y| |s|c|r|i|p|t| |h|e|a|d|e|r| +0#0000000&@45 +||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|H|"| +0#0000000&@29 +||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@51 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@56 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|s+0#af5f00255&|o|u|r|c|e| +0#0000000&|f|o@1|.+0#af5f00255&|v+0#0000000&|i|m| @56 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@64 +||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|f| +0#0000000&@67 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump new file mode 100644 index 0000000000..55ff243559 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump @@ -0,0 +1,20 @@ +||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63 +||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63 +| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@29 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@55 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump similarity index 91% rename from runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump rename to runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump index 191b9f22d6..ee6f101a54 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump @@ -1,8 +1,8 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 -|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53 +|#+0#0000e05&| |V|i|m|9| |n|o| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@49 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|f|a|l|s|e| +0#0000000&@19 @75 +@75 |#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@55 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump similarity index 80% rename from runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump rename to runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump index 2613567a75..7ee5d5b85b 100644 --- a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump @@ -7,14 +7,14 @@ |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 @2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 +@75 +|{+0#e000e06&| +0#0000000&@73 +@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 +|}+0#e000e06&| +0#0000000&@73 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_shebang_00.dump b/runtime/syntax/testdir/dumps/vim9_shebang_00.dump index 3f2818c8ee..c4f6f80902 100644 --- a/runtime/syntax/testdir/dumps/vim9_shebang_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_shebang_00.dump @@ -1,10 +1,11 @@ >#+0#e000e06#ffffff0|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53 |v+0#af5f00255&|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m|9| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@55 @75 -|#+0#0000e05&| |V|i|m| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@56 @75 |#+0#0000e05&| |j|u|s|t| |a| |l|i|n|e| |c|o|m@1|e|n|t| +0#0000000&@53 |#+0#0000e05&|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump index 054bba1472..8a7d4edd94 100644 --- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump @@ -1,5 +1,5 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 +|#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|4|7|6|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|3|8|1|9|1@2|0| +0#0000000&@6 diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump index 7f5ddfd2a4..aada2bbb4f 100644 --- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump @@ -1,5 +1,5 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 +|#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|4|7|6|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|3|5|1@1|9|4|7|8| +0#0000000&@6 diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump index f62ef1e7e2..ea8eaecb47 100644 --- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump @@ -1,9 +1,9 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35 @75 +@75 |d+0#af5f00255&|e|f| +0#0000000&|E|c|h|o|(+0#e000e06&|.+0#0000000&@2|a+0#00e0e07&|r|g|s|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>|)+0#e000e06&| +0#0000000&@46 @2|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|r|g|s| +0#0000000&@63 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 diff --git a/runtime/syntax/testdir/dumps/vim9_tuple_00.dump b/runtime/syntax/testdir/dumps/vim9_tuples_00.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim9_tuple_00.dump rename to runtime/syntax/testdir/dumps/vim9_tuples_00.dump index 7f44593136..4467a67bbe 100644 --- a/runtime/syntax/testdir/dumps/vim9_tuple_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_tuples_00.dump @@ -1,5 +1,4 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |t|u|p|l|e|s| +0#0000000&@61 @75 @75 @@ -17,4 +16,5 @@ @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|{|e+0#0000000&|1|_|,| |e|2|_| |-+0#af5f00255&|>| +0#0000000&|{+0#e000e06&|-+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|}@1|(|a+0#00e0e07&|:|e+0#0000000&|1|,| |a+0#00e0e07&|:|e+0#0000000&|2|)+0#e000e06&@1| +0#0000000&@20 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 +|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim9_tuple_01.dump b/runtime/syntax/testdir/dumps/vim9_tuples_01.dump similarity index 92% rename from runtime/syntax/testdir/dumps/vim9_tuple_01.dump rename to runtime/syntax/testdir/dumps/vim9_tuples_01.dump index 0ce9c3a8cf..0499393c99 100644 --- a/runtime/syntax/testdir/dumps/vim9_tuple_01.dump +++ b/runtime/syntax/testdir/dumps/vim9_tuples_01.dump @@ -1,10 +1,9 @@ -|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68 -@75 +| +0&#ffffff0@74 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|L|e|g|a|c|y|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|,| |e|2|)+0#e000e06&| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@33 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|{|e+0#0000000&|1|_|,| |e|2|_| |-+0#af5f00255&|>| +0#0000000&|{+0#e000e06&|-+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|}@1|(|a+0#00e0e07&|:|e+0#0000000&|1|,| |a+0#00e0e07&|:|e+0#0000000&|2|)+0#e000e06&@1| +0#0000000&@20 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 -> @74 -|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21 +@75 +>d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@2|e+0#0000000&|1|_|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|_|:| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|)|(|e+0#0000000&|1|,| |e|2|)+0#e000e06&@1| +0#0000000&@11 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 @@ -17,4 +16,5 @@ |~| @73 |~| @73 |~| @73 -| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| +|~| @73 +| +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim9_variables_00.dump b/runtime/syntax/testdir/dumps/vim9_variables_00.dump index cd9f976c81..fea017b492 100644 --- a/runtime/syntax/testdir/dumps/vim9_variables_00.dump +++ b/runtime/syntax/testdir/dumps/vim9_variables_00.dump @@ -1,7 +1,7 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 -@75 |#+0#0000e05&| |V|i|m|9| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@46 @75 +@75 |#+0#0000e05&| |D|e|c|l|a|r|a|t|i|o|n|s| +0#0000000&@60 @75 |v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump similarity index 92% rename from runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump rename to runtime/syntax/testdir/dumps/vim_comment_strings_00.dump index df6e06c0ec..7a1f9cbd6b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump +++ b/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump @@ -1,6 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|t|r|u|e| +0#0000000&@20 @75 +@75 |"+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@55 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 @@ -16,5 +17,4 @@ |}+0#e000e06&| +0#0000000&@73 @75 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 -@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump similarity index 56% rename from runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump rename to runtime/syntax/testdir/dumps/vim_comment_strings_01.dump index deebf69613..c44edc9b3e 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump +++ b/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump @@ -1,10 +1,12 @@ -|c+0#af5f00255#ffffff0|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61 +| +0&#ffffff0@74 +|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61 @2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 -@2>#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 +>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 +@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|9|,|3| @9|B|o|t| +| +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_comment_00.dump b/runtime/syntax/testdir/dumps/vim_comments_00.dump similarity index 91% rename from runtime/syntax/testdir/dumps/vim_comment_00.dump rename to runtime/syntax/testdir/dumps/vim_comments_00.dump index da4f490f4c..5e6b5a2f0f 100644 --- a/runtime/syntax/testdir/dumps/vim_comment_00.dump +++ b/runtime/syntax/testdir/dumps/vim_comments_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t|s| +0#0000000&@60 @75 +@75 |"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 @75 |#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@60 @@ -16,5 +17,4 @@ @75 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|1+0#00e0003&| +0#0000000&|F|o@1|C|o|m@1|a|n|d| |{+0#e000e06&| +0#0000000&@45 @2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 -@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_comment_01.dump b/runtime/syntax/testdir/dumps/vim_comments_01.dump similarity index 70% rename from runtime/syntax/testdir/dumps/vim_comment_01.dump rename to runtime/syntax/testdir/dumps/vim_comments_01.dump index 4b8a47f2f2..c439d335b9 100644 --- a/runtime/syntax/testdir/dumps/vim_comment_01.dump +++ b/runtime/syntax/testdir/dumps/vim_comments_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 +| +0&#ffffff0@1|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 +@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|1+0#00e0003&| +0#0000000&|F|o@1|C|o|m@1|a|n|d| |{+0#e000e06&| +0#0000000&@45 -@2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 -@2>"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 +@2>#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 +@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 |}+0#e000e06&| +0#0000000&@73 @75 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 @@ -16,5 +17,4 @@ @75 |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65 | +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 -| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 -@57|1|9|,|3| @9|2|4|%| +@57|1|9|,|3| @9|2|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_comment_02.dump b/runtime/syntax/testdir/dumps/vim_comments_02.dump similarity index 89% rename from runtime/syntax/testdir/dumps/vim_comment_02.dump rename to runtime/syntax/testdir/dumps/vim_comments_02.dump index e1411ebe7c..ee568be945 100644 --- a/runtime/syntax/testdir/dumps/vim_comment_02.dump +++ b/runtime/syntax/testdir/dumps/vim_comments_02.dump @@ -1,9 +1,10 @@ | +0#0000e05#ffffff0@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 +| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 @75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@2|e|n|t| +0#0000000&@51 | +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 -| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 -> @74 +| +0#0000e05&@1>\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52 +@75 |"+0#0000e05&| |:|F|o@1| +0#0000000&@68 | +0#0000e05&@5|\| |a|r|g|1| +0#0000000&@62 | +0#0000e05&@5|"|\| |c|o|m@1|e|n|t| +0#0000000&@58 @@ -16,5 +17,4 @@ @75 |:|F|o@1| @70 @6|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40 -@6|\+0#e000e06&| +0#0000000&|a|r|g|1| @62 -@57|3|7|,|0|-|1| @7|5|8|%| +@57|3|7|,|3| @9|5|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_comment_03.dump b/runtime/syntax/testdir/dumps/vim_comments_03.dump similarity index 82% rename from runtime/syntax/testdir/dumps/vim_comment_03.dump rename to runtime/syntax/testdir/dumps/vim_comments_03.dump index a5886861de..2ceb8d6b34 100644 --- a/runtime/syntax/testdir/dumps/vim_comment_03.dump +++ b/runtime/syntax/testdir/dumps/vim_comments_03.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|a|r|g|1| @62 +| +0&#ffffff0@5|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40 +@6|\+0#e000e06&| +0#0000000&|a|r|g|1| @62 @6|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40 @6|\+0#e000e06&| +0#0000000&|a|r|g|2| @62 @75 -@75 ->"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|3|0|4|7| +0#0000000&@59 +> @74 +|"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|3|0|4|7| +0#0000000&@59 @75 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|x|i|s|t|s|(+0#e000e06&|"+0#e000002&|:|D|i|f@1|O|r|i|g|"|)+0#e000e06&| +0#0000000&@51 @2|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|D|i|f@1|O|r|i|g| |v+0#af5f00255&|e|r|t| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&||| |s+0#af5f00255&|e|t| +0#0000000&|b+0#e000e06&|t|=+0#af5f00255&|n+0#0000000&|o|f|i|l|e| ||| |r+0#af5f00255&| +0#0000000&|++0#af5f00255&@1|e+0#00e0e07&|d|i|t| +0#0000000&|#| ||| |0+0#e000002&|d+0#0000000&|_| ||| |d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@1 @@ -16,5 +17,4 @@ |"+0#0000e05&| |T|h|i|s| |i|s| |w|h|a|t| |w|e| |c|a|l@1| |"| |b|l|a|h| +0#0000000&@45 @75 @75 -|"+0#0000e05&| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59 -@57|5@1|,|1| @9|9|2|%| +@57|5@1|,|0|-|1| @7|8|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_comment_04.dump b/runtime/syntax/testdir/dumps/vim_comments_04.dump similarity index 73% rename from runtime/syntax/testdir/dumps/vim_comment_04.dump rename to runtime/syntax/testdir/dumps/vim_comments_04.dump index 4e144d400e..645d45b642 100644 --- a/runtime/syntax/testdir/dumps/vim_comment_04.dump +++ b/runtime/syntax/testdir/dumps/vim_comments_04.dump @@ -1,8 +1,10 @@ -|"+0#0000e05#ffffff0| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59 +| +0&#ffffff0@74 +|"+0#0000e05&| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59 @75 |d+0#af5f00255&|e|f| +0#0000000&|C|o|m@1|e|n|t|T|i|t|l|e|(+0#e000e06&|)| +0#0000000&@56 @2|#+0#0000e05&| +0#0000000&|T+0#e000e06&|i|t|l|e|:| +0#0000e05&|.@2| +0#0000000&@60 >e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|7|2|,|1| @9|B|o|t| +| +0#0000000&@56|7|3|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump index 5224a4f6e5..dbcca1edc2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump @@ -1,20 +1,20 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|a|b@1|r|e|v|i|a|t|e| |c|o|m@1|a|n|d|s| +0#0000000&@48 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|L|h|s| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@29 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|R|h|s| |T|o|d|o| +0#0000000&@35 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|R|h|s|C|o|n|t|i|n|u|e| |T|o|d|o| +0#0000000&@27 @75 -|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @48 -|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @45 -|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @45 @75 -|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @41 -|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @38 -|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @38 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@48 +|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&|c+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@45 +|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&|i+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@45 @75 -|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @44 -|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @41 -|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @41 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@41 +|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&|c+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@38 +|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&|i+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@38 @75 -|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @41 -|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @38 -|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @38 +|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@44 +|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&|c+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@41 +|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&|i+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@41 @75 -|u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| @53 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@41 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump index 10de160dd0..335408834f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @41 -|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @38 -|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @38 +|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@44 +|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&|c+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@41 +|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&|i+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@41 @75 ->u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| @53 -|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| @51 -|i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| @51 +>a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|f+0#0000001#ffff4012|o@1|b|a|r| +0#0000000#ffffff0@41 +|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&|c+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@38 +|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&|i+0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@38 +@75 +|u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@53 +|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c+0#00e0e07&|f|o@1| +0#0000000&@51 +|i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i+0#00e0e07&|f|o@1| +0#0000000&@51 @75 |a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@58 |c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@57 |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@57 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|9|,|1| @9|B|o|t| +@75 +@75 +|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59 +@57|1|9|,|1| @9|3|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump new file mode 100644 index 0000000000..c13bcbd29d --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump @@ -0,0 +1,20 @@ +|"+0#0000e05#ffffff0| |M|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59 +@75 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0| +0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@60 +@75 +>a+0#af5f00255&|b@1|r|e|v| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0| +0#0000000&@67 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0| +0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@60 +@75 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 +| +0#0000001#ffff4012@5|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0| +0#0000001#ffff4012|f|o@1|b|a|r| +0#0000000#ffffff0@60 +@75 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64 +| +0#0000001#ffff4012@5|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0| +0#0000001#ffff4012|f|o@1| +0#0000000#ffffff0@63 +| +0#0000001#ffff4012@5|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#0000001#ffff4012@5|\+0#e000e06#ffffff0|b+0#0000001#ffff4012|a|r| +0#0000000#ffffff0@64 +@75 +@57|3|7|,|1| @9|8@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump new file mode 100644 index 0000000000..c364e75539 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@74 +|a+0#af5f00255&|b@1|r|e|v| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&@64 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| |(|m|a|t|c|h|e|s| |a|s| |R|H|S| |b|u|t| |h|a|r|m|l|e|s@1|)| +0#0000000&@32 +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|c|l|e|a|r|"| +0#0000000&@62 +> @74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|5|4|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump b/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump index 4ac5e2f6c8..1435c62f7e 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump @@ -1,7 +1,7 @@ | +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |V|i|m| |:|a|u|g|r|o|u|p| |c|o|m@1|a|n|d| +0#0000000&@50 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|a|"| +0#0000000&@29 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|A|u|g|r|o|u|p|N|a|m|e| |T|o|d|o| +0#0000000&@21 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|A|u|g|r|o|u|p|N|a|m|e| |T|o|d|o| +0#0000000&@28 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|u|g|r|o|u|p| +0#0000000&|f+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@61 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump index b8c3b0ea63..82090d4caf 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump @@ -1,20 +1,20 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|a|u|t|o|c|m|d| |c|o|m@1|a|n|d| +0#0000000&@52 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |v|i|m|A|u|t|o|C|m|d|G|r|o|u|p| |T|o|d|o| +0#0000000&@27 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |v|i|m|U|s|e|r|A|u|t|o|E|v|e|n|t| |T|i|t|l|e| +0#0000000&@25 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|A|u|t|o|C|m|d|G|r|o|u|p| |T|o|d|o| +0#0000000&@29 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|A|u|t|o|E|v|e|n|t| |T|i|t|l|e| +0#0000000&@27 @75 @75 |"+0#0000e05&| |D|e|f|i|n|e| +0#0000000&@66 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump index 61ef015d6d..4b2480bb84 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump @@ -1,20 +1,20 @@ |a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& >a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000& @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2 | +0#0000000&@56|1|9|,|1| @10|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump index 7738837b4f..7af6098a79 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump @@ -1,8 +1,8 @@ -|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 +|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|4|2|>| +0#0000000&@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|4|2|>| +0#0000000&@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 >a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 @@ -16,5 +16,5 @@ |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2 | +0#0000000&@56|3|1|,|1| @9|1|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump index 17bd350ade..c669cbb921 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump @@ -1,7 +1,7 @@ -|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 +|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|f|<|b|u|f@1|e|r|>|o@1| @2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|f|<|b|u|f@1|e|r|>|o@1| @2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60 > @74 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@51 @@ -12,9 +12,9 @@ @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62 |}+0#e000e06&| +0#0000000&@73 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| |{+0#e000e06&| +0#0000000&@51 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&|{+0#e000e06&| +0#0000000&@51 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62 |}+0#e000e06&| +0#0000000&@73 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42 @57|4|0|,|0|-|1| @7|1|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump index 7a82ab288b..4f18da29ed 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump @@ -1,4 +1,4 @@ -|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42 +|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62 |}+0#e000e06&| +0#0000000&@73 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump index ce00fb28d8..1823bf05e2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump @@ -11,7 +11,7 @@ @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @53 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@53 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump index 42eebd163b..4c03fefed1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @44 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @44 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54 @6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump index 220055b363..ca3c695175 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump @@ -9,12 +9,12 @@ @75 |"+0#0000e05&| |R|e|m|o|v|e| +0#0000000&@66 @75 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a |r|"| +0#0000000&@72 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a |r|"| +0#0000000&@72 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a |r|"| +0#0000000&@72 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a |r|"| +0#0000000&@72 @57|1@1|2|,|1| @8|4|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump index 7e936c5843..59d0a40a9a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump @@ -1,20 +1,20 @@ -|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a +|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a |r|"| +0#0000000&@72 @75 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37 ->a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43 +>a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43 @75 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49 @75 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43 @75 -|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| @57 +|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@57 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@66 @75 @57|1|2|5|,|1| @8|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump index d7ef69673b..8efefee3aa 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump @@ -1,12 +1,12 @@ | +0&#ffffff0@74 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p| |"+0#e000002&|!|f|o@1|g|r|o|u|p|!|"| +0#0000000&@35 -|a+0#af5f00255&|u|t|o|c|m|d|!|!+0#0000000&|f|o@1|g|r|o|u|p|!| @56 +|a+0#af5f00255&|u|t|o|c|m|d|!|!+0#0000001#ffff4012|f|o@1|g|r|o|u|p|!| +0#0000000#ffffff0@56 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p| |"+0#e000002&|f|o@1|g|r|o|u|p|"| +0#0000000&@37 -|a+0#af5f00255&|u|t|o|c|m|d|!|f+0#0000000&|o@1|g|r|o|u|p| @58 +|a+0#af5f00255&|u|t|o|c|m|d|!|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@58 >"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |e|v|e|n|t| +0#0000000&@48 |a+0#af5f00255&|u|t|o|c|m|d|!|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@59 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |u|s|e|r| |e|v|e|n|t| +0#0000000&@43 -|a+0#af5f00255&|u|t|o|c|m|d|!|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @53 +|a+0#af5f00255&|u|t|o|c|m|d|!|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@53 @75 |"+0#0000e05&| +0#0000000&|F+0#0000001#ffff4012|I|X|M|E|:+0#e000e06#ffffff0| +0#0000e05&|"|*|"| |a|n|d| |"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|a|r|e| |v|a|l|i|d| |g|r|o|u|p| |n|a|m|e|s|,| |h|o|w|e|v|e|r|,| |:|h|e|l|p| |:|a|u|g|r|o|u|p| +0#0000000&@1 |"+0#0000e05&| |e|x|p|l|i|c|i|t|l|y| |d|i|r|e|c|t|s| |t|h|e| |u|s|e|r| |N|O|T| |t|o| |s|h|a|d|o|w| |e|v|e|n|t| |n|a|m|e|s| +0#0000000&@19 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump index 9765796456..b35de96498 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump @@ -1,17 +1,17 @@ |"+0#0000e05#ffffff0| |L|i|s|t| +0#0000000&@68 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38 @75 ->a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50 +>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @44 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @44 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@44 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@44 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| @58 +|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@58 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67 @75 @75 diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump index a8b594c25f..6a71d9d049 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump @@ -2,19 +2,19 @@ |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@57 @75 |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48 >d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44 @75 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29 @75 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @51 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @38 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@51 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@42 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@38 @75 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@29 @75 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 -|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 +|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19 @75 @75 @57|1|7|9|,|1| @8|7|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump index b4513f1074..971dc181e6 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump @@ -4,17 +4,17 @@ |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@57 @75 >d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48 |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44 @75 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29 @75 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @51 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @42 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @38 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@51 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@42 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@42 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@38 @75 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@29 @75 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 @57|1|9|7|,|1| @8|8|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump index 130476ff4c..1d2ecbfaf5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump @@ -1,8 +1,8 @@ -|d+0#af5f00255#ffffff0|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 -|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@17 +|d+0#af5f00255#ffffff0|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16 +|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@17 @75 @75 -|"+0#0000e05&| |p|a|t@1|e|r|n|s| +0#0000000&@64 +|"+0#0000e05&| |P|a|t@1|e|r|n|s| +0#0000000&@64 > @74 |a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @56 @75 diff --git a/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump b/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump index b3c57de6f3..3b90d8c963 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump @@ -1,10 +1,12 @@ ->"+0#0000e05#ffffff0| |V|i|m| |b|e|h|a|v|e| |c|o|m@1|a|n|d| +0#0000000&@54 +>"+0#0000e05#ffffff0| |V|i|m| |:|b|e|h|a|v|e| |c|o|m@1|a|n|d| +0#0000000&@53 +@75 @75 |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@62 |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@62 @75 |b+0#af5f00255&|e|h|a|v|e|!| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@61 |b+0#af5f00255&|e|h|a|v|e|!| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@61 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_00.dump b/runtime/syntax/testdir/dumps/vim_ex_call_00.dump index 117f159dde..13fdb02e2c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_call_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_call_00.dump @@ -1,7 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|c|a|l@1| |c|o|m@1|a|n|d| +0#0000000&@55 @75 @75 -|"+0#0000e05&| |f|u|n|c|t|i|o|n|s| |f|o|r| |w|h|i|c|h| |t|h|e|r|e| |a|r|e| |s|a|m|e|-|n|a|m|e|d| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@20 +|"+0#0000e05&| |F|u|n|c|t|i|o|n|s| |w|i|t|h| |s|a|m|e|-|n|a|m|e|d| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@35 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|r|o|w|s|e|(+0#e000e06&|s+0#00e0e07&|a|v|e|,+0#0000000&| |t+0#00e0e07&|i|t|l|e|,+0#0000000&| |i+0#00e0e07&|n|i|t|d|i|r|,+0#0000000&| |d+0#00e0e07&|e|f|a|u|l|t|)+0#e000e06&| +0#0000000&@32 |c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@44 diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_01.dump b/runtime/syntax/testdir/dumps/vim_ex_call_01.dump index a32e79e574..ddae2cca9c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_call_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_call_01.dump @@ -17,4 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|o|p|y| +0#0000000&|(+0#e000e06&|e+0#00e0e07&|x|p|r|)+0#e000e06&| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|e|l|e|t|e| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|n|a|m|e|,+0#0000000&| |f+0#00e0e07&|l|a|g|s|)+0#e000e06&| +0#0000000&@48 |c+0#af5f00255&|a|l@1| +0#0000000&|e+0#00e0e07&|v|a|l| +0#0000000&|(+0#e000e06&|s+0#00e0e07&|t|r|i|n|g|)+0#e000e06&| +0#0000000&@56 -@57|1|9|,|1| @9|4|0|%| +@57|1|9|,|1| @9|3|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_02.dump b/runtime/syntax/testdir/dumps/vim_ex_call_02.dump index 7306304880..67f8905f21 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_call_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_call_02.dump @@ -17,4 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|r|g|1|,+0#0000000&| |a+0#00e0e07&|r|g|2|)+0#e000e06&| +0#0000000&@54 @75 |l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@39 -@57|3|7|,|1| @9|9|6|%| +@57|3|7|,|1| @9|9|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_03.dump b/runtime/syntax/testdir/dumps/vim_ex_call_03.dump index 857f319aff..6669a0a7ac 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_call_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_call_03.dump @@ -1,5 +1,6 @@ |l+0#af5f00255#ffffff0|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@39 ->l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@38 +|l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@38 +> @74 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|5|1|,|1| @9|B|o|t| +| +0#0000000&@56|5|2|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump b/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump index 748c48b820..de76e72a25 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|c|a|t|c|h| |c|o|m@1|a|n|d| +0#0000000&@54 @75 +@75 |"+0#0000e05&| |:|h|e|l|p| |:|c|a|t|c|h| +0#0000000&@60 @75 |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|:|I|n|t|e|r@1|u|p|t|$|/+0#e000e06&| +0#0000000&@8|"+0#0000e05&| |c|a|t|c|h| |i|n|t|e|r@1|u|p|t|s| |(|C|T|R|L|-|C|)| +0#0000000&@15 @@ -15,6 +16,5 @@ @75 |t+0#af5f00255&|r|y| +0#0000000&||| |s+0#af5f00255&|l|e@1|p| +0#0000000&|1+0#e000002&|0@1| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|:|I|n|t|e|r@1|u|p|t|$|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@24 |t+0#af5f00255&|r|y| +0#0000000&||| |e+0#af5f00255&|d|i|t| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|(|e|d|i|t|)|:|E|\|d|\|+|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|e|r@1|o|r|"| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@13 -|~+0#4040ff13&| @73 -|~| @73 -| +0#0000000&@56|1|,|1| @10|A|l@1| +@75 +@57|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_00.dump b/runtime/syntax/testdir/dumps/vim_ex_command_00.dump index e782ad02ba..8ddf51eff5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_00.dump @@ -1,15 +1,15 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|c|o|m@1|a|n|d|,| |:|d|e|l|c|o|m@1|a|n|d| |a|n|d| |:|c|o|m|c|l|e|a|r| |c|o|m@1|a|n|d|s| +0#0000000&@24 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|C|m|d|N|a|m|e| |T|o|d|o| +0#0000000&@23 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|D|e|l|c|o|m@1|a|n|d|N|a|m|e| |T|o|d|o| +0#0000000&@20 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|C|m|d|N|a|m|e| |T|o|d|o| +0#0000000&@30 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|D|e|l|c|o|m@1|a|n|d|N|a|m|e| |T|o|d|o| +0#0000000&@27 @75 @75 -|"+0#0000e05&| |l|i|s|t| +0#0000000&@68 +|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 @75 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@67 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F+0#0000001#ffff4012| +0#0000000#ffffff0@65 @75 @75 -|"+0#0000e05&| |d|e|f|i|n|e| +0#0000000&@66 +|"+0#0000e05&| |D|e|f|i|n|e| +0#0000000&@66 @75 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@1|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@51 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@51 diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_02.dump b/runtime/syntax/testdir/dumps/vim_ex_command_02.dump index d3b9106f44..86712c1e81 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_02.dump @@ -17,4 +17,4 @@ @75 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#e000e06&|c|o|m|p|l|e|t|e|=|c+0#00e0003&|u|s|t|o|m|,+0#0000000&|s+0#00e0e07&|:|C|o|m|p|l|e|t|e|r|1| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@21 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#e000e06&|c|o|m|p|l|e|t|e|=|c+0#00e0003&|u|s|t|o|m|l|i|s|t|,+0#0000000&|s+0#00e0e07&|:|C|o|m|p|l|e|t|e|r|2| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@17 -@57|3|4|,|1| @9|1|9|%| +@57|3|4|,|1| @9|1|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_03.dump b/runtime/syntax/testdir/dumps/vim_ex_command_03.dump index a0478b8fde..3502efb843 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_03.dump @@ -9,7 +9,7 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 @75 -|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |d|e|f|i|n|e| +0#0000000&@56 +|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |d|e|f|i|n|e| +0#0000000&@56 @75 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#e000e06&|a|d@1|r|=|l+0#00e0003&|i|n|e|s| +0#0000000&@54 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|b|a|n|g| +0#0000000&@61 @@ -17,4 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|b|u|f@1|e|r| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|c|o|m|p|l|e|t|e|=|b+0#00e0003&|u|f@1|e|r| +0#0000000&@50 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|c|o|u|n|t| +0#0000000&@60 -@57|5|0|,|0|-|1| @7|3|0|%| +@57|5|0|,|0|-|1| @7|2|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_04.dump b/runtime/syntax/testdir/dumps/vim_ex_command_04.dump index e1c24980c8..8827d57081 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_04.dump @@ -17,4 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|*+0#00e0003&| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|r|a|n|g|e| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|r|e|g|i|s|t|e|r| +0#0000000&@57 -@57|6|8|,|7| @9|4|3|%| +@57|6|8|,|7| @9|4|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_05.dump b/runtime/syntax/testdir/dumps/vim_ex_command_05.dump index f2e09ada1f..21edaa64bc 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_05.dump @@ -17,4 +17,4 @@ @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|c|o|u|n|t| +0#0000000&@60 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -@57|8|6|,|0|-|1| @7|5@1|%| +@57|8|6|,|0|-|1| @7|5|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_06.dump b/runtime/syntax/testdir/dumps/vim_ex_command_06.dump index d61480c46e..766150a820 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_06.dump @@ -14,7 +14,7 @@ @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56 @75 @75 -|"+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66 +|"+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66 @75 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r|=+0#0000000#ffffff0|a|r|g|u|m|e|n|t|s| |-+0#e000e06&|b|a|n|g| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r| +0#0000000#ffffff0|-+0#e000e06&|n|a|r|g|s|=|*+0#00e0003&| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@8 -@57|1|0|4|,|7| @8|6|8|%| +@57|1|0|4|,|7| @8|6|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_07.dump b/runtime/syntax/testdir/dumps/vim_ex_command_07.dump index 312f5198bb..f63dbd998f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_07.dump @@ -1,7 +1,7 @@ |c+0#af5f00255#ffffff0|o|m@1|a|n|d|!| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r|=+0#0000000#ffffff0|a|r|g|u|m|e|n|t|s| |-+0#e000e06&|b|a|n|g| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r| +0#0000000#ffffff0|-+0#e000e06&|n|a|r|g|s|=|*+0#00e0003&| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@8 @75 @75 -|"+0#0000e05&| |d|e|l|e|t|e| +0#0000000&@66 +|"+0#0000e05&| |D|e|l|e|t|e| +0#0000000&@66 @75 >d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@60 |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|b|u|f@1|e|r| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@52 @@ -17,4 +17,4 @@ |c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@53 @75 @75 -@57|1|2@1|,|1| @8|8|0|%| +@57|1|2@1|,|1| @8|7|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_08.dump b/runtime/syntax/testdir/dumps/vim_ex_command_08.dump index 9120dd965c..0d828c7c95 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_08.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_08.dump @@ -17,4 +17,4 @@ |)|/+0#e000e06&|g|e| +0#0000000&@70 @4|e+0#af5f00255&|n|d|i|f| +0#0000000&@65 @4|i+0#af5f00255&|f| +0#0000000&|"+0#e000002&|<|a|r|g|s|>|"| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|"+0#e000002&@1| +0#0000000&@53 -@57|1|4|0|,|0|-|1| @6|9|2|%| +@57|1|4|0|,|0|-|1| @6|8@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_09.dump b/runtime/syntax/testdir/dumps/vim_ex_command_09.dump index 1b0afce409..7b81de09ce 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_09.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_09.dump @@ -11,10 +11,10 @@ |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|r|a|n|g|e|=|%+0#00e0003&| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|?+0#00e0003&| +0#0000000&|-+0#e000e06&|b|a|n|g| +0#0000000&|T+0#0000001#ffff4012|b| +0#0000000#ffffff0|:|<+0#e000e06&|l|i|n|e|1|>|,+0#0000000&|<+0#e000e06&|l|i|n|e|2|>|s+0#af5f00255&|/+0#e000e06&|\+0#0000000&|v|"|[|^|"|]|*|"|/+0#e000e06&|\+0#0000000&|=|s|u|b|s|t|i|t|u|t|e |(|s|u|b|m|a|t|c|h|(|0|)|,| |"| |"|,| |"|•|"|,| |"|g|"|)|/+0#e000e06&|g|e| +0#0000000&@43 @75 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|5|7|,|5| @8|B|o|t| +@75 +|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|:|m|a|p| |w|i|t|h| |t|r|a|i|l|i|n|g| |b|a|r| |i|n| |r|e|p|l|a|c|e|m|e|n|t| |t|e|x|t|)| +0#0000000&@11 +|c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@62 +@6|\+0#e000e06&| +0#0000000&|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |r|h|s| ||| @53 +@6|\+0#e000e06&| +0#0000000&|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&|f|o@1| |b|a|r| ||| @46 +@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@56 +@57|1|5|7|,|5| @8|9@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_10.dump b/runtime/syntax/testdir/dumps/vim_ex_command_10.dump new file mode 100644 index 0000000000..31663553c5 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_command_10.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@56 +> @74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|7|0|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump b/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump index f61fadb154..a6984d4c22 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump @@ -1,4 +1,4 @@ ->"+0#0000e05#ffffff0| |V|i|m| |e|x| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@48 +>"+0#0000e05#ffffff0| |V|i|m| |E|x| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@48 @75 @75 @1|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@7|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump index ec359f9259..1818e0f9f8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@61 @75 +@75 |"+0#0000e05&| |S|T|A|R|T| |N|O|T| |M|A|T|C|H|E|D| +0#0000000&@55 |:|@| @72 |:|@+0#e000e06&@1| +0#0000000&@71 @@ -16,5 +17,4 @@ |:+0#af5f00255&|a|p@1|e|n|d| +0#0000000&@67 | +0#e000002&@3|t|e|x|t| +0#0000000&@66 |.+0#af5f00255&| +0#0000000&@73 -|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump index f5c6471a05..45e5149cdb 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#| |F|I|X|M|E| @59 +|:+0&#ffffff0| |h+0#af5f00255&|e|l|p| +0#0000000&@68 +@1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#| |F|I|X|M|E| @59 @75 |:+0#af5f00255&|a|p@1|e|n|d| +0#0000000&@67 | +0#e000002&@3|t|e|x|t| +0#0000000&@66 -|.+0#af5f00255&| +0#0000000&@73 ->:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63 +>.+0#af5f00255&| +0#0000000&@73 +|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63 |:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66 |:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64 |:|a+0#af5f00255&|l@1| +0#0000000&@70 @@ -16,5 +17,4 @@ |:|a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@66 |:|a+0#af5f00255&|r|g|d|o| +0#0000000&@68 |:|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64 -|:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65 @57|1|9|,|1| @10|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump index 2fb09df41e..98b142a75b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65 +|:+0&#ffffff0|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64 +|:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65 |:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65 |:|a+0#af5f00255&|s|c|i@1| +0#0000000&@68 |:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66 -|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62 ->:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62 +>:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62 +|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62 |:|a+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|b+0#af5f00255&|u|f@1|e|r| +0#0000000&@67 |:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68 @@ -16,5 +17,4 @@ |:|b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@63 |:|b+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 |:|b+0#af5f00255&|l|a|s|t| +0#0000000&@68 -|:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64 @57|3|7|,|1| @10|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump index 1cb1136bb4..fcedbfe3cc 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64 +|:+0&#ffffff0|b+0#af5f00255&|l|a|s|t| +0#0000000&@68 +|:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64 |:|b+0#af5f00255&|n|e|x|t| +0#0000000&@68 |:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65 |:|b+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 -|:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66 ->:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68 +>:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66 +|:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68 |:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65 |:|b+0#af5f00255&|r|e|a|k|d|e|l| +0#0000000&@65 |:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64 @@ -16,5 +17,4 @@ | +0#e000002&@3|t|e|x|t| +0#0000000&@66 |.+0#af5f00255&| +0#0000000&@73 |:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68 -|:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67 @57|5@1|,|1| @10|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump index 4d514b0cc2..2a4372e58f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67 +|:+0&#ffffff0|c+0#af5f00255&|N|e|x|t| +0#0000000&@68 +|:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67 |:|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@66 |:|c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@65 |:|c+0#af5f00255&|a|b|o|v|e| +0#0000000&@67 -|:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63 ->:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65 +>:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63 +|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65 |:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65 |:|c+0#af5f00255&|a|f|t|e|r| +0#0000000&@67 |:|c+0#af5f00255&|a|l@1| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|c+0#af5f00255&@1|l|o|s|e| +0#0000000&@67 |:|c+0#af5f00255&|d| +0#0000000&@71 |:|c+0#af5f00255&|d|o| +0#0000000&@70 -|:|c+0#af5f00255&|f|d|o| +0#0000000&@69 @57|7|3|,|1| @10|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump index b20ef99952..8c9b77acd6 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|c+0#af5f00255&|f|d|o| +0#0000000&@69 +|:+0&#ffffff0|c+0#af5f00255&|d|o| +0#0000000&@70 +|:|c+0#af5f00255&|f|d|o| +0#0000000&@69 |:|c+0#af5f00255&|e|n|t|e|r| +0#0000000&@67 |:|c+0#af5f00255&|e|x|p|r| +0#0000000&@68 |:|c+0#af5f00255&|f|i|l|e| +0#0000000&@68 -|:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 ->:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63 +>:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 +|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63 |:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65 |:|c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@65 |:|c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|c+0#af5f00255&|l|i|s|t| +0#0000000&@68 |:|c+0#af5f00255&|l|o|s|e| +0#0000000&@68 |:|c+0#af5f00255&|m|a|p| +0#0000000&@69 -|:|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 @57|9|1|,|1| @10|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump index 78eca017c3..368df373f9 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 +|:+0&#ffffff0|c+0#af5f00255&|m|a|p| +0#0000000&@69 +|:|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 |:|c+0#af5f00255&|m|e|n|u| +0#0000000&@68 |:|c+0#af5f00255&|n|e|x|t| +0#0000000&@68 |:|c+0#af5f00255&|n|e|w|e|r| +0#0000000&@67 -|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67 ->:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 +>:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67 +|:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 |:|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62 |:|c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64 |:|c+0#af5f00255&|o|p|y| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@66 |:|c+0#af5f00255&|o|n|s|t| +0#0000000&@68 |:|c+0#af5f00255&|o|p|e|n| +0#0000000&@68 -|:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 @57|1|0|9|,|1| @9|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump index 6909d76c5c..7507a133fa 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 +|:+0&#ffffff0|c+0#af5f00255&|o|p|e|n| +0#0000000&@68 +|:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 |:|c+0#af5f00255&|p|f|i|l|e| +0#0000000&@67 |:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68 |:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66 -|:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67 ->:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68 +>:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67 +|:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68 |:|c+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 |:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64 |:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|d+0#af5f00255&|e|f|e|r| +0#0000000&@68 |:|d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@63 |:|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62 -|:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65 @57|1|2|7|,|1| @8|1|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump index 1c708901bf..970062ec9d 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65 +|:+0&#ffffff0|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62 +|:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65 |:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63 |:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66 |:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66 -|:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64 ->:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66 +>:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64 +|:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66 |:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64 |:|d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@65 |:|d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@64 |:|d+0#af5f00255&|p| +0#0000000&@71 |:|d+0#af5f00255&|r|o|p| +0#0000000&@69 -|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 @57|1|4|5|,|1| @8|1@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump index 416f05e8d8..6a8def6869 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 +|:+0&#ffffff0|d+0#af5f00255&|r|o|p| +0#0000000&@69 +|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 |:|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67 |:|e+0#af5f00255&|d|i|t| +0#0000000&@69 |:|e+0#af5f00255&|a|r|l|i|e|r| +0#0000000&@66 -|:|e+0#af5f00255&|c|h|o| +0#0000000&@69 ->:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62 +>:|e+0#af5f00255&|c|h|o| +0#0000000&@69 +|:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62 |:|e+0#af5f00255&|c|h|o|e|r@1| +0#0000000&@66 |:|e+0#af5f00255&|c|h|o|h|l| +0#0000000&@67 |:|e+0#af5f00255&|c|h|o|m|s|g| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|e+0#af5f00255&|n|d|i|f| +0#0000000&@68 |:|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@67 |:|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62 -|:|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67 @57|1|6|3|,|1| @8|1|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump index b226536cbb..2a6deef87f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67 +|:+0&#ffffff0|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62 +|:|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67 |:|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@65 |:|e+0#af5f00255&|n|e|w| +0#0000000&@69 |:|e+0#af5f00255&|v|a|l| +0#0000000&@69 -|:|e+0#af5f00255&|x| +0#0000000&@71 ->:|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@66 +>:|e+0#af5f00255&|x| +0#0000000&@71 +|:|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@66 |:|e+0#af5f00255&|x|i|t| +0#0000000&@69 |:|e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@66 |:|f+0#af5f00255&|i|l|e| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@67 |:|f+0#af5f00255&|i|r|s|t| +0#0000000&@68 |:|f+0#af5f00255&|i|x|d|e|l| +0#0000000&@67 -|:|f+0#af5f00255&|o|l|d| +0#0000000&@69 @57|1|8|1|,|1| @8|1|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump index acd9f157f8..a309127dcd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|f+0#af5f00255&|o|l|d| +0#0000000&@69 +|:+0&#ffffff0|f+0#af5f00255&|i|x|d|e|l| +0#0000000&@67 +|:|f+0#af5f00255&|o|l|d| +0#0000000&@69 |:|f+0#af5f00255&|o|l|d|c|l|o|s|e| +0#0000000&@64 |:|f+0#af5f00255&|o|l|d@1|o@1|p|e|n| +0#0000000&@63 |:|f+0#af5f00255&|o|l|d@1|o|c|l|o|s|e|d| +0#0000000&@61 -|:|f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@65 ->:|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@50 +>:|f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@65 +|:|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@50 |:|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@65 |:|g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@62 |:|g+0#af5f00255&|o|t|o| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@64 |:|h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@65 |:|h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@65 -|:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65 @57|1|9@1|,|1| @8|1|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump index b84c2e70c4..06203eb3fd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65 +|:+0&#ffffff0|h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@65 +|:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65 |:|h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@64 |:|h+0#af5f00255&|i|d|e| +0#0000000&@69 |:|h+0#af5f00255&|i|s|t|o|r|y| +0#0000000&@66 -|:|h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@63 ->:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67 +>:|h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@63 +|:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67 | +0#e000002&@3|t|e|x|t| +0#0000000&@66 |.+0#af5f00255&| +0#0000000&@73 |:|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|i+0#af5f00255&|m|e|n|u| +0#0000000&@68 |:|i+0#af5f00255&|m|p|o|r|t| +0#0000000&@67 |:|i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 -|:|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62 @57|2|1|7|,|1| @8|1|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump index 1338d1d5a8..a9e23fb2e8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62 +|:+0&#ffffff0|i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 +|:|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62 |:|i+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64 |:|i+0#af5f00255&|n|t|r|o| +0#0000000&@68 |:|i+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 -|:|i+0#af5f00255&|s|p|l|i|t| +0#0000000&@67 ->:|i+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 +>:|i+0#af5f00255&|s|p|l|i|t| +0#0000000&@67 +|:|i+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 |:|i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64 |:|i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|j+0#af5f00255&|o|i|n| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|l+0#af5f00255&|N|e|x|t| +0#0000000&@68 |:|l+0#af5f00255&|N|f|i|l|e| +0#0000000&@67 |:|l+0#af5f00255&|i|s|t| +0#0000000&@69 -|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67 @57|2|3|5|,|1| @8|1|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump index a116f8f7db..26142ba640 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67 +|:+0&#ffffff0|l+0#af5f00255&|i|s|t| +0#0000000&@69 +|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67 |:|l+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65 |:|l+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63 |:|l+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65 -|:|l+0#af5f00255&|a|f|t|e|r| +0#0000000&@67 ->:|l+0#af5f00255&|a|s|t| +0#0000000&@69 +>:|l+0#af5f00255&|a|f|t|e|r| +0#0000000&@67 +|:|l+0#af5f00255&|a|s|t| +0#0000000&@69 |:|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@65 |:|l+0#af5f00255&|a|t|e|r| +0#0000000&@68 |:|l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@66 |:|l+0#af5f00255&|d|o| +0#0000000&@70 |:|l+0#af5f00255&|f|d|o| +0#0000000&@69 -|:|l+0#af5f00255&|e|f|t| +0#0000000&@69 @57|2|5|3|,|1| @8|2|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump index e6f82befb0..08cf8f7891 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|l+0#af5f00255&|e|f|t| +0#0000000&@69 +|:+0&#ffffff0|l+0#af5f00255&|f|d|o| +0#0000000&@69 +|:|l+0#af5f00255&|e|f|t| +0#0000000&@69 |:|l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@64 |:|l+0#af5f00255&|e|g|a|c|y| +0#0000000&@67 |:|l+0#af5f00255&|e|t| +0#0000000&@70 -|:|l+0#af5f00255&|e|x|p|r| +0#0000000&@68 ->:|l+0#af5f00255&|f|i|l|e| +0#0000000&@68 +>:|l+0#af5f00255&|e|x|p|r| +0#0000000&@68 +|:|l+0#af5f00255&|f|i|l|e| +0#0000000&@68 |:|l+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 |:|l+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63 |:|l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|l+0#af5f00255&@1|a|s|t| +0#0000000&@68 |:|l+0#af5f00255&@1|i|s|t| +0#0000000&@68 |:|l+0#af5f00255&|m|a|k|e| +0#0000000&@68 -|:|l+0#af5f00255&|m|a|p| +0#0000000&@69 @57|2|7|1|,|1| @8|2@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump index 9ed31a0bb0..a9a77266b7 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|l+0#af5f00255&|m|a|p| +0#0000000&@69 +|:+0&#ffffff0|l+0#af5f00255&|m|a|k|e| +0#0000000&@68 +|:|l+0#af5f00255&|m|a|p| +0#0000000&@69 |:|l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 |:|l+0#af5f00255&|n|e|x|t| +0#0000000&@68 |:|l+0#af5f00255&|n|e|w|e|r| +0#0000000&@67 -|:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67 ->:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 +>:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67 +|:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 |"+0#0000e05&| |:|l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@33 |:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65 |:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64 @@ -16,5 +17,4 @@ |:|l+0#af5f00255&|s| +0#0000000&@71 |:|l+0#af5f00255&|t|a|g| +0#0000000&@69 |:|l+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 -|:|l+0#af5f00255&|u|a| +0#0000000&@70 @57|2|8|9|,|1| @8|2|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump index 2210ad3689..9f0186aaf6 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|l+0#af5f00255&|u|a| +0#0000000&@70 +|:+0&#ffffff0|l+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 +|:|l+0#af5f00255&|u|a| +0#0000000&@70 |:|l+0#af5f00255&|u|a|d|o| +0#0000000&@68 |:|l+0#af5f00255&|u|a|f|i|l|e| +0#0000000&@66 |:|l+0#af5f00255&|v|i|m|g|r|e|p| +0#0000000&@65 -|:|l+0#af5f00255&|v|i|m|g|r|e|p|a|d@1| +0#0000000&@62 ->:|l+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66 +>:|l+0#af5f00255&|v|i|m|g|r|e|p|a|d@1| +0#0000000&@62 +|:|l+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66 |:|m+0#af5f00255&|o|v|e| +0#0000000&@69 |:|m+0#af5f00255&|a|r|k| +0#0000000&@69 |:|m+0#af5f00255&|a|k|e| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@65 |:|m+0#af5f00255&|k|e|x|r|c| +0#0000000&@67 |:|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64 -|:|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66 @57|3|0|7|,|1| @8|2|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump index e9d652e62f..ff65ca356b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66 +|:+0&#ffffff0|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64 +|:|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66 |:|m+0#af5f00255&|k|v|i|m|r|c| +0#0000000&@66 |:|m+0#af5f00255&|k|v|i|e|w| +0#0000000&@67 |:|m+0#af5f00255&|o|d|e| +0#0000000&@69 -|:|m+0#af5f00255&|z|s|c|h|e|m|e| +0#0000000&@65 ->:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67 +>:|m+0#af5f00255&|z|s|c|h|e|m|e| +0#0000000&@65 +|:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67 |:|n+0#af5f00255&|b|c|l|o|s|e| +0#0000000&@66 |:|n+0#af5f00255&|b|k|e|y| +0#0000000&@68 |:|n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@64 |:|n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64 |:|n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@66 -|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63 @57|3|2|5|,|1| @8|2|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump index 27e93bab5b..2b91ce8c27 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63 +|:+0&#ffffff0|n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@66 +|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63 |:|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&@63 |:|n+0#af5f00255&|o|r|e|m|e|n|u| +0#0000000&@65 |:|n+0#af5f00255&|o|r|m|a|l| +0#0000000&@67 -|:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63 ->:|n+0#af5f00255&|u|m|b|e|r| +0#0000000&@67 +>:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63 +|:|n+0#af5f00255&|u|m|b|e|r| +0#0000000&@67 |:|n+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 |:|n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64 |:|o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@66 |:|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 -|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 @57|3|4|3|,|1| @8|2|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump index 544d5a799a..bf02f0157a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 +|:+0&#ffffff0|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 +|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|o+0#af5f00255&|w|n|s|y|n|t|a|x| +0#0000000&@64 |:|p+0#af5f00255&|a|c|k|a|d@1| +0#0000000&@66 |:|p+0#af5f00255&|a|c|k|l|o|a|d|a|l@1| +0#0000000&@62 -|:|p+0#af5f00255&|c|l|o|s|e| +0#0000000&@67 ->:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68 +>:|p+0#af5f00255&|c|l|o|s|e| +0#0000000&@67 +|:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68 |:|p+0#af5f00255&|e|r|l| +0#0000000&@69 |:|p+0#af5f00255&|r|i|n|t| +0#0000000&@68 |:|p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|p+0#af5f00255&@1|o|p| +0#0000000&@69 |:|p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@65 |:|p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@65 -|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 @57|3|6|1|,|1| @8|2|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump index 8a6b5f3564..2ee8d6fbdc 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 +|:+0&#ffffff0|p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@65 +|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66 |:|p+0#af5f00255&|t|a|g| +0#0000000&@69 |:|p+0#af5f00255&|t|N|e|x|t| +0#0000000&@67 |:|p+0#af5f00255&|t|f|i|r|s|t| +0#0000000&@66 -|:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67 ->:|p+0#af5f00255&|t|l|a|s|t| +0#0000000&@67 +>:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67 +|:|p+0#af5f00255&|t|l|a|s|t| +0#0000000&@67 |:|p+0#af5f00255&|t|n|e|x|t| +0#0000000&@67 |:|p+0#af5f00255&|t|p|r|e|v|i|o|u|s| +0#0000000&@63 |:|p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@66 |:|p+0#af5f00255&|y|t|h|o|n| +0#0000000&@67 |:|p+0#af5f00255&|y|d|o| +0#0000000&@69 -|:|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67 @57|3|7|9|,|1| @8|3|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump index 9213c8b28e..376f35a219 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67 +|:+0&#ffffff0|p+0#af5f00255&|y|d|o| +0#0000000&@69 +|:|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67 |:|p+0#af5f00255&|y|x| +0#0000000&@70 |:|p+0#af5f00255&|y|t|h|o|n|x| +0#0000000&@66 |:|p+0#af5f00255&|y|x|d|o| +0#0000000&@68 -|:|p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@66 ->:|q+0#af5f00255&|u|i|t| +0#0000000&@69 +>:|p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@66 +|:|q+0#af5f00255&|u|i|t| +0#0000000&@69 |:|q+0#af5f00255&|u|i|t|a|l@1| +0#0000000&@66 |:|q+0#af5f00255&|a|l@1| +0#0000000&@69 |:|r+0#af5f00255&|e|a|d| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@64 |:|r+0#af5f00255&|e|s|i|z|e| +0#0000000&@67 |:|r+0#af5f00255&|e|t|a|b| +0#0000000&@68 -|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67 @57|3|9|7|,|1| @8|3|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump index 859440140c..9c180652fd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67 +|:+0&#ffffff0|r+0#af5f00255&|e|t|a|b| +0#0000000&@68 +|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67 |:|r+0#af5f00255&|e|w|i|n|d| +0#0000000&@67 |:|r+0#af5f00255&|i|g|h|t| +0#0000000&@68 |:|r+0#af5f00255&|i|g|h|t|b|e|l|o|w| +0#0000000&@63 -|:|r+0#af5f00255&|u|b|y| +0#0000000&@69 ->:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67 +>:|r+0#af5f00255&|u|b|y| +0#0000000&@69 +|:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67 |:|r+0#af5f00255&|u|b|y|f|i|l|e| +0#0000000&@65 |:|r+0#af5f00255&|u|n|d|o| +0#0000000&@68 |:|r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|s+0#af5f00255&|a|v|e|a|s| +0#0000000&@67 |:|s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@66 |:|s+0#af5f00255&|b|N|e|x|t| +0#0000000&@67 -|:|s+0#af5f00255&|b|a|l@1| +0#0000000&@68 @57|4|1|5|,|1| @8|3|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump index 5594625010..1e45efe3c4 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|s+0#af5f00255&|b|a|l@1| +0#0000000&@68 +|:+0&#ffffff0|s+0#af5f00255&|b|N|e|x|t| +0#0000000&@67 +|:|s+0#af5f00255&|b|a|l@1| +0#0000000&@68 |:|s+0#af5f00255&|b|f|i|r|s|t| +0#0000000&@66 |:|s+0#af5f00255&|b|l|a|s|t| +0#0000000&@67 |:|s+0#af5f00255&|b|m|o|d|i|f|i|e|d| +0#0000000&@63 -|:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67 ->:|s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@63 +>:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67 +|:|s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@63 |:|s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@65 |:|s+0#af5f00255&|c|r|i|p|t|n|a|m|e|s| +0#0000000&@62 |:|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@59 @@ -16,5 +17,4 @@ |:|s+0#af5f00255&|f|i|n|d| +0#0000000&@68 |:|s+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 |:|s+0#af5f00255&|h|e|l@1| +0#0000000&@68 -|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67 @57|4|3@1|,|1| @8|3|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump index afc850c0fc..2c63093785 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67 +|:+0&#ffffff0|s+0#af5f00255&|h|e|l@1| +0#0000000&@68 +|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67 |:|s+0#af5f00255&|i|g|n| +0#0000000&@69 |:|s+0#af5f00255&|i|l|e|n|t| +0#0000000&@67 |:|s+0#af5f00255&|l|e@1|p| +0#0000000&@68 -|:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67 ->:|s+0#af5f00255&|l|a|s|t| +0#0000000&@68 +>:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67 +|:|s+0#af5f00255&|l|a|s|t| +0#0000000&@68 |:|s+0#af5f00255&|m|a|g|i|c| +0#0000000&@67 |:|s+0#af5f00255&|m|a|p| +0#0000000&@69 |:|s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 @@ -16,5 +17,4 @@ |:|s+0#af5f00255&|o|r|t| +0#0000000&@69 |:|s+0#af5f00255&|o|u|r|c|e| +0#0000000&@67 |:|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64 -|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64 @57|4|5|1|,|1| @8|3|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump index 052616f5d4..147c58c75c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64 +|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64 +|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64 |:|s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@64 |:|s+0#af5f00255&|p|e|l@1|r|a|r|e| +0#0000000&@64 |:|s+0#af5f00255&|p|e|l@1|r|e|p|a|l@1| +0#0000000&@62 -|:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64 ->:|s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@63 +>:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64 +|:|s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@63 |:|s+0#af5f00255&|p|l|i|t| +0#0000000&@68 |:|s+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 |:|s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66 @@ -16,5 +17,4 @@ |:|s+0#af5f00255&|t|j|u|m|p| +0#0000000&@67 |:|s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@65 |:|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66 -|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 @57|4|6|9|,|1| @8|3|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump index 2761b3a6af..db85b31e87 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 +|:+0&#ffffff0|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66 +|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 |:|s+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|s+0#af5f00255&|u|s|p|e|n|d| +0#0000000&@66 |:|s+0#af5f00255&|v|i|e|w| +0#0000000&@68 -|:|s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@65 ->:|s+0#af5f00255&|y|n|t|a|x| +0#0000000&@67 +>:|s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@65 +|:|s+0#af5f00255&|y|n|t|a|x| +0#0000000&@67 |:|s+0#af5f00255&|y|n|t|i|m|e| +0#0000000&@66 |:|s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@65 |:|t+0#af5f00255&| +0#0000000&@72 @@ -16,5 +17,4 @@ |:|t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@65 |:|t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@66 |:|t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@66 -|:|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67 @57|4|8|7|,|1| @8|4|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump index e7b8b0617c..5d1200e6cb 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67 +|:+0&#ffffff0|t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@66 +|:|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67 |:|t+0#af5f00255&|a|b|n|e|x|t| +0#0000000&@66 |:|t+0#af5f00255&|a|b|o|n|l|y| +0#0000000&@66 |:|t+0#af5f00255&|a|b|p|r|e|v|i|o|u|s| +0#0000000&@62 -|:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64 ->:|t+0#af5f00255&|a|b|s| +0#0000000&@69 +>:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64 +|:|t+0#af5f00255&|a|b|s| +0#0000000&@69 |:|t+0#af5f00255&|a|b| +0#0000000&@70 |:|t+0#af5f00255&|a|g| +0#0000000&@70 |:|t+0#af5f00255&|a|g|s| +0#0000000&@69 @@ -16,5 +17,4 @@ |:|t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@65 |:|t+0#af5f00255&|f|i|r|s|t| +0#0000000&@67 |:|t+0#af5f00255&|h|r|o|w| +0#0000000&@68 -|:|t+0#af5f00255&|j|u|m|p| +0#0000000&@68 @57|5|0|5|,|1| @8|4|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump index 419f826214..1b9117b388 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|t+0#af5f00255&|j|u|m|p| +0#0000000&@68 +|:+0&#ffffff0|t+0#af5f00255&|h|r|o|w| +0#0000000&@68 +|:|t+0#af5f00255&|j|u|m|p| +0#0000000&@68 |:|t+0#af5f00255&|l|a|s|t| +0#0000000&@68 |:|t+0#af5f00255&|l|m|e|n|u| +0#0000000&@67 |:|t+0#af5f00255&|l|n|o|r|e|m|e|n|u| +0#0000000&@63 -|:|t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@65 ->:|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 +>:|t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@65 +|:|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 |:|t+0#af5f00255&|m|a|p| +0#0000000&@69 |:|t+0#af5f00255&|m|e|n|u| +0#0000000&@68 |:|t+0#af5f00255&|n|e|x|t| +0#0000000&@68 @@ -16,5 +17,4 @@ |:|t+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 |:|t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|u+0#af5f00255&|n|d|o| +0#0000000&@69 -|:|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65 @57|5|2|3|,|1| @8|4|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump index 19732cd6a3..5bcbeef9af 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65 +|:+0&#ffffff0|u+0#af5f00255&|n|d|o| +0#0000000&@69 +|:|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65 |:|u+0#af5f00255&|n|d|o|l|i|s|t| +0#0000000&@65 |:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61 |:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61 -|:|u+0#af5f00255&|n|h|i|d|e| +0#0000000&@67 ->:|u+0#af5f00255&|n|i|q| +0#0000000&@69 +>:|u+0#af5f00255&|n|h|i|d|e| +0#0000000&@67 +|:|u+0#af5f00255&|n|i|q| +0#0000000&@69 |:|u+0#af5f00255&|n|l|e|t| +0#0000000&@68 |:|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&@64 |:|u+0#af5f00255&|n|m|a|p| +0#0000000&@68 @@ -16,5 +17,4 @@ |:|v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@65 |:|v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@66 |:|v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@66 -|:|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63 @57|5|4|1|,|1| @8|4@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump index 2b109af950..5abc5ab7f4 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63 +|:+0&#ffffff0|v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@66 +|:|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63 |:|v+0#af5f00255&|i|s|u|a|l| +0#0000000&@67 |:|v+0#af5f00255&|i|u|s|a|g|e| +0#0000000&@66 |:|v+0#af5f00255&|i|e|w| +0#0000000&@69 -|:|v+0#af5f00255&|m|a|p| +0#0000000&@69 ->:|v+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 +>:|v+0#af5f00255&|m|a|p| +0#0000000&@69 +|:|v+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64 |:|v+0#af5f00255&|m|e|n|u| +0#0000000&@68 |:|v+0#af5f00255&|n|e|w| +0#0000000&@69 |:|v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|w+0#af5f00255&|N|e|x|t| +0#0000000&@68 |:|w+0#af5f00255&|a|l@1| +0#0000000&@69 |:|w+0#af5f00255&|h|i|l|e| +0#0000000&@68 -|:|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66 @57|5@1|9|,|1| @8|4|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump index 79ecaafc5e..8ec5f2f9a5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66 +|:+0&#ffffff0|w+0#af5f00255&|h|i|l|e| +0#0000000&@68 +|:|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66 |:|w+0#af5f00255&|i|n|c|m|d| +0#0000000&@67 |:|w+0#af5f00255&|i|n|p|o|s| +0#0000000&@67 |:|w+0#af5f00255&|n|e|x|t| +0#0000000&@68 -|:|w+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 ->:|w+0#af5f00255&|q| +0#0000000&@71 +>:|w+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64 +|:|w+0#af5f00255&|q| +0#0000000&@71 |:|w+0#af5f00255&|q|a|l@1| +0#0000000&@68 |:|w+0#af5f00255&|u|n|d|o| +0#0000000&@68 |:|w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@65 @@ -16,5 +17,4 @@ |:|x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65 |:|x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64 |:|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 -|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 @57|5|7@1|,|1| @8|4|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump index 96730a652a..cc321b4ecb 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 +|:+0&#ffffff0|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67 +|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66 |:|y+0#af5f00255&|a|n|k| +0#0000000&@69 |:|z+0#af5f00255&| +0#0000000&@72 @75 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&|h+0#af5f00255&|e|l|p| +0#0000000&@59 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&|h+0#af5f00255&|e|l|p| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||h+0#af5f00255&|e|l|p| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&| |h+0#af5f00255&|e|l|p| +0#0000000&@58 @75 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|l@1| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 @57|5|9|5|,|1| @8|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump index d5b866a867..bb2242efa2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|s| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|a|d@1| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|d|u|p|e| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@52 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|o| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@53 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|d@1| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57 -@57|6|1|3|,|1| @8|5|1|%| +@57|6|1|3|,|1| @8|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump index 65f6ce69a8..64447816b8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|d@1| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|d|e|l|e|t|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@49 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@49 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@51 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@55 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|l|a|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|n|e|x|t| +0#0000000&@56 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|o|w|s|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f|d|o| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54 @57|6|3|1|,|1| @8|5|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump index d3bba181e6..b805d6e43b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f|d|o| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|n|l|o|a|d| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|w|i|p|e|o|u|t| +0#0000000&@53 |"+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@67 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@55 -@4>t|e|x|t| @66 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@55 +@4|t|e|x|t| @66 |.+0#af5f00255&| +0#0000000&@73 |c+0#00e0e07&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|f|i|l|e| +0#0000000&@55 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|f|t|e|r| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54 -@57|6|4|9|,|5| @8|5|4|%| +@57|6|4|9|,|1| @8|5|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump index 89901bb829..739767ea0c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|l|o|w| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1| +0#0000000&@59 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@55 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d|o| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|d|o| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|d|i|r| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52 @57|6@1|7|,|1| @8|5@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump index b739ed4b76..0ee37ba1da 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|d|i|r| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|a|s|t| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@51 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|o|s|e| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|y| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|d|e|r| +0#0000000&@55 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50 @57|6|8|5|,|1| @8|5|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump index e610b4a3e9..71e0796dce 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|d|e|r| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|p|i|l|e|r| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@53 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|e|n| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55 @57|7|0|3|,|1| @8|5|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump index 7a656b394e..1a5394dd17 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&@58 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@51 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@53 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50 @57|7|2|1|,|1| @8|6|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump index 361dd438b6..9586e55504 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|j|u|m|p| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l|i|s|t| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@52 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|p| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|r|o|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@54 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|h|l| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|m|s|g| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|n| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51 @57|7|3|9|,|1| @8|6|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump index b6a36b168f..058fc102b7 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|n| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e|i|f| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|m|e|n|u| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@55 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@55 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53 @57|7|5|7|,|1| @8|6|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump index 2ab045baf3..736510c9ae 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|t|e|r| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|d| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@54 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|i|s|h| +0#0000000&@55 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|i|s|h| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|r|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|x|d|e|l| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|o|t|o| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54 @57|7@1|5|,|1| @8|6|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump index 39509e42e8..9e5160d460 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|u|i| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|v|i|m| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@52 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@53 @@ -16,5 +17,4 @@ @4|t|e|x|t| @66 |.+0#af5f00255&| +0#0000000&@73 |c+0#00e0e07&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53 @57|7|9|3|,|1| @8|6@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump index 3ac0534fbb..135407e8ce 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53 +|c+0#00e0e07#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|f| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|j|u|m|p| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|l|i|s|t| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p| +0#0000000&@57 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|e|n|u| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56 @57|8|1@1|,|1| @8|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump index 4a35b95bda..2dc666444f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&| +0#0000000&@60 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|m|a|r|k|s| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@52 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@49 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@49 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|f|i|l|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|i|s|t| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|t|e|r| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55 @57|8|2|9|,|1| @8|6|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump index f678da1565..b5426c5b45 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|d| +0#0000000&@58 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@55 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@55 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|d|o| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|d|o| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|i|r|s|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53 @57|8|4|7|,|1| @8|7|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump index dd112dbc4e..6c3ee2f4de 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p|a|d@1| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|e|l|p|g|r|e|p| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@59 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|a|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|i|s|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|k|e| +0#0000000&@56 @@ -16,5 +17,4 @@ |"+0#0000e05&| |c|a|l@1| |F|o@1|(|)| ||| |l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@21 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54 @57|8|6|5|,|1| @8|7|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump index 6dd13d24bd..5e7527e119 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|l|d|e|r| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|p|e|n| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@55 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|s| +0#0000000&@59 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|t|a|g| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|o|v|e| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|k|e| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58 @57|8@1|3|,|1| @8|7|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump index 800d69888b..13d729c01d 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|k|e| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k|s| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|t|c|h| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@57 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@48 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@48 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|e|x|r|c| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@52 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|c|l|o|s|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|k|e|y| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57 @57|9|0|1|,|1| @8|7|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump index 0b0b630f3f..643459ba1e 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|w| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@56 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@53 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@54 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57 @57|9|1|9|,|1| @8|7|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump index a7137cbe29..64f99821cd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|e|n|u| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@57 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|e|r|l| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|i|n|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54 @57|9|3|7|,|1| @8|7|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump index 94114a5db7..5e3d63d7f9 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|f|i|n|d| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|r|e|p|l| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|e|r|l|d|o| +0#0000000&@55 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p| +0#0000000&@58 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p|u|p| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p|u|p| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&@1|o|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@53 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|n|e|x|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|p|r|e|v|i|o|u|s| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53 @57|9|5@1|,|1| @8|7|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump index 835d1594b3..da5b8ab7a1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|u|t| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|w|d| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3| +0#0000000&@58 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@54 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|d|o| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |q+0#af5f00255&|u|i|t|a|l@1| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |q+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|a|d| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54 @57|9|7|3|,|1| @8|8|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump index 19c6265ce8..736a9c5094 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|a|d| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|o| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|i|r| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w| +0#0000000&@55 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@49 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@48 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@48 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|s|i|z|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|t|a|b| +0#0000000&@56 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|b|y|f|i|l|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|d|o| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53 @57|9@1|1|,|1| @8|8|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump index 74e7be0014..86f8660aba 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|n|d|b|o|x| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@52 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@57 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|v|e|a|s| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|N|e|x|t| +0#0000000&@55 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|n|a|m|e|s| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@47 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48 @57|1|0@1|9|,|1| @7|8|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump index 1f6a759bf1..71b504ea1b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|f|i|l|e|t|y|p|e| +0#0000000&@50 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@52 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@53 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|n|d| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|r|s|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|h|e|l@1| +0#0000000&@56 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|g|i|c| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56 @57|1|0|2|7|,|1| @7|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump index 4bcd68c65b..6753a5100a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|i|l|e| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|m|a|g|i|c| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|r|t| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|u|r|c|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@52 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|l|i|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57 @57|1|0|4|5|,|1| @7|8|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump index 7e661e264d..57073b2e25 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|g| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|i|n|s|e|r|t| +0#0000000&@50 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|g|r|e|p|l|a|c|e| +0#0000000&@48 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@49 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@51 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|j|u|m|p| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@54 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|y|n|t|i|m|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&| +0#0000000&@60 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56 @57|1|0|6|3|,|1| @7|8@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump index f3ffdf27ae..b230033778 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|c|l|o|s|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|d|o| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@54 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@54 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g|s| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58 @57|1|0|8|1|,|1| @7|9|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump index 4a9025921c..ffc8eab758 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g|s| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|h|d|i|r| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|d|o| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@54 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|f|i|r|s|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&@56 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|a|p| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|e|n|u| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|e|x|t| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 @57|1|0|9@1|,|1| @7|9|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump index e6a70dd47d..54d4e484e9 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|e|x|t| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|o|p|l|e|f|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@58 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o| +0#0000000&@57 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|l|e|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|a|p| +0#0000000&@56 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55 @57|1@2|7|,|1| @7|9|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump index fe75432d19..5d3070de16 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|a|p| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|s|i|l|e|n|t| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|p|d|a|t|e| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|g|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@49 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@54 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@54 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@54 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@54 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|m|e|n|u| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|e|w| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 @57|1@1|3|5|,|1| @7|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump index d84bf6a3b5..64c9f4dc3d 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|s|p|l|i|t| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@56 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@56 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|N|e|x|t| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|h|i|l|e| +0#0000000&@56 @@ -16,5 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|q|a|l@1| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|u|n|d|o| +0#0000000&@56 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58 @57|1@1|5|3|,|1| @7|9|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump index a85dd4f72b..51b2aa18f2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58 +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|a|l@1| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p| +0#0000000&@57 -|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@56 ->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@53 +>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|u|n|m|a|p| +0#0000000&@55 @@ -16,5 +17,4 @@ @75 |:|a|b|s|t|r|a|c|t| @65 |:|c|l|a|s@1| @68 -|:|e|n|d|c|l|a|s@1| @65 @57|1@1|7|1|,|1| @7|9|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump index dd64f779b2..ab374c22c7 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump @@ -1,9 +1,10 @@ -|:+0&#ffffff0|e|n|d|c|l|a|s@1| @65 +|:+0&#ffffff0|c|l|a|s@1| @68 +|:|e|n|d|c|l|a|s@1| @65 |:|e|n|d|i|n|t|e|r|f|a|c|e| @61 |:|e|n|d|e|n|u|m| @66 |:|e|n|u|m| @69 -|:|e|x|p|o|r|t| @67 ->:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68 +>:|e|x|p|o|r|t| @67 +|:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68 |:|i|n|t|e|r|f|a|c|e| @64 |:|p|u|b|l|i|c| @67 |:|s|t|a|t|i|c| @67 @@ -16,5 +17,4 @@ |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|e|n|u|m| @59 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|i|n|t|e|r|f|a|c|e| @54 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|u|m| @62 -|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60 @57|1@1|8|9|,|1| @7|9@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump index c21adbc0f4..7677b76cb1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump @@ -1,9 +1,10 @@ -|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60 +|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|u|m| @62 +|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l| +0#0000000&@61 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i|n|t|e|r|f|a|c|e| @57 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p|u|b|l|i|c| @60 -|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s|t|a|t|i|c| @60 ->F|o@1|(+0#e000e06&|)| +0#0000000&||| |t|y|p|e| @62 +>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s|t|a|t|i|c| @60 +|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t|y|p|e| @62 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|a|r| +0#0000000&@63 @75 |~+0#4040ff13&| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|2|0|7|,|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump index 479c44aa7a..17af170e19 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|b|u|g@1|r|e@1|d|y| |c|o|m@1|a|n|d| +0#0000000&@48 @75 +@75 |d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@63 |0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@62 @75 @@ -16,5 +17,4 @@ @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 @75 -@2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump index d1aa252102..a850ee8b68 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@60 +| +0&#ffffff0@1|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@61 +@2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@60 @75 @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 -@75 -@2>d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +> @74 +@2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 @@ -16,5 +17,4 @@ @75 @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 -|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 -@57|1|9|,|3| @9|9|2|%| +@57|1|9|,|0|-|1| @7|8|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump index 7bb07b6c50..357f8bb297 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump @@ -1,4 +1,5 @@ -|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68 +| +0&#ffffff0@1|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 > @74 |~+0#4040ff13&| @73 |~| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|3@1|,|0|-|1| @7|B|o|t| +| +0#0000000&@56|3|4|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_00.dump index 4bc88584b5..2f87f33053 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_00.dump @@ -1,7 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|f| |c|o|m@1|a|n|d| +0#0000000&@56 @75 @75 -|"+0#0000e05&| |l|i|s|t| +0#0000000&@68 +|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 @75 |d+0#af5f00255&|e|f| +0#0000000&@71 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1| @67 @@ -13,7 +13,7 @@ |d+0#af5f00255&|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@57 @75 @75 -|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62 +|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62 @75 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_01.dump index d97b992c5f..f13f4f4e3c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_01.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62 +|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62 @75 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56 >d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_03.dump b/runtime/syntax/testdir/dumps/vim_ex_def_03.dump index 6ba5f46f89..4ab6ef5e9b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_03.dump @@ -11,7 +11,7 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 @75 -|"+0#0000e05&| |r|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@60 +|"+0#0000e05&| |R|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@60 @75 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@59 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_05.dump b/runtime/syntax/testdir/dumps/vim_ex_def_05.dump index de9ae6d322..6519226746 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_05.dump @@ -4,7 +4,7 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@58 @75 > @74 -|"+0#0000e05&| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@62 +|"+0#0000e05&| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@62 @75 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |z+0#00e0e07&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|z|e|d|"|)+0#e000e06&| +0#0000000&@31 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_06.dump b/runtime/syntax/testdir/dumps/vim_ex_def_06.dump index 265237c68d..3c4b3ab06c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_06.dump @@ -3,7 +3,7 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 @75 ->"+0#0000e05&| |c|o|m@1|e|n|t|s| +0#0000000&@64 +>"+0#0000e05&| |C|o|m@1|e|n|t|s| +0#0000000&@64 @75 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65 @2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51 @@ -11,7 +11,7 @@ |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 @75 -|"+0#0000e05&| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47 +|"+0#0000e05&| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@52 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_07.dump b/runtime/syntax/testdir/dumps/vim_ex_def_07.dump index 897c72bd82..87f3964bd0 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_07.dump @@ -1,5 +1,5 @@ | +0&#ffffff0@74 -|"+0#0000e05&| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55 +|"+0#0000e05&| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55 @75 |s+0#af5f00255&|i|l|e|n|t|!| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@57 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump index f48fb87ba3..cbf57d74a4 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump @@ -3,7 +3,7 @@ | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|i|s|t| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|i|s|t| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&@69 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| @65 @@ -15,6 +15,6 @@ | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump index 00af38d1f3..50073ed433 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump @@ -2,7 +2,7 @@ | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@54 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump index e9e3fead5d..39f91a710f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump @@ -13,7 +13,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |r|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@58 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |R|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@58 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@57 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump index 9879004139..6177af78e2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump @@ -6,7 +6,7 @@ ||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&|#| |c|o|m@1|e|n|t| @56 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |z+0#00e0e07&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|z|e|d|"|)+0#e000e06&| +0#0000000&@29 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump index 4be99795ab..f2045053d1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|e|n|t|s| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|e|n|t|s| +0#0000000&@62 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@49 @@ -8,13 +8,13 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |s+0#af5f00255#ffffff0|i|l|e|n|t|!| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@55 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@50 @57|1|0|8|,|3| @8|6|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump index 0a2fc33d59..698735cb4f 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump @@ -2,7 +2,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |f|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |F|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@62 diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump index d9f765d07a..9fe6696f43 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump @@ -2,6 +2,7 @@ |#+0#0000e05&| |V|i|m|9| |:|d|e|f| |c|o|m@1|a|n|d| |(|n|e|s|t|e|d|)| +0#0000000&@46 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36 @75 +@75 |c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t| @64 @4|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|a|m|e|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@52 @75 @@ -16,5 +17,4 @@ @75 | +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 -|e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump index e85f7ed9f9..0fc35aaf48 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump @@ -1,11 +1,13 @@ -| +0&#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45 +| +0&#ffffff0@74 +@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 @75 | +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48 -@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 ->e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 +@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 +|e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@59 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|9|,|1| @9|B|o|t| +| +0#0000000&@56|1|9|,|5| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump index 1b71d3a0a4..26c48152e8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump @@ -1,10 +1,10 @@ | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|d|e|f| |c|o|m@1|a|n|d| |(|n|e|s|t|e|d|)| +0#0000000&@44 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|f|'| +0#0000000&@29 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@34 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@34 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|T|e|s|t| @62 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|a|m|e|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @@ -12,9 +12,9 @@ | @1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump index 1a8bd425bc..077f03dcbf 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump @@ -9,7 +9,7 @@ |e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&|"+0#e000002&|A|n|s|w|e|r| |=| |"| +0#0000000&|4+0#e000002&|2| +0#0000000&@48 @75 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45 @75 |"+0#0000e05&| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@61 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||+0#af5f00255&@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59 diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump index efc9170642..f23db5d580 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump @@ -12,7 +12,7 @@ |e+0#af5f00255&|c|h|o|h|l| +0#0000000&|W+0#00e0003&|a|r|n|i|n|g|M|s|g| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|D|o|n|'|t| |p|a|n|i|c|!|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|h|l| +0#0000000&|N+0#00e0003&|o|n|e| +0#0000000&@21 @75 @75 -|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 +|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|A|n|s|w|e|r| |=| |"| +0#0000000&@58 @5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@59 diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump index 7cc91d41c8..54b1cfe704 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump @@ -6,7 +6,7 @@ @6>\+0#e000e06&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64 @75 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47 @75 |"+0#0000e05&| |:|e|c|h|o| |w|i|t|h|o|u|t| |{|e|x|p|r|}| +0#0000000&@52 |e+0#af5f00255&|c|h|o||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump b/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump index 657b6f16ab..8e9af8ec72 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump @@ -4,7 +4,7 @@ |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|'+0#e000002&|w|h|i|l|e| |i| |<| |5| ||| |e|c|h|o| |i| ||| |l|e|t| |i| |=| |i| |+| |1| ||| |e|n|d|w|h|i|l|e|'| +0#0000000&@17 @75 > @74 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45 @75 |"+0#0000e05&| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@61 |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||+0#af5f00255&@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|N|o|t|F|o@1|"| +0#0000000&@37 diff --git a/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump b/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump index 7b33708651..f93db78945 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 +|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 @75 |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|"+0#e000002&|c|a|l@1|"| +0#0000000&@60 @6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @@ -12,7 +12,7 @@ @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|F|o@1|(|)|"| +0#0000000&@59 @75 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47 @75 |"+0#0000e05&| |:|e|x|e|c|u|t|e| |w|i|t|h|o|u|t| |{|e|x|p|r|}| +0#0000000&@49 |e+0#af5f00255&|x|e|c|u|t|e||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@55 diff --git a/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump b/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump index 345ef7adcd..0aaf0eb6a0 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump @@ -1,5 +1,5 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|f|i|l|t|e|r| |c|o|m@1|a|n|d| +0#0000000&@53 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31 @75 @75 |f+0#af5f00255&|i|l|t|e|r| +0#0000000&@1|p|a|\+0#e000e06&|%|(|t+0#0000000&@1|\+0#e000e06&|)|e+0#0000000&|r|n| @1|o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@44 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_00.dump index 5c67fd858e..e6f67d5b30 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_00.dump @@ -1,7 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |c|o|m@1|a|n|d| +0#0000000&@51 @75 @75 -|"+0#0000e05&| |l|i|s|t| +0#0000000&@68 +|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@66 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1| @62 @@ -13,7 +13,7 @@ |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@52 @75 @75 -|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62 +|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62 @75 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_01.dump index 1523d7467b..c009a805c3 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_01.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62 +|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62 @75 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56 >f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_06.dump b/runtime/syntax/testdir/dumps/vim_ex_function_06.dump index ad75d36a1d..6eaeddd8ab 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_06.dump @@ -8,7 +8,7 @@ |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 @75 -|"+0#0000e05&| |m|o|d|i|f|i|e|r|s| +0#0000000&@63 +|"+0#0000e05&| |M|o|d|i|f|i|e|r|s| +0#0000000&@63 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|r+0#e000e06&|a|n|g|e| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_10.dump b/runtime/syntax/testdir/dumps/vim_ex_function_10.dump index cd29b7495f..3a384803f2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_10.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_10.dump @@ -1,7 +1,7 @@ |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 @75 @75 -|"+0#0000e05&| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@62 +|"+0#0000e05&| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@62 @75 >f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|,+0#0000000&| |z+0#00e0e07&|,+0#0000000&| |.+0#00e0e07&@2|)+0#e000e06&| +0#0000000&@48 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&|2| +0#0000000&@63 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_12.dump b/runtime/syntax/testdir/dumps/vim_ex_function_12.dump index 8968153f9f..7b3b789ae3 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_12.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_12.dump @@ -6,7 +6,7 @@ >e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 @75 -|"+0#0000e05&| |a|r|g|u|m|e|n|t|s| +0#0000000&@63 +|"+0#0000e05&| |A|r|g|u|m|e|n|t|s| +0#0000000&@63 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|,+0#0000000&| |b+0#00e0e07&|,+0#0000000&| |c+0#00e0e07&|)+0#e000e06&| +0#0000000&@53 @2|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|a| +0#0000000&|a+0#00e0e07&|:|b| +0#0000000&|a+0#00e0e07&|:|c| +0#0000000&@56 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_13.dump b/runtime/syntax/testdir/dumps/vim_ex_function_13.dump index 066f06c6e8..69be8a98f1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_13.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_13.dump @@ -9,7 +9,7 @@ |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 @75 -|"+0#0000e05&| |c|o|m@1|e|n|t|s| +0#0000000&@64 +|"+0#0000e05&| |C|o|m@1|e|n|t|s| +0#0000000&@64 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 @2|"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@49 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump index 6d0e2d7f91..0096229877 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump @@ -1,12 +1,12 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55 +|"+0#0000e05&| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55 @75 |s+0#af5f00255&|i|l|e|n|t|!| +0#0000000&|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@52 >e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 @75 -|"+0#0000e05&| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47 +|"+0#0000e05&| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@47 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump index 9e7ba32823..82bdf388dd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump @@ -1,6 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t| |e|r@1|o|r|s| +0#0000000&@30 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34 @75 +@75 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @@ -16,5 +17,4 @@ @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @75 -|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump index 08abcfe8d4..c76fa06e43 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62 +| +0&#ffffff0@1|f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@8|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37 +@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 -@75 ->d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37 +> @74 +|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37 @2|d+0#af5f00255&|e|f| +0#0000000&|D|o|T|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@8|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34 @@ -16,5 +17,4 @@ @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@25|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34 -@75 -@57|1|9|,|1| @9|5|4|%| +@57|1|9|,|0|-|1| @7|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump index 9c2a4666f5..025986f526 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump @@ -1,20 +1,20 @@ -| +0&#ffffff0@74 +|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@25|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34 +@75 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|6|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37 @2|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@6|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|6+0#e000002&| +0#0000000&@62 -@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34 -@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54 +@2>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34 +@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34 @75 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&|-+0#af5f00255&|>|r+0#00e0e07&|e|v|e|r|s|e|(+0#e000e06&|)| +0#0000000&@43 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@48 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|d|e|l|f|u|n|c|t|i|o|n| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|'+0#e000002&| +0#0000000&@43 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|3|7|,|3| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump index 8aa59de78b..111094edcd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump @@ -1,6 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t|s| +0#0000000&@36 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34 @75 +@75 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|"+0#0000e05&| |f|u|n| +0#0000000&@37 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @@ -16,5 +17,4 @@ @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @75 -|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump index 12268cdd59..0049aeddc3 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62 +| +0&#ffffff0@1|f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@8|"+0#0000e05&| |f|u|n| +0#0000000&@37 +@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 -@75 ->d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37 +> @74 +|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37 @2|d+0#af5f00255&|e|f| +0#0000000&|D|o|T|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@8|#+0#0000e05&| |d|e|f| +0#0000000&@37 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&| +0#0000000&@62 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34 @@ -16,5 +17,4 @@ @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@25|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34 -@75 -@57|1|9|,|1| @9|5|4|%| +@57|1|9|,|0|-|1| @7|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump index c948b6cc76..ae919ba17b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump @@ -1,20 +1,20 @@ -| +0&#ffffff0@74 +|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@25|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34 +@75 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|6|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|"+0#0000e05&| |f|u|n| +0#0000000&@37 @2|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@6|#+0#0000e05&| |d|e|f| +0#0000000&@37 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|6+0#e000002&| +0#0000000&@62 -@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34 -@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54 +@2>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34 +@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34 @75 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&|-+0#af5f00255&|>|r+0#00e0e07&|e|v|e|r|s|e|(+0#e000e06&|)| +0#0000000&@43 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@48 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|d|e|l|f|u|n|c|t|i|o|n| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|'+0#e000002&| +0#0000000&@43 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|3|7|,|3| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump index 2266ae01f0..4fa7e437ae 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump @@ -3,7 +3,7 @@ | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|i|s|t| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|i|s|t| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&@64 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| @60 @@ -15,6 +15,6 @@ | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump index ac29b85312..78eef92c4c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump @@ -2,7 +2,7 @@ | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@54 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump index 8a38361afe..4ad53bda38 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump @@ -10,7 +10,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |m|o|d|i|f|i|e|r|s| +0#0000000&@61 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |M|o|d|i|f|i|e|r|s| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|r+0#e000e06&|a|n|g|e| +0#0000000&@52 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump index 091bed6bec..065c637055 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump @@ -3,7 +3,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@60 +| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@60 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|,+0#0000000&| |z+0#00e0e07&|,+0#0000000&| |.+0#00e0e07&@2|)+0#e000e06&| +0#0000000&@46 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&|2| +0#0000000&@61 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump index ab806b1b33..b118773bb5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump @@ -8,7 +8,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |a|r|g|u|m|e|n|t|s| +0#0000000&@61 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |A|r|g|u|m|e|n|t|s| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|,+0#0000000&| |b+0#00e0e07&|,+0#0000000&| |c+0#00e0e07&|)+0#e000e06&| +0#0000000&@51 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|a| +0#0000000&|a+0#00e0e07&|:|b| +0#0000000&|a+0#00e0e07&|:|c| +0#0000000&@54 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump index 96bd8fc1d7..a73c91e526 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump @@ -10,7 +10,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|e|n|t|s| +0#0000000&@62 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|e|n|t|s| +0#0000000&@62 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@47 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump index 94063c1d55..e64fe80c85 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump @@ -1,13 +1,13 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| >s+0#af5f00255#ffffff0|i|l|e|n|t|!| +0#0000000&|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@50 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@45 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump index 02db046de5..48a877e159 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump @@ -3,7 +3,7 @@ ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c| +0#0000000&@65 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |f|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52 +| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |F|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|"+0#0000e05&| |e|n|d|f|u|n|c|t|i|o|n| +0#0000000&@57 diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump index 6f0ca86a2e..dd0f87a923 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|f| |a|n|d| |:|f|u|n|c|t|i|o|n| |c|o|m@1|a|n|d|s| |(|n|e|s|t|e|d|)| +0#0000000&@32 @75 +@75 |d+0#af5f00255&|e|f| +0#0000000&|F|u|n|A|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@56 @4|d+0#af5f00255&|e|f| +0#0000000&|D|o|F|u|n|A|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.|"| +0#0000000&@56 @@ -16,5 +17,4 @@ @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|B|(+0#e000e06&|)| +0#0000000&@55 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 -|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump index 640bdf5545..1f035effe5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@3|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59 +| +0&#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@1|"| +0#0000000&@55 +@4|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59 @75 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|B|(+0#e000e06&|)| +0#0000000&@55 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 -@75 ->f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59 +> @74 +|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59 @4|d+0#af5f00255&|e|f| +0#0000000&|D|o|F|u|n|C|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@54 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64 @@ -16,5 +17,4 @@ @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@3|"| +0#0000000&@53 @4|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59 @75 -@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55 -@57|1|9|,|1| @9|6|8|%| +@57|1|9|,|0|-|1| @7|6|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump index e60a27796b..6061a76568 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump @@ -1,10 +1,12 @@ -| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55 +| +0&#ffffff0@74 +@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|A|(+0#e000e06&|)| +0#0000000&@63 -|e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@63 ->e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@63 +>e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@63 +|e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@63 |e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|D|(+0#e000e06&|)| +0#0000000&@63 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|3|7|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump index 7d658b742c..85ca3ef50b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump @@ -2,6 +2,7 @@ | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|f|'| +0#0000000&@29 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@34 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |++0#0000e05#a8a8a8255| |+|-@1| @1|7| |l|i|n|e|s|:| |d|e|f| |F|u|n|A|(|)|:| |s|t|r|i|n|g|-@40 | @1| +0#0000000#ffffff0@72 |++0#0000e05#a8a8a8255| |+|-@1| @1|7| |l|i|n|e|s|:| |d|e|f| |F|u|n|B|(|)|:| |s|t|r|i|n|g|-@40 @@ -14,7 +15,6 @@ | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@61 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@61 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|D|(+0#e000e06&|)| +0#0000000&@61 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |~+0#4040ff13&| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump index c23ec04d23..702882a714 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump @@ -16,5 +16,5 @@ |l+0#af5f00255&|g|r|e|p|a|d@1|!| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| @45 @75 @75 -|"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 +|"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump index 4bfb61327a..fd6df33d5a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump @@ -3,7 +3,7 @@ |l+0#af5f00255&|g|r|e|p|a|d@1|!| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| @45 @75 @75 ->"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 +>"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 @75 |g+0#af5f00255&|r|e|p| +0#0000000&@1|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |%| @55 |l+0#af5f00255&|g|r|e|p| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |%| @55 diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump index bce2ea4096..0dd1030c50 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43 @75 |g+0#af5f00255&|r|e|p| +0#0000000&@1|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@36 >l+0#af5f00255&|g|r|e|p| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@36 diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump index e58e4b0c8d..8e32efb164 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump @@ -2,7 +2,7 @@ |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|H|i|G|r|o|u|p| |T|o|d|o| +0#0000000&@34 @75 @75 -|"+0#0000e05&| |l|i|s|t| +0#0000000&@68 +|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@65 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@57 @@ -11,10 +11,10 @@ |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@61 @75 @75 -|"+0#0000e05&| |r|e|s|e|t| +0#0000000&@67 +|"+0#0000e05&| |R|e|s|e|t| +0#0000000&@67 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&@59 @75 @75 -|"+0#0000e05&| |d|i|s|a|b|l|e| +0#0000000&@65 +|"+0#0000e05&| |D|i|s|a|b|l|e| +0#0000000&@65 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump index 6a593e7745..0e3ab04015 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump @@ -1,9 +1,9 @@ -|"+0#0000e05#ffffff0| |r|e|s|e|t| +0#0000000&@67 +|"+0#0000e05#ffffff0| |R|e|s|e|t| +0#0000000&@67 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&@59 @75 @75 ->"+0#0000e05&| |d|i|s|a|b|l|e| +0#0000000&@65 +>"+0#0000e05&| |D|i|s|a|b|l|e| +0#0000000&@65 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@51 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&|C+0#00e0003&|o|n|c|e|a|l| +0#0000000&@51 @@ -16,5 +16,5 @@ |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|N+0#00e0003&|O|N|E| +0#0000000&@56 @75 @75 -|"+0#0000e05&| |a|d@1|/|m|o|d|i|f|y| +0#0000000&@62 +|"+0#0000e05&| |A|d@1|/|m|o|d|i|f|y| +0#0000000&@62 @57|1|9|,|1| @9|1|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump index a06876473b..f91917d432 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump @@ -1,4 +1,4 @@ -|"+0#0000e05#ffffff0| |a|d@1|/|m|o|d|i|f|y| +0#0000000&@62 +|"+0#0000e05#ffffff0| |A|d@1|/|m|o|d|i|f|y| +0#0000000&@62 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&|c+0#00e0003&|t|e|r|m|=+0#0000000&|u+0#e000e06&|n|d|e|r|l|i|n|e| +0#0000000&@41 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|n|c|e|a|l| +0#0000000&|c+0#00e0003&|t|e|r|m|=+0#0000000&|u+0#e000e06&|n|d|e|r|l|i|n|e| +0#0000000&@41 @@ -11,7 +11,7 @@ |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&|t+0#00e0003&|e|r|m|=+0#0000000&|b+0#e000e06&|o|l|d| +0#0000000&@42 @75 @75 -|"+0#0000e05&| |l|i|n|k| +0#0000000&@68 +|"+0#0000e05&| |L|i|n|k| +0#0000000&@68 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@48 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@47 diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump index d82e771d6d..f5da0db9b0 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump @@ -3,7 +3,7 @@ |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&@46 @75 @75 ->"+0#0000e05&| |d|e|f|a|u|l|t| |l|i|n|k| +0#0000000&@60 +>"+0#0000e05&| |D|e|f|a|u|l|t| |l|i|n|k| +0#0000000&@60 @75 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@40 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@39 @@ -13,7 +13,7 @@ |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&@38 @75 @75 -|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |a|n|d| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@33 +|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |a|n|d| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@33 @75 |h+0#af5f00255&|i| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@64 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump index af1ff53a8a..5b8263a2c7 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump @@ -1,7 +1,7 @@ ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |t|r|i|m| +0#0000000&@66 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |T|r|i|m| +0#0000000&@66 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| >l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65 @@ -14,7 +14,7 @@ ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@57 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |I|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@57 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52 @57|7|3|,|1| @9|2|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump index ca53c5f74e..cca169c05a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump @@ -1,6 +1,6 @@ ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| |(|e|s|c|a|p|e|d| |{| |a|n|d| |}|)| +0#0000000&@36 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |N|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| |(|e|s|c|a|p|e|d| |{| |a|n|d| |}|)| +0#0000000&@36 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52 ||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59 diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump index be981200aa..bfa037dedd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump @@ -5,7 +5,7 @@ ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |N|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61 diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump index e4f3f1e765..661c39eb69 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump @@ -10,7 +10,7 @@ ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump index 2c69f9ef1e..a65d1ff236 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump @@ -16,5 +16,5 @@ ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r|s| +0#0000000&@59 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r|s| +0#0000000&@59 @57|2|1|5|,|1| @8|9|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump index 12ff7d5b95..b69d31d850 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump @@ -1,4 +1,4 @@ -| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r|s| +0#0000000&@59 +| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r|s| +0#0000000&@59 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@48 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67 diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump index bda8d791b6..ab573500b7 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49 @75 +@75 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54 @75 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41 @@ -16,5 +17,4 @@ |"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| +0#0000000&@56 |<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| +0#0000000&@2 |c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4 -|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-|@+0#4040ff13&@2 -| +0#0000000&@56|1|,|1| @10|T|o|p| +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump index 2fb05a7f09..246775f5d2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump @@ -1,9 +1,10 @@ -|'+0&#ffffff0|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t| |c|o|l|u|m|n| +0#0000000&@33 +|a+0&#ffffff0| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54 +|'|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t| |c|o|l|u|m|n| +0#0000000&@33 @75 |"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| +0#0000000&@56 |<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| +0#0000000&@2 -|c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4 -><+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-| |h|e +>c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4 +|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-| |h|e |x|a|d|e|c|i|m|a|l| +0#0000000&@65 @75 |"+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@43 @@ -13,8 +14,7 @@ @1|e|n|t| +0#0000000&@70 |:| |"| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m @1|e|n|t| +0#0000000&@70 +@75 |~+0#4040ff13&| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.vim b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.vim deleted file mode 100644 index 546837cfb1..0000000000 --- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.vim +++ /dev/null @@ -1,2 +0,0 @@ -" Replace known non-Latin-1 characters. -%s+[“�]+?+ge diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump index 664947534f..4ecde124bb 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|||"|)+0#0000e05&| +0#0000000&@37 @75 +@75 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54 @75 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump index f0e5adc17f..d7911d86b5 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|:|"|)+0#0000e05&| +0#0000000&@37 @75 +@75 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54 @75 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_make_00.dump b/runtime/syntax/testdir/dumps/vim_ex_make_00.dump index 9de6731e94..f7bc47c7c8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_make_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_make_00.dump @@ -1,6 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|*|m|a|k|e| |c|o|m@1|a|n|d|s| +0#0000000&@53 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|M|a|k|e|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@18 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|k|e|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@25 @75 @75 |m+0#af5f00255&|a|k|e| +0#0000000&@70 @@ -16,5 +16,5 @@ |l+0#af5f00255&|m|a|k|e|!| +0#0000000&|-|o|p|t|i|o|n|s| |t|a|r|g|e|t| @52 @75 @75 -|"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 +|"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_make_01.dump b/runtime/syntax/testdir/dumps/vim_ex_make_01.dump index bd89d5abc3..570358cbba 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_make_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_make_01.dump @@ -3,13 +3,13 @@ |l+0#af5f00255&|m|a|k|e|!| +0#0000000&|-|o|p|t|i|o|n|s| |t|a|r|g|e|t| @52 @75 @75 ->"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 +>"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45 @75 |m+0#af5f00255&|a|k|e| +0#0000000&@1|%| @67 |l+0#af5f00255&|m|a|k|e| +0#0000000&|%| @67 @75 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43 @75 |m+0#af5f00255&|a|k|e| +0#0000000&@1|t|a|r|\+0#e000e06&|||g+0#0000000&|e|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 |l+0#af5f00255&|m|a|k|e| +0#0000000&|t|a|r|\+0#e000e06&|||g+0#0000000&|e|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_00.dump b/runtime/syntax/testdir/dumps/vim_ex_map_00.dump index 0f5ccdbffa..80b2d5353a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_00.dump @@ -1,20 +1,20 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|m|a|p| |c|o|m@1|a|n|d|s| +0#0000000&@55 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|L|h|s| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@29 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|R|h|s| |T|o|d|o| +0#0000000&@35 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|p|R|h|s|C|o|n|t|i|n|u|e| |T|o|d|o| +0#0000000&@27 +@75 @75 |m+0#af5f00255&|a|p|!| +0#0000000&@70 -|m+0#af5f00255&|a|p|!| +0#0000000&|l|h|s| |r|h|s| @62 +|m+0#af5f00255&|a|p|!| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@62 |m+0#af5f00255&|a|p| +0#0000000&@71 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |r|h|s| @63 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@63 @75 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>|<|e|x|p|r|>|<|n|o|w|a|i|t|>|<|s|c|r|i|p|t|>|<|s|i|l|e|n|t|>|<|s|p|e|c|i|a|l|>|<|u|n|i|q|u|e|>| +0#0000000&|l|h|s| |r|h|s| @7 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|n|o|w|a|i|t|>| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|<+0#e000e06&|u|n|i|q|u|e|>| +0#0000000&|l|h|s| |r|h|s| @1 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>|<|e|x|p|r|>|<|n|o|w|a|i|t|>|<|s|c|r|i|p|t|>|<|s|i|l|e|n|t|>|<|s|p|e|c|i|a|l|>|<|u|n|i|q|u|e|>| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@7 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|n|o|w|a|i|t|>| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|<+0#e000e06&|u|n|i|q|u|e|>| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@1 @75 |"+0#0000e05&| |:|m|a|p| |s|p|e|c|i|a|l| |a|r|g|u|m|e|n|t|s| |a|r|e| |c|a|s|e| |s|e|n|s|i|t|i|v|e|,| |<|B|U|F@1|E|R|>| |i|s| |t|h|e| |L|H|S| +0#0000000&@10 -|m+0#af5f00255&|a|p| +0#0000000&|<|B|U|F@1|E|R|>| |r|h|s| @58 -@75 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#0000000&|h|s| @5|r|h|s| @50 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|l+0#0000000&|h|s| |r|h|s| @50 -@75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|e|a|d|e|r|>|r+0#0000000&|h|s| @55 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000000&|h|s| @50 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#00e0e07&|B|U|F@1|E|R|>| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@58 @75 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#00e0e07&|h|s| +0#0000000&@5|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@50 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@50 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_01.dump b/runtime/syntax/testdir/dumps/vim_ex_map_01.dump index 51299511e9..b7b32c1863 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_01.dump @@ -1,10 +1,14 @@ -|m+0#af5f00255#ffffff0|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#0000000&|h|s| @5|r|h|s| @50 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|l+0#0000000&|h|s| |r|h|s| @50 +| +0&#ffffff0@74 +|"+0#0000e05&| |:|m|a|p| |s|p|e|c|i|a|l| |a|r|g|u|m|e|n|t|s| |a|r|e| |c|a|s|e| |s|e|n|s|i|t|i|v|e|,| |<|B|U|F@1|E|R|>| |i|s| |t|h|e| |L|H|S| +0#0000000&@10 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#00e0e07&|B|U|F@1|E|R|>| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@58 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|e|a|d|e|r|>|r+0#0000000&|h|s| @55 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000000&|h|s| @50 -> @74 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|P|l|u|g|>|r+0#0000000&|h|s| @57 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#00e0e07&|h|s| +0#0000000&@5|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@50 +>m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@50 +@75 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@55 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@50 +@75 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|<+0#e000e06&|P|l|u|g|>|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@57 @75 |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@1|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 |m+0#af5f00255&|a|p|c|l|e|a|r|!| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 @@ -13,8 +17,4 @@ |x+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 |s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 |o+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -|i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -|l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -@57|1|9|,|0|-|1| @7|1|3|%| +@57|1|9|,|1| @9|1|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_02.dump b/runtime/syntax/testdir/dumps/vim_ex_map_02.dump index a05d8a2945..07257b6db3 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_02.dump @@ -1,20 +1,20 @@ -|t+0#af5f00255#ffffff0|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 -@75 +|o+0#af5f00255#ffffff0|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 +|i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 +|l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 +|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 +|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56 +> @74 @75 |"+0#0000e05&| |:|h|e|l|p| |m|a|p|-|b|a|r| +0#0000000&@59 @75 ->"+0#0000e05&| |<|B|a|r|>| @4|'|<|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37 -|m+0#af5f00255&|a|p| +0#0000000&|_|l| |:|!|l|s| |<+0#e000e06&|B|a|r|>| +0#0000000&|m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@35 +|"+0#0000e05&| |<|B|a|r|>| @4|'|<|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37 +|m+0#af5f00255&|a|p| +0#0000000&|_+0#00e0e07&|l| +0#0000000&|:+0#0000001#ffff4012|!|l|s| |<+0#e000e06#ffffff0|B|a|r|>| +0#0000001#ffff4012|m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@35 |"+0#0000e05&| |\||| @7|'|b|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37 -|m+0#af5f00255&|a|p| +0#0000000&|_|l| |:|!|l|s| |\||| |m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@38 +|m+0#af5f00255&|a|p| +0#0000000&|_+0#00e0e07&|l| +0#0000000&|:+0#0000001#ffff4012|!|l|s| |\||| |m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@38 |"+0#0000e05&| |^|V||| @6|a|l|w|a|y|s|,| |i|n| |V|i|m| |a|n|d| |V|i| +0#0000000&@41 -|m+0#af5f00255&|a|p| +0#0000000&|_|l| |:|!|l|s| |^+0#0000e05&|V||+0#0000000&| |m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@37 +|m+0#af5f00255&|a|p| +0#0000000&|_+0#00e0e07&|l| +0#0000000&|:+0#0000001#ffff4012|!|l|s| |^+0#0000e05#ffffff0|V||+0#0000001#ffff4012| |m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@37 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |:|s|e|a|r|c|h|(|'|f|o@1|\@1|||b|a|r|'|)|<+0#e000e06&|C|R|>|:+0#0000000&|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@27 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|:+0#0000001#ffff4012|s|e|a|r|c|h|(|'|f|o@1|\@1|||b|a|r|'|)|<+0#e000e06#ffffff0|C|R|>|:+0#0000001#ffff4012|e|c|h|o| |"|r|h|s|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@27 @75 @75 -|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59 -@75 -|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#0000000&|a|z| @59 -@2|\+0#e000e06&| +0#0000000&|:|e|c|h|o| |(|<+0#e000e06&|B|a|r|>| +0#0000000&@58 -@57|3|7|,|1| @9|3|1|%| +@57|3|7|,|0|-|1| @7|2|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_03.dump b/runtime/syntax/testdir/dumps/vim_ex_map_03.dump index d6dbe57398..86d4d0ae59 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_03.dump @@ -1,20 +1,20 @@ -| +0&#ffffff0@1|\+0#e000e06&| +0#0000000&|:|e|c|h|o| |(|<+0#e000e06&|B|a|r|>| +0#0000000&@58 -@2|\+0#e000e06&| +0#0000000&@71 -@2|\+0#e000e06&|'+0#0000000&|b|a|r|'|)|<+0#e000e06&|C|R|>| +0#0000000&@61 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0&#ffffff0@74 +|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59 @75 ->m+0#af5f00255&|a|p| +0#0000000&|l|h|s| @67 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60 +|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#00e0e07&|a|z| +0#0000000&@59 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|:|e|c|h|o| |(|<+0#e000e06#ffffff0|B|a|r|>| +0#0000000&@58 +| +0#0000001#ffff4012@1>\+0#e000e06#ffffff0| +0#0000000&@71 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0|'+0#0000001#ffff4012|b|a|r|'|)|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@61 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| @67 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&@67 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|e|c|h|o| |"|f|o@1|"| +0#0000000#ffffff0@60 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s|^+0#0000e05&|V| +0#0000000&@65 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&@67 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|e|c|h|o| |"|f|o@1|"| +0#0000000#ffffff0@60 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|s| @64 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@57|5@1|,|1| @9|4|9|%| +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s|^+0#0000e05&|V| +0#00e0e07&| +0#0000000&@64 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +@57|5@1|,|3| @9|4|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_04.dump b/runtime/syntax/testdir/dumps/vim_ex_map_04.dump index feb06ed1e0..c742d09742 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_04.dump @@ -1,20 +1,20 @@ -| +0&#ffffff0@1|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|e|c|h|o| |"|f|o@1|"| +0#0000000#ffffff0@60 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|s| @64 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2>\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|^+0#0000e05&|V| +0#00e0e07&|h|s| +0#0000000&@64 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1>\+0#e000e06#ffffff0| +0#0000001#ffff4012|e|c|h|o| |"|f|o@1|"| +0#0000000#ffffff0@60 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |r|h|s| @63 -|m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|^+0#0000e05&|V| +0#0000000&|s|^+0#0000e05&|V| +0#0000000&@1|r|h|s| @54 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|^+0#0000e05&|V| +0#00e0e07&|h|s| +0#0000000&@64 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|e|c|h|o| |"|f|o@1|"| +0#0000000#ffffff0@60 @75 -|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| @67 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| |(|m|a|t|c|h|e|s| |a|s| |R|H|S| |b|u|t| |h|a|r|m|l|e|s@1|)| +0#0000000&@32 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@63 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|^+0#0000e05&|V| +0#00e0e07&|h|^+0#0000e05&|V| +0#00e0e07&|s|^+0#0000e05&|V| +0#00e0e07&| +0#0000000&|r+0#0000001#ffff4012|h|s| +0#0000000#ffffff0@54 +@75 +|m+0#af5f00255&|a|p| +0#0000000&|l+0#00e0e07&|h|s| +0#0000000&@67 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| |(|m|a|t|c|h|e|s| |a|s| |R|H|S| |b|u|t| |h|a|r|m|l|e|s@1|)| +0#0000000&@32 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|c|l|e|a|r|"| +0#0000000&@62 @75 @75 -|"+0#0000e05&| |D|i|f@1|e|r|e|n|t|i|a|t|e| |m|a|p|(|)| |f|r|o|m| |:|m|a|p| +0#0000000&@43 -@75 -|m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@46 -@75 -@57|7|3|,|3| @9|6|7|%| +@57|7|3|,|3| @9|6|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_05.dump b/runtime/syntax/testdir/dumps/vim_ex_map_05.dump index b7727950c5..c3765cea2a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_05.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@51 +|"+0#0000e05&| |D|i|f@1|e|r|e|n|t|i|a|t|e| |m|a|p|(|)| |f|r|o|m| |:|m|a|p| +0#0000000&@43 +@75 +|m+0#af5f00255&|a|p| +0#0000000&|(+0#00e0e07&| +0#0000000&|:+0#0000001#ffff4012|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@46 +@75 +>c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@50 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 -@2>m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@44 +@2|m+0#af5f00255&|a|p| +0#0000000&|(+0#00e0e07&| +0#0000000&|:+0#0000001#ffff4012|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@44 @2|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@49 @2|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@48 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @75 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65 -@2|m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@44 +@2|m+0#af5f00255&|a|p| +0#0000000&|(+0#00e0e07&| +0#0000000&|:+0#0000001#ffff4012|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@44 @2|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@54 @2|#+0#0000e05&| |:|m|a|p| |L|H|S|=|(|l|i|s|t|,| |R|H|S|=|'|v|:|v|a|l|'|)| +0#0000000&@42 -@2|m+0#af5f00255&|a|p| +0#0000000&|(|l|i|s|t|,| |'|v|:|v|a|l|'|)| @53 -|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 -@75 -@75 -|"+0#0000e05&| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59 -@57|9|1|,|3| @9|8|5|%| +@2|m+0#af5f00255&|a|p| +0#0000000&|(+0#00e0e07&|l|i|s|t|,| +0#0000000&|'+0#0000001#ffff4012|v|:|v|a|l|'|)| +0#0000000#ffffff0@53 +@57|9|1|,|1| @9|8|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_06.dump b/runtime/syntax/testdir/dumps/vim_ex_map_06.dump index f047296918..4e5b057440 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_map_06.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_map_06.dump @@ -1,20 +1,20 @@ -|"+0#0000e05#ffffff0| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59 +| +0&#ffffff0@1|m+0#af5f00255&|a|p| +0#0000000&|(+0#00e0e07&|l|i|s|t|,| +0#0000000&|'+0#0000001#ffff4012|v|:|v|a|l|'|)| +0#0000000#ffffff0@53 +|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 -|n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|f+0#0000000&|o@1| |:|e|c|h|o| |c|a|l@1|(| @42 -@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62 -@2|\+0#e000e06&| +0#0000000&|{|x|-|>|x|}|,| @63 -@2>\+0#e000e06&| +0#0000000&|[|'|f|o@1|'|]|)|<+0#e000e06&|C|R|>| +0#0000000&@58 @75 -|n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#0000000&|a|r| |:|e|c|h|o| |(| @46 -@2|\+0#e000e06&| +0#0000000&@71 -@2|\+0#e000e06&| +0#0000000&|'|b|a|r|'|)|<+0#e000e06&|C|R|>| +0#0000000&@60 +|"+0#0000e05&| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59 +> @74 +|n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|f+0#00e0e07&|o@1| +0#0000000&|:+0#0000001#ffff4012|e|c|h|o| |c|a|l@1|(| +0#0000000#ffffff0@42 +| +0#0000001#ffff4012@1|"+0#0000e05#ffffff0|\| |c|o|m@1|e|n|t| +0#0000000&@62 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|{|x|-|>|x|}|,| +0#0000000#ffffff0@63 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|[|'|f|o@1|'|]|)|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@58 +@75 +|n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#00e0e07&|a|r| +0#0000000&|:+0#0000001#ffff4012|e|c|h|o| |(| +0#0000000#ffffff0@46 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000000&@71 +| +0#0000001#ffff4012@1|\+0#e000e06#ffffff0| +0#0000001#ffff4012|'|b|a|r|'|)|<+0#e000e06#ffffff0|C|R|>| +0#0000000&@60 @75 @75 |"+0#0000e05&| +0#0000000&|E+0#e000e06&|x|a|m|p|l|e|:| +0#0000000&@64 |"+0#0000e05&| @2|/|a|u|t|o|l|o|a|d|/|n|e|t|r|w|.|v|i|m| +0#0000000&@51 @75 -|i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|m|a|p|t|o|(+0#e000e06&|'+0#e000002&|<|P|l|u|g|>|N|e|t|r|w|O|p|e|n|F|i|l|e|'|)+0#e000e06&| +0#0000000&@9|||n+0#af5f00255&|m|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|n|o|w|a|i -|t|>| +0#0000000&|%| |<+0#e000e06&|P|l|u|g|>|N+0#0000000&|e|t|r|w|O|p|e|n|F|i|l|e|||e+0#af5f00255&|n|d|i|f| +0#0000000&@44 -|~+0#4040ff13&| @73 -|~| @73 -| +0#0000000&@56|1|0|9|,|3| @8|B|o|t| +@57|1|0|9|,|0|-|1| @6|9|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_07.dump b/runtime/syntax/testdir/dumps/vim_ex_map_07.dump new file mode 100644 index 0000000000..c8476d82db --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_ex_map_07.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@74 +|i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|m|a|p|t|o|(+0#e000e06&|'+0#e000002&|<|P|l|u|g|>|N|e|t|r|w|O|p|e|n|F|i|l|e|'|)+0#e000e06&| +0#0000000&@9|||n+0#af5f00255&|m|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|n|o|w|a|i +|t|>| +0#0000000&|%+0#00e0e07&| +0#0000000&|<+0#e000e06&|P|l|u|g|>|N+0#0000001#ffff4012|e|t|r|w|O|p|e|n|F|i|l|e||+0#0000000#ffffff0|e+0#af5f00255&|n|d|i|f| +0#0000000&@44 +> @74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|2|4|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump index 09c82c465e..2c2d4c3dc1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|m|e|n|u| |c|o|m@1|a|n|d|s| +0#0000000&@54 @75 +@75 |"+0#0000e05&| |:|h|e|l|p| |d|i|s|a|b|l|e| |m|e|n|u|s| +0#0000000&@53 |m+0#af5f00255&|e|n|u| +0#0000000&|d+0#e000e06&|i|s|a|b|l|e| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|O|p|e|n|\|.|\|.|\|.| +0#0000000&@44 |a+0#af5f00255&|m|e|n|u| +0#0000000&|e+0#e000e06&|n|a|b|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&@60 @@ -16,5 +17,4 @@ @75 @75 |"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60 -|m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump index 9b60b2a128..bc17da919a 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump @@ -1,9 +1,10 @@ -|i+0#af5f00255#ffffff0|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|A|d@1|\| |V|a|r| +0#0000000&@8|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&| |<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @3 +|v+0#af5f00255#ffffff0|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|R|e|m|o|v|e|\| |V|a|r| +0#0000000&@5|"|z|y|:|u|n|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>| +0#0000000&@17 +|i+0#af5f00255&|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|A|d@1|\| |V|a|r| +0#0000000&@8|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&| |<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @3 |i+0#af5f00255&|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|R|e|m|o|v|e|\| |V|a|r| +0#0000000&@5|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|u|n|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @8 @75 @75 -|"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60 ->m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31 +>"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60 +|m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@22 @@ -16,5 +17,4 @@ @75 @75 |"+0#0000e05&| +0#0000000&|E+0#e000e06&|x|a|m|p|l|e|:| +0#0000e05&|r|u|n|t|i|m|e|/|m|e|n|u|.|v|i|m| |(|m|o|d|i|f|i|e|d|)| +0#0000000&@36 -|a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13 -@57|1|9|,|1| @9|1|9|%| +@57|1|9|,|1| @9|1|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump index a5c1acf071..83bb8c17e0 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump @@ -1,9 +1,10 @@ -|a+0#af5f00255#ffffff0|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13 +|"+0#0000e05#ffffff0| +0#0000000&|E+0#e000e06&|x|a|m|p|l|e|:| +0#0000e05&|r|u|n|t|i|m|e|/|m|e|n|u|.|v|i|m| |(|m|o|d|i|f|i|e|d|)| +0#0000000&@36 +|a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13 @75 |a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&@32 @8|\+0#e000e06&| +0#0000000&|:|i|f| |w|i|n|h|e|i|g|h|t|(|2|)| |<| |0| |&@1| |t|a|b|p|a|g|e|w|i|n@1|r|(|2|)| |=@1| |0| |<+0#e000e06&|B|a|r|>| +0#0000000&@14 -@8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |e|n|e|w| |<+0#e000e06&|B|a|r|>| +0#0000000&@44 -@8>\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54 +@8>\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |e|n|e|w| |<+0#e000e06&|B|a|r|>| +0#0000000&@44 +@8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55 @75 @@ -16,5 +17,4 @@ @8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43 -@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 -@57|3|7|,|2|-|9| @7|4|5|%| +@57|3|7|,|2|-|9| @7|4@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump index 2ba87490f3..84dd1599cd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump @@ -1,4 +1,5 @@ -| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43 +@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55 @75 |a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|i|f| |w|i|n|h|e|i|g|h|t|(|2|)| |<| |0| |&@1| |t|a|b|p|a|g|e|w @@ -16,5 +17,4 @@ @8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43 -@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 -@57|5|4|,|2|-|9| @7|7|0|%| +@57|5@1|,|2|-|9| @7|6|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump index 17236e2c89..9c99fb70a2 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43 +@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55 @75 @75 -|"+0#0000e05&| |p|o|p|u|p| |m|e|n|u|s| +0#0000000&@61 ->p+0#af5f00255&|o|p|u|p| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 +>"+0#0000e05&| |p|o|p|u|p| |m|e|n|u|s| +0#0000000&@61 +|p+0#af5f00255&|o|p|u|p| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 |p+0#af5f00255&|o|p|u|p|!| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 @75 @75 @@ -16,5 +17,4 @@ @8|(+0#e000e06&|r+0#00e0e07&|e|s|,+0#0000000&| |_+0#00e0e07&|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|{+0#e000e06&| +0#0000000&@53 @12|H|i|s|t|o|r|y|J|u|m|p|(+0#e000e06&|r+0#00e0e07&|e|s|.+0#af5f00255&|t+0#00e0e07&|e|x|t|)+0#e000e06&| +0#0000000&@41 @8|}+0#e000e06&|)| +0#0000000&@64 -|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 -@57|7|1|,|1| @9|9|5|%| +@57|7|1|,|1| @9|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump index 4d9e9cc798..d86687905b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump @@ -1,4 +1,5 @@ -|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68 +| +0&#ffffff0@7|}+0#e000e06&|)| +0#0000000&@64 +|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68 @75 |p+0#af5f00255&|o|p|u|p|\+0#e000e06&|.|F|i|l|t|e|r|M|e|n|u|<|T|a|b|>|F|i|l|t|e|r|(|)|<|C|R|>| +0#0000000&@40 > @74 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|8|7|,|0|-|1| @7|B|o|t| +| +0#0000000&@56|8@1|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump index 82bcce485b..448d554af8 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|m|e|n|u|t|r|a|n|s|l|a|t|e| |c|o|m@1|a|n|d| +0#0000000&@46 @75 +@75 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&@55 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 @@ -16,5 +17,4 @@ |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 -@75 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump index f479aeb46a..35fd08b57d 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +|m+0#af5f00255#ffffff0|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @51 +@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 @75 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 -@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 -> @74 +@6>\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +@75 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 @@ -16,5 +17,4 @@ |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @51 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 -@75 -@57|1|9|,|0|-|1| @7|4|0|%| +@57|1|9|,|7| @9|3|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump index 7623f7079e..d163d17cee 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +@75 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 -@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -@6>\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 +@6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47 @75 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| @60 -@6|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54 -@57|3|7|,|7| @9|9|6|%| +@57|3|7|,|7| @9|9|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump index 06d85e9fa8..17d7482d6c 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump @@ -1,4 +1,5 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| @60 +@6|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54 > @74 |~+0#4040ff13&| @73 |~| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|5|1|,|0|-|1| @7|B|o|t| +| +0#0000000&@56|5|2|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump b/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump index 60a4537844..83ca511826 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump @@ -1,20 +1,20 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|n|o|r|m|a|l| |c|o|m@1|a|n|d| +0#0000000&@53 @75 +@75 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66 |n+0#af5f00255&|o|r|m|a|l|!| +0#0000000&|j| @65 |n+0#af5f00255&|o|r|m|a|l|!|j+0#0000000&| @66 @75 -|"+0#0000e05&| |n|o| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@57 +@75 +|"+0#0000e05&| |N|o| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@57 +@75 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |4|2|||e|c|h|o| |"|n|o|t| |e|c|h|o| |c|o|m@1|a|n|d|"| @39 @75 -|"+0#0000e05&| |n|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53 +@75 +|"+0#0000e05&| |N|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53 +@75 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |"|0|p| @62 @75 -|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59 -|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66 -@6|\+0#e000e06&|k+0#0000000&| @66 -@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -@6|\+0#e000e06&|j+0#0000000&| @66 @75 -|"+0#0000e05&| |w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@29 +|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump b/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump index b6fa3b87c0..73a5480724 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump @@ -1,20 +1,20 @@ -|n+0#af5f00255#ffffff0|o|r|m|a|l| +0#0000000&|j| @66 +|"+0#0000e05#ffffff0| |N|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53 +@75 +|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |"|0|p| @62 +@75 +@75 +>"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59 +@75 +|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66 @6|\+0#e000e06&|k+0#0000000&| @66 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&|j+0#0000000&| @66 @75 ->"+0#0000e05&| |w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@29 +@75 +|"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@22 +@75 |n|o|r|m|a|l|j| @67 +@75 |~+0#4040ff13&| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump index c6ebae57a7..4ff1540da1 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump @@ -15,6 +15,6 @@ |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@1|h+0#00e0003&|e|r|e| +0#0000000&@61 @75 @75 -|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60 +|"+0#0000e05&| |T|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60 @75 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump index a8f5e60f63..5c206a31a9 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump @@ -2,7 +2,7 @@ |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@1|h+0#00e0003&|e|r|e| +0#0000000&@61 @75 @75 -|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60 +|"+0#0000e05&| |T|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60 > @74 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|a|r|t| +0#0000000&|/|t|m|p|/|m|y|p|r|o|f|i|l|e| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@35 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|o|p| +0#0000000&@16|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@35 diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump index c1cc1f6d85..dd038ced85 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@74 @75 -|"+0#0000e05&| |t|r|a|i|l|i|n|g| |c|o|m@1|a|n|d| +0#0000000&@56 +|"+0#0000e05&| |T|r|a|i|l|i|n|g| |c|o|m@1|a|n|d| +0#0000000&@56 @75 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|a|r|t| +0#0000000&|/|t|m|p|/|m|y|p|r|o|f|i|l|e| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@32 >p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|o|p| +0#0000000&@16||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@32 diff --git a/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump index 002b9ff6a0..0e99c5a7cd 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|s|l|e@1|p| |c|o|m@1|a|n|d| +0#0000000&@54 @75 +@75 |s+0#af5f00255&|l|e@1|p| +0#0000000&@7|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |o|n|e| |s|e|c|o|n|d| +0#0000000&@39 |5+0#e000002&| +0#0000000&|s+0#af5f00255&|l|e@1|p| +0#0000000&@5|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |f|i|v|e| |s|e|c|o|n|d|s| +0#0000000&@37 |s+0#af5f00255&|l|e@1|p| +0#0000000&|1+0#e000002&|0@1|m| +0#0000000&@2|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33 @@ -9,12 +10,11 @@ |5+0#e000002&| +0#0000000&|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@4|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |f|i|v|e| |s|e|c|o|n|d|s| +0#0000000&@37 |s+0#af5f00255&|l|e@1|p|!| +0#0000000&|1+0#e000002&|0@1|m| +0#0000000&@1|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33 |1+0#e000002&|0@1| +0#0000000&|s+0#af5f00255&|l|e@1|p|!| +0#0000000&|m+0#e000002&| +0#0000000&|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump b/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump index c4089e8ec9..a596aed7c9 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump @@ -1,8 +1,10 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|t|h|r|o|w| |c|o|m@1|a|n|d| +0#0000000&@54 @75 +@75 |"+0#0000e05&| |:|h|e|l|p| |:|t|h|r|o|w| +0#0000000&@60 @75 |t+0#af5f00255&|r|y| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&|"+0#e000002&|o@1|p|s|"| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|o@1|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|c|a|u|g|h|t|"| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@17 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|,|1| @10|A|l@1| diff --git a/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump index 299d8ea1be..b7862da29b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump +++ b/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump @@ -1,7 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |:|*|v|i|m|g|r|e|p| |a|n|d| |:|*|v|i|m|g|r|e|p|a|d@1| |c|o|m@1|a|n|d|s| +0#0000000&@33 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|F|i|l|e| |T|o|d|o| +0#0000000&@23 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@15 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|F|i|l|e| |T|o|d|o| +0#0000000&@30 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@22 @75 @75 |v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&|p|a|\+0#e000e06&|%|(|t+0#0000000&@1|\+0#e000e06&|)|e+0#0000000&|r|n| @2|f+0#0000001#ffff4012|o@1|.|t|x|t| +0#0000000#ffffff0@44 diff --git a/runtime/syntax/testdir/dumps/vim_expr_24.dump b/runtime/syntax/testdir/dumps/vim_expr_24.dump deleted file mode 100644 index 94a94af1b7..0000000000 --- a/runtime/syntax/testdir/dumps/vim_expr_24.dump +++ /dev/null @@ -1,20 +0,0 @@ -| +0&#ffffff0@1|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67 -@2|\+0#e000e06&| +0#0000000&@2|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64 -@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67 -@2|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@61 -|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 -> @74 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|4|2|3|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_expr_00.dump b/runtime/syntax/testdir/dumps/vim_expressions_00.dump similarity index 63% rename from runtime/syntax/testdir/dumps/vim_expr_00.dump rename to runtime/syntax/testdir/dumps/vim_expressions_00.dump index dd2f98c281..91fa0f54f6 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_00.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_00.dump @@ -1,4 +1,7 @@ ->"+0#0000e05#ffffff0| |S|t|r|i|n|g| +0#0000000&@66 +>"+0#0000e05#ffffff0| |V|i|m| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@57 +@75 +@75 +|"+0#0000e05&| |S|t|r|i|n|g| +0#0000000&@66 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|I|t|'+0#e000e06&@1|s+0#e000002&| |a| |s|t|r|i|n|g|'| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|t|a|b|:| |\|t|,| |n|e|w| |l|i|n|e|:| |\|n|,| |b|a|c|k|s|l|a|s|h|:| |\@1|'| +0#0000000&@31 @@ -14,7 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@61 @75 |"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49 -@75 -|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002& -|-| |\+0#e000e06&|e| +0#e000002&|-| |\+0#e000e06&|f| +0#e000002&|-| |\+0#e000e06&|n| +0#e000002&|-| |\+0#e000e06&|r| +0#e000002&|-| |\+0#e000e06&|t| +0#e000002&|-| |\+0#e000e06&@1| +0#e000002&|-| |\+0#e000e06&|"| +0#e000002&|-| |\+0#e000e06&|<|C|-|W|>|"+0#e000002&| +0#0000000&@30 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_expr_01.dump b/runtime/syntax/testdir/dumps/vim_expressions_01.dump similarity index 84% rename from runtime/syntax/testdir/dumps/vim_expr_01.dump rename to runtime/syntax/testdir/dumps/vim_expressions_01.dump index af306c4e5e..b111646c71 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_01.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_01.dump @@ -1,9 +1,11 @@ -| +0#e000002#ffffff0@5|\+0#e000e06&|'+0#e000002&|b|a|r|'| +0#0000000&@62 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61 +|e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@64 +| +0#e000002&@5|\+0#e000e06&|'+0#e000002&|b|a|r|'| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@61 @75 -|"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49 +>"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49 @75 ->e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002& +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002& |-| |\+0#e000e06&|e| +0#e000002&|-| |\+0#e000e06&|f| +0#e000002&|-| |\+0#e000e06&|n| +0#e000002&|-| |\+0#e000e06&|r| +0#e000002&|-| |\+0#e000e06&|t| +0#e000002&|-| |\+0#e000e06&@1| +0#e000002&|-| |\+0#e000e06&|"| +0#e000002&|-| |\+0#e000e06&|<|C|-|W|>|"+0#e000002&| +0#0000000&@30 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|\|3|1|6| |\|3|1| |\|3| |\|x|1|f| |\|x|f| |\|X|1|F| |\|X|F| |\|u|0|2|a|4| |\|U|0@4|2|a|4| |\|b| |\|e| |\|f| |\|n| |\|r| |\|t| |\@1| |\|"| |\|<|C|-|W|>|'| +0#0000000&@64 @@ -15,6 +17,4 @@ | |\|"| |\|<|C|-|W|>|'| +0#0000000&@63 |e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000002&|"|\+0#e000e06&|3|1|6|0+0#e000002&| |-| |\+0#e000e06&|x|1|f|0+0#e000002&| |-| |\+0#e000e06&|X|1|F|0+0#e000002&| |-| |\+0#e000e06&|u|0|2|a|4|0+0#e000002&| |-| |\+0#e000e06&|U|0@4|2|a|4|0+0#e000002&|"| +0#0000000&@21 @75 -|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|a|>|"+0#e000002&| +0#0000000&@61 -|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60 -@57|1|8|,|1| @10|2|%| +@57|1|9|,|1| @10|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_02.dump b/runtime/syntax/testdir/dumps/vim_expressions_02.dump similarity index 80% rename from runtime/syntax/testdir/dumps/vim_expr_02.dump rename to runtime/syntax/testdir/dumps/vim_expressions_02.dump index 563d02a72c..89d199ad81 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_02.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_02.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60 +| +0&#ffffff0@74 +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|a|>|"+0#e000002&| +0#0000000&@61 +|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|"+0#e000002&| +0#0000000&@61 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|>@1|"+0#e000002&| +0#0000000&@60 -|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|>+0#e000002&|"| +0#0000000&@60 +>e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|>+0#e000002&|"| +0#0000000&@60 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|>@1|>+0#e000002&|"| +0#0000000&@59 -> @74 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&@1| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@65 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@62 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|'+0#e000e06&@1|f+0#e000002&|o@1|'| +0#0000000&@62 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|'+0#e000002&| +0#0000000&@62 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|b+0#e000002&|a|r|'| +0#0000000&@59 -@75 -|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000& -@57|3|2|,|0|-|1| @8|6|%| +@57|3@1|,|1| @10|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_03.dump b/runtime/syntax/testdir/dumps/vim_expressions_03.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim_expr_03.dump rename to runtime/syntax/testdir/dumps/vim_expressions_03.dump index 728805fc42..e625a05fca 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_03.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_03.dump @@ -1,9 +1,11 @@ -|"+0#0000e05#ffffff0| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000& +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|b+0#e000002&|a|r|'| +0#0000000&@59 +@75 +|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000& |"+0#0000e05&| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|t|p|o|p|e|/|v|i|m|-|u|n|i|m|p|a|i|r|e|d|/|b|l|o|b|/|6|d|4@1|a|6|d|c|2|e|c|3|4|6|0|7|c|4|1|e|c|7|8|a|c|f|8|1 |6|5|7|2|4|8|5|8|0|b|f|1|/|p|l|u|g|i|n|/|u|n|i|m|p|a|i|r|e|d|.|v|i|m|#|L|2|3|2| +0#0000000&@35 -|l+0#af5f00255&|e|t| +0#0000000&|c+0#00e0e07&|m|d| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|p|u|t|!|=|r|e|p|e|a|t|(|n|r|2|c|h|a|r|(|1|0|)|,| |v|:|c|o|u|n|t|1|)|||s|i|l|e|n|t| |'+0#e000e06&@1|]+0#e000002&|+|'| +0#0000000&@16 +>l+0#af5f00255&|e|t| +0#0000000&|c+0#00e0e07&|m|d| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|p|u|t|!|=|r|e|p|e|a|t|(|n|r|2|c|h|a|r|(|1|0|)|,| |v|:|c|o|u|n|t|1|)|||s|i|l|e|n|t| |'+0#e000e06&@1|]+0#e000002&|+|'| +0#0000000&@16 +@75 @75 -> @74 |"+0#0000e05&| |S|t|r|i|n|g| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@52 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|D|o|n|'+0#e000e06&@1|t+0#e000002&| |h|i|g|h|l|i|g|h|t| |i|n|t|e|r|p|o|l|a|t|i|o|n|:| |{@1| |{|1| |+| |2|}| |}@1|'| +0#0000000&@22 @@ -15,6 +17,4 @@ @75 @75 |"+0#0000e05&| |C|o|n|t|i|n|u|e|d| |s|t|r|i|n|g| +0#0000000&@56 -@75 -|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65 -@57|4|9|,|0|-|1| @7|1|0|%| +@57|5|0|,|1| @9|1@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_04.dump b/runtime/syntax/testdir/dumps/vim_expressions_04.dump similarity index 81% rename from runtime/syntax/testdir/dumps/vim_expr_04.dump rename to runtime/syntax/testdir/dumps/vim_expressions_04.dump index 09f3a69944..728e47ca6d 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_04.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_04.dump @@ -1,9 +1,11 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65 +|"+0#0000e05#ffffff0| |C|o|n|t|i|n|u|e|d| |s|t|r|i|n|g| +0#0000000&@56 +@75 +|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60 -| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 | +0#e000002&@5>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 +| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51 @75 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|"| +0#0000000&@63 @@ -15,6 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&| +0#0000000&@65 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60 -| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 -@57|6|7|,|7| @9|1|5|%| +@57|6|8|,|7| @9|1|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_05.dump b/runtime/syntax/testdir/dumps/vim_expressions_05.dump similarity index 80% rename from runtime/syntax/testdir/dumps/vim_expr_05.dump rename to runtime/syntax/testdir/dumps/vim_expressions_05.dump index ab5f3031ac..a57b1c8103 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_05.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_05.dump @@ -1,9 +1,11 @@ -| +0#e000002#ffffff0@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 +| +0#e000002#ffffff0@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60 +| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51 -@75 +> @74 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|'+0#e000e06&@1| +0#0000000&@63 -| +0#e000002&@5>\+0#e000e06&|'@1| +0#e000002&|p|a|r|t| |1| |'+0#e000e06&@1| +0#0000000&@55 +| +0#e000002&@5|\+0#e000e06&|'@1| +0#e000002&|p|a|r|t| |1| |'+0#e000e06&@1| +0#0000000&@55 | +0#e000002&@5|"+0#0000e05&|\| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e| +0#0000000&@50 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|'+0#e000e06&@1|p+0#e000002&|a|r|t| |2|'+0#e000e06&@1| +0#0000000&@56 | +0#e000002&@5|\+0#e000e06&|'@1|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@49 @@ -15,6 +17,4 @@ | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51 -@75 -|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64 -@57|8|5|,|7| @9|1|9|%| +@57|8|6|,|0|-|1| @7|1|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_06.dump b/runtime/syntax/testdir/dumps/vim_expressions_06.dump similarity index 79% rename from runtime/syntax/testdir/dumps/vim_expr_06.dump rename to runtime/syntax/testdir/dumps/vim_expressions_06.dump index 057d9d0053..81e340dea2 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_06.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_06.dump @@ -1,9 +1,11 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64 +| +0#e000002#ffffff0@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51 +@75 +|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60 -| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 -| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 | +0#e000002&@5>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 +| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60 +| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 | +0#e000002&@5|\+0#e000e06&|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|r|l|e|n|(+0#e000e06&|"+0#e000002&|p|a|r|t| |1| +0#0000000&@55 @@ -15,6 +17,4 @@ | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2|"|)+0#e000e06&| +0#0000000&@58 @75 @75 -|"+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66 -@75 -@57|1|0|3|,|7| @8|2|4|%| +@57|1|0|4|,|7| @8|2|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_07.dump b/runtime/syntax/testdir/dumps/vim_expressions_07.dump similarity index 78% rename from runtime/syntax/testdir/dumps/vim_expr_07.dump rename to runtime/syntax/testdir/dumps/vim_expressions_07.dump index b90a4f7d1c..428a2ede18 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_07.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_07.dump @@ -1,9 +1,11 @@ | +0&#ffffff0@74 +|"+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66 +@75 |"+0#0000e05&| |H|e|x|a|d|e|c|i|m|a|l| +0#0000000&@61 |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|x|F@1| +0#0000000&@64 -|e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|X|F@1| +0#0000000&@64 +>e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|X|F@1| +0#0000000&@64 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|x|F@1| +0#0000000&@64 ->e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|X|F@1| +0#0000000&@64 +|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|X|F@1| +0#0000000&@64 @75 |"+0#0000e05&| |D|e|c|i|m|a|l| +0#0000000&@65 |e+0#af5f00255&|c|h|o| +0#0000000&@1|2+0#e000002&|5@1| +0#0000000&@65 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|O|3|7@1| +0#0000000&@63 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|3|7@1| +0#0000000&@64 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|o|3|7@1| +0#0000000&@63 -|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|O|3|7@1| +0#0000000&@63 -@75 -@57|1|2|1|,|1| @8|2|8|%| +@57|1|2@1|,|1| @8|2|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_08.dump b/runtime/syntax/testdir/dumps/vim_expressions_08.dump similarity index 72% rename from runtime/syntax/testdir/dumps/vim_expr_08.dump rename to runtime/syntax/testdir/dumps/vim_expressions_08.dump index ce5375ddf0..95dd9099ad 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_08.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_08.dump @@ -1,9 +1,11 @@ -| +0&#ffffff0@74 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|o|3|7@1| +0#0000000&@63 +|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|O|3|7@1| +0#0000000&@63 +@75 |"+0#0000e05&| |B|i|n|a|r|y| +0#0000000&@66 |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|b|1@7| +0#0000000&@58 -|e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|B|1@7| +0#0000000&@58 +>e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|B|1@7| +0#0000000&@58 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|b|1@7| +0#0000000&@58 ->e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|B|1@7| +0#0000000&@58 +|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|B|1@7| +0#0000000&@58 @75 |"+0#0000e05&| |F|l|o|a|t| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&|2|3|.|4|5|6| +0#0000000&@62 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|3+0#e000002&|.|1|4|1|6|e|+|8@1| +0#0000000&@58 @75 |"+0#0000e05&| |B|l|o|b| +0#0000000&@68 -|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z| +0#0000000&@67 -|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55 -@57|1|3|9|,|1| @8|3|2|%| +@57|1|4|0|,|1| @8|3|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_09.dump b/runtime/syntax/testdir/dumps/vim_expressions_09.dump similarity index 76% rename from runtime/syntax/testdir/dumps/vim_expr_09.dump rename to runtime/syntax/testdir/dumps/vim_expressions_09.dump index cd4cbe9788..2063012d61 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_09.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_09.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55 +|"+0#0000e05#ffffff0| |B|l|o|b| +0#0000000&@68 +|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z| +0#0000000&@67 +|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55 |e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|.|E|D|0|1|.|5|D|A|F| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|.|0@1|.|E|D|.|0|1|.|5|D|.|A|F| +0#0000000&@50 -@75 -|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 > @74 +|"+0#0000e05&| |L|i|s|t| +0#0000000&@68 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|]| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&@65 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&@1|1+0#e000002&@1|,+0#0000000&| |1+0#e000002&|2|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|2+0#e000002&|1|,+0#0000000&| |2+0#e000002&@1|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|3+0#e000002&|1|,+0#0000000&| |3+0#e000002&|2|]+0#e000e06&@1| +0#0000000&@39 @@ -14,7 +16,5 @@ @6|\+0#e000e06&|]| +0#0000000&@66 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |'+0#e000002&|t|w|o|'|,+0#0000000&| |1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|2+0#e000002&|,+0#0000000&| |"+0#e000002&|f|o|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|u|r|"|]+0#e000e06&| +0#0000000&@38 @75 -|"+0#0000e05&| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g| |s|p -|a|c|e| |i|n| |l|i|s|t| |o|f| |s|t|r|i|n|g|)| +0#0000000&@52 -|l+0#af5f00255&|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53 -@57|1|5|7|,|0|-|1| @6|3|7|%| +|"+0#0000e05&| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g|@+0#4040ff13&@2 +| +0#0000000&@56|1|5|8|,|0|-|1| @6|3|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_10.dump b/runtime/syntax/testdir/dumps/vim_expressions_10.dump similarity index 77% rename from runtime/syntax/testdir/dumps/vim_expr_10.dump rename to runtime/syntax/testdir/dumps/vim_expressions_10.dump index 5be3b10878..a17403edce 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_10.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_10.dump @@ -1,9 +1,11 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53 +|"+0#0000e05#ffffff0| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g| |s|p +|a|c|e| |i|n| |l|i|s|t| |o|f| |s|t|r|i|n|g|)| +0#0000000&@52 +|l+0#af5f00255&|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53 @75 |"+0#0000e05&| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@62 -@75 +> @74 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|}| +0#0000000&@67 ->e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@52 +|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@52 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@52 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@52 @75 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 -|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 -|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 -@57|1|7|4|,|1| @8|4|1|%| +@57|1|7|5|,|0|-|1| @6|4|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_11.dump b/runtime/syntax/testdir/dumps/vim_expressions_11.dump similarity index 78% rename from runtime/syntax/testdir/dumps/vim_expr_11.dump rename to runtime/syntax/testdir/dumps/vim_expressions_11.dump index d8be50a4ec..38e9322184 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_11.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_11.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 +|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 +|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 -|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 +>e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 @75 ->e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 +|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@40 @@ -15,6 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 @6|\+0#e000e06&|}| +0#0000000&@66 @75 -|"+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|a|r|b|i|t|r|a|r|y| |e|x|p|r|e|s@1|i|o|n| |k|e|y|s| +0#0000000&@41 -@75 -@57|1|9|2|,|1| @8|4|6|%| +@57|1|9|3|,|1| @8|4|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_12.dump b/runtime/syntax/testdir/dumps/vim_expressions_12.dump similarity index 81% rename from runtime/syntax/testdir/dumps/vim_expr_12.dump rename to runtime/syntax/testdir/dumps/vim_expressions_12.dump index 71462fe487..cb1099b7e9 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_12.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_12.dump @@ -1,9 +1,11 @@ | +0&#ffffff0@74 +|"+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|a|r|b|i|t|r|a|r|y| |e|x|p|r|e|s@1|i|o|n| |k|e|y|s| +0#0000000&@41 +@75 |"+0#0000e05&| |L|i|t|e|r|a|l| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@54 @75 -|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{|}| +0#0000000&@66 +>e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{|}| +0#0000000&@66 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&@2|f+0#00e0e07&|o@1|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@51 ->e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@51 +|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&@51 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41 @@ -15,6 +17,4 @@ @75 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 -|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 -|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 -@57|2|1|0|,|1| @8|5|0|%| +@57|2|1@1|,|1| @8|5|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_13.dump b/runtime/syntax/testdir/dumps/vim_expressions_13.dump similarity index 75% rename from runtime/syntax/testdir/dumps/vim_expr_13.dump rename to runtime/syntax/testdir/dumps/vim_expressions_13.dump index 3f9b56da6d..1cd89fdf89 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_13.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_13.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 +|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 +|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@39 -@75 +> @74 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 ->e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 +|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| |#+0#e000e06&|{| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| @1|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@42 @@ -15,6 +17,4 @@ @6|\+0#e000e06&| +0#0000000&@3|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&@52 @6|\+0#e000e06&| +0#0000000&@1|}+0#e000e06&| +0#0000000&@64 @6|\+0#e000e06&|}| +0#0000000&@66 -@75 -|"+0#0000e05&| |m|a|t|c|h| |a|s| |k|e|y|s| |n|o|t| |s|c|o|p|e| |d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@36 -@57|2@1|8|,|1| @8|5|4|%| +@57|2@1|9|,|0|-|1| @6|5|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_14.dump b/runtime/syntax/testdir/dumps/vim_expressions_14.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim_expr_14.dump rename to runtime/syntax/testdir/dumps/vim_expressions_14.dump index ccd2840429..59727033bc 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_14.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_14.dump @@ -1,9 +1,11 @@ -|"+0#0000e05#ffffff0| |m|a|t|c|h| |a|s| |k|e|y|s| |n|o|t| |s|c|o|p|e| |d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@36 +| +0&#ffffff0@5|\+0#e000e06&|}| +0#0000000&@66 +@75 +|"+0#0000e05&| |m|a|t|c|h| |a|s| |k|e|y|s| |n|o|t| |s|c|o|p|e| |d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@36 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |w+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |t+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |g+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |l+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |s+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |a+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |v+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2| +0#0000000&@1|}+0#e000e06&| +0#0000000&@9 @75 -|"+0#0000e05&| |T|u|p|l|e| +0#0000000&@67 +>"+0#0000e05&| |T|u|p|l|e| +0#0000000&@67 @75 ->e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|)| +0#0000000&@67 +|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|)| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&|)+0#e000e06&| +0#0000000&@64 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&@1|1+0#e000002&@1|,+0#0000000&| |1+0#e000002&|2|)+0#e000e06&|,+0#0000000&| |(+0#e000e06&|2+0#e000002&|1|,+0#0000000&| |2+0#e000002&@1|)+0#e000e06&|,+0#0000000&| |(+0#e000e06&|3+0#e000002&|1|,+0#0000000&| |3+0#e000002&|2|)+0#e000e06&@1| +0#0000000&@39 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|,+0#0000000&| @66 @@ -15,6 +17,4 @@ @75 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&@55 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@55 -@75 -|"+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64 -@57|2|4|6|,|1| @8|5|9|%| +@57|2|4|7|,|1| @8|5|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_15.dump b/runtime/syntax/testdir/dumps/vim_expressions_15.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim_expr_15.dump rename to runtime/syntax/testdir/dumps/vim_expressions_15.dump index b261b70da0..ffafa54201 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_15.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_15.dump @@ -1,10 +1,12 @@ -|"+0#0000e05#ffffff0| |R|e|g|i|s|t|e|r| +0#0000000&@64 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@55 +@75 +|"+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|"| +0#0000000&|@+0#e000e06&@1| +0#0000000&@64 -|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40 +>e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|@+0#e000e06&|b| +0#0000000&|@+0#e000e06&|c| +0#0000000&|@+0#e000e06&|d| +0#0000000&|@+0#e000e06&|e| +0#0000000&|@+0#e000e06&|f| +0#0000000&|@+0#e000e06&|g| +0#0000000&|@+0#e000e06&|h| +0#0000000&|@+0#e000e06&|i| +0#0000000&|@+0#e000e06&|j| +0#0000000&|@+0#e000e06&|k| +0#0000000&|@+0#e000e06&|l| +0#0000000&|@+0#e000e06&|m| +0#0000000&|@+0#e000e06&|n| +0#0000000&|@+0#e000e06&|o| +0#0000000&|@+0#e000e06&|p| +0#0000000&|@+0#e000e06&|q| +0#0000000&|@+0#e000e06&|r| +0#0000000&|@+0#e000e06&|s| +0#0000000&|@+0#e000e06&|t| +0#0000000&|@+0#e000e06&|u| +0#0000000&|@+0#e000e06&|v| +0#0000000&|@+0#e000e06&|w| +0#0000000&|@+0#e000e06& |x| +0#0000000&|@+0#e000e06&|y| +0#0000000&|@+0#e000e06&|z| +0#0000000&@67 ->e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|A| +0#0000000&|@+0#e000e06&|B| +0#0000000&|@+0#e000e06&|C| +0#0000000&|@+0#e000e06&|D| +0#0000000&|@+0#e000e06&|E| +0#0000000&|@+0#e000e06&|F| +0#0000000&|@+0#e000e06&|G| +0#0000000&|@+0#e000e06&|H| +0#0000000&|@+0#e000e06&|I| +0#0000000&|@+0#e000e06&|J| +0#0000000&|@+0#e000e06&|K| +0#0000000&|@+0#e000e06&|L| +0#0000000&|@+0#e000e06&|M| +0#0000000&|@+0#e000e06&|N| +0#0000000&|@+0#e000e06&|O| +0#0000000&|@+0#e000e06&|P| +0#0000000&|@+0#e000e06&|Q| +0#0000000&|@+0#e000e06&|R| +0#0000000&|@+0#e000e06&|S| +0#0000000&|@+0#e000e06&|T| +0#0000000&|@+0#e000e06&|U| +0#0000000&|@+0#e000e06&|V| +0#0000000&|@+0#e000e06&|W| +0#0000000&|@+0#e000e06& +|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|A| +0#0000000&|@+0#e000e06&|B| +0#0000000&|@+0#e000e06&|C| +0#0000000&|@+0#e000e06&|D| +0#0000000&|@+0#e000e06&|E| +0#0000000&|@+0#e000e06&|F| +0#0000000&|@+0#e000e06&|G| +0#0000000&|@+0#e000e06&|H| +0#0000000&|@+0#e000e06&|I| +0#0000000&|@+0#e000e06&|J| +0#0000000&|@+0#e000e06&|K| +0#0000000&|@+0#e000e06&|L| +0#0000000&|@+0#e000e06&|M| +0#0000000&|@+0#e000e06&|N| +0#0000000&|@+0#e000e06&|O| +0#0000000&|@+0#e000e06&|P| +0#0000000&|@+0#e000e06&|Q| +0#0000000&|@+0#e000e06&|R| +0#0000000&|@+0#e000e06&|S| +0#0000000&|@+0#e000e06&|T| +0#0000000&|@+0#e000e06&|U| +0#0000000&|@+0#e000e06&|V| +0#0000000&|@+0#e000e06&|W| +0#0000000&|@+0#e000e06& |X| +0#0000000&|@+0#e000e06&|Y| +0#0000000&|@+0#e000e06&|Z| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|-| +0#0000000&|@+0#e000e06&|:| +0#0000000&|@+0#e000e06&|.| +0#0000000&|@+0#e000e06&|%| +0#0000000&|@+0#e000e06&|#| +0#0000000&|@+0#e000e06&|=| +0#0000000&|@+0#e000e06&|*| +0#0000000&|@+0#e000e06&|+| +0#0000000&|@+0#e000e06&|~| +0#0000000&|@+0#e000e06&|_| +0#0000000&|@+0#e000e06&|/| +0#0000000&@37 @75 @@ -15,6 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|9| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|a| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 -|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 -|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 -@57|2|6|4|,|1| @8|6|3|%| +@57|2|6|5|,|1| @8|6|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_16.dump b/runtime/syntax/testdir/dumps/vim_expressions_16.dump similarity index 71% rename from runtime/syntax/testdir/dumps/vim_expr_16.dump rename to runtime/syntax/testdir/dumps/vim_expressions_16.dump index 36583d5ac8..398b2b8ca3 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_16.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_16.dump @@ -1,9 +1,11 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|@+0#e000e06&|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 +|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 +|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|K| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|Z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 -|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|-| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 +>l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|-| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|#| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 ->l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|=| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 +|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|=| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|*| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|+| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|_| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|?+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|:+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@45 -|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@21 -@75 -@57|2|8|0|,|1| @8|6|7|%| +@57|2|8|1|,|1| @8|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_17.dump b/runtime/syntax/testdir/dumps/vim_expressions_17.dump similarity index 69% rename from runtime/syntax/testdir/dumps/vim_expr_17.dump rename to runtime/syntax/testdir/dumps/vim_expressions_17.dump index 02070297e9..65b6b11223 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_17.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_17.dump @@ -1,9 +1,11 @@ -| +0&#ffffff0@74 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@45 +|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@21 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&@59 -@6|\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&@52 +@6>\+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&@52 @6|\+0#e000e06&| +0#0000000&@8|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&@50 -@6>\+0#e000e06&| +0#0000000&@8|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@52 +@6|\+0#e000e06&| +0#0000000&@8|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@52 |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&@52 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|?+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|:+0#af5f00255&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@54 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|?+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|:+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|b|a|r| +0#0000000&@48 |e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|?+0#af5f00255&| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|:+0#af5f00255&| +0#0000000&|$+0#e000e06&|B|A|R| +0#0000000&@51 -|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&|?+0#af5f00255&| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&|:+0#af5f00255&| +0#0000000&|F|a|l|s|e|(+0#e000e06&|)| +0#0000000&@44 -|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&| +0#0000000&|@+0#e000e06&|a| +0#0000000&|:+0#af5f00255&| +0#0000000&|@+0#e000e06&|b| +0#0000000&@57 -@57|2|9|8|,|7| @8|7|2|%| +@57|2|9@1|,|7| @8|7|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_18.dump b/runtime/syntax/testdir/dumps/vim_expressions_18.dump similarity index 69% rename from runtime/syntax/testdir/dumps/vim_expr_18.dump rename to runtime/syntax/testdir/dumps/vim_expressions_18.dump index e509a7d397..dd8c961389 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_18.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_18.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&| +0#0000000&|@+0#e000e06&|a| +0#0000000&|:+0#af5f00255&| +0#0000000&|@+0#e000e06&|b| +0#0000000&@57 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|?+0#af5f00255&| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|:+0#af5f00255&| +0#0000000&|$+0#e000e06&|B|A|R| +0#0000000&@51 +|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&|?+0#af5f00255&| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&|:+0#af5f00255&| +0#0000000&|F|a|l|s|e|(+0#e000e06&|)| +0#0000000&@44 +|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&| +0#0000000&|@+0#e000e06&|a| +0#0000000&|:+0#af5f00255&| +0#0000000&|@+0#e000e06&|b| +0#0000000&@57 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&|)+0#e000e06&| +0#0000000&@54 @75 -|"+0#0000e05&| |F|a|l|s|y| +0#0000000&@67 +>"+0#0000e05&| |F|a|l|s|y| +0#0000000&@67 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -> @74 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|l|i|s|t| |i|s| |e|m|p|t|y|'| +0#0000000&@43 |e+0#af5f00255&|c|h|o| +0#0000000&|G|e|t|N|a|m|e|(+0#e000e06&|)| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|u|n|k|n|o|w|n|'| +0#0000000&@47 @75 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&@63 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@55 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 -|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&@55 -|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@57 -@57|3|1|6|,|0|-|1| @6|7|6|%| +@57|3|1|7|,|1| @8|7|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_19.dump b/runtime/syntax/testdir/dumps/vim_expressions_19.dump similarity index 75% rename from runtime/syntax/testdir/dumps/vim_expr_19.dump rename to runtime/syntax/testdir/dumps/vim_expressions_19.dump index 72fb8be5ca..05e9989d95 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_19.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_19.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@57 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 +|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&@55 +|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@57 |e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|@+0#e000e06&|a| +0#0000000&@61 -|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59 +>e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59 @75 ->"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |u|s|i|n|g| |'|i|g|n|o|r|c|a|s|e|'| +0#0000000&@42 +|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |u|s|i|n|g| |'|i|g|n|o|r|c|a|s|e|'| +0#0000000&@42 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|=| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&| +0#0000000&@5|e+0#00e0e07&|x|p|r| +0#0000000&@53 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t| +0#0000000&@1|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 -|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |m|a|t|c|h| |c|a|s|e| +0#0000000&@49 -|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@57|3@1|4|,|1| @8|8|1|%| +@57|3@1|5|,|1| @8|8|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_20.dump b/runtime/syntax/testdir/dumps/vim_expressions_20.dump similarity index 84% rename from runtime/syntax/testdir/dumps/vim_expr_20.dump rename to runtime/syntax/testdir/dumps/vim_expressions_20.dump index 6501baa4e3..1a9b6a6a00 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_20.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_20.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 +| +0&#ffffff0@74 +|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |m|a|t|c|h| |c|a|s|e| +0#0000000&@49 +|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|#| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 +>e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|#| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 ->e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 +|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|~|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 @@ -15,6 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@57|3|5|2|,|1| @8|8|5|%| +@57|3|5|3|,|1| @8|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_21.dump b/runtime/syntax/testdir/dumps/vim_expressions_21.dump similarity index 75% rename from runtime/syntax/testdir/dumps/vim_expr_21.dump rename to runtime/syntax/testdir/dumps/vim_expressions_21.dump index 6628f1de0b..e49a5b752c 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_21.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_21.dump @@ -1,9 +1,11 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53 +|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 +|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t|?| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +>e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t|?| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 ->"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|"|i|s|"| |i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |"+0#e000002&|e|c|h|o| |v|i|m|N|u|m|b|e|r| |*|v|i|m|C|o|m@1|a|n|d +|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|"|i|s|"| |i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |"+0#e000002&|e|c|h|o| |v|i|m|N|u|m|b|e|r| |*|v|i|m|C|o|m@1|a|n|d |*| |v|i|m|N|u|m|b|e|r|"|)+0#0000e05&| +0#0000000&@61 |e+0#af5f00255&|c|h|o| +0#0000000&|4+0#e000002&|2| +0#0000000&|i+0#af5f00255&|s| +0#0000000&|4+0#e000002&|2| +0#0000000&@61 @75 @@ -15,6 +17,4 @@ @6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61 -@75 -|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59 -@57|3|7|0|,|1| @8|8|9|%| +@57|3|7|1|,|1| @8|8|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_22.dump b/runtime/syntax/testdir/dumps/vim_expressions_22.dump similarity index 64% rename from runtime/syntax/testdir/dumps/vim_expr_22.dump rename to runtime/syntax/testdir/dumps/vim_expressions_22.dump index fbb3e29135..0e5d818fac 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_22.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_22.dump @@ -1,9 +1,11 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61 +@75 +|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59 @6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&@67 -@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 +@6>"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&@67 -@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61 @75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59 @@ -15,6 +17,4 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|,+0#0000000&| |v+0#00e0e07&|:|n|u|l@1|)+0#e000e06&| +0#0000000&@41 @75 @75 -|"+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|1| |(|v|i|m|S|t|r|i|n|g| |b|e|c|o|m|e|s| |v|i|m|V|a|r| |w|h|e|n| |p|r|e|c|e|d|e|d| |b|y| |!|)| +0#0000000&@14 -@75 -@57|3|8|7|,|7| @8|9|4|%| +@57|3|8@1|,|7| @8|9|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_expr_23.dump b/runtime/syntax/testdir/dumps/vim_expressions_23.dump similarity index 86% rename from runtime/syntax/testdir/dumps/vim_expr_23.dump rename to runtime/syntax/testdir/dumps/vim_expressions_23.dump index d6713df24a..19fb9a4238 100644 --- a/runtime/syntax/testdir/dumps/vim_expr_23.dump +++ b/runtime/syntax/testdir/dumps/vim_expressions_23.dump @@ -1,9 +1,11 @@ | +0&#ffffff0@74 +|"+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|1| |(|v|i|m|S|t|r|i|n|g| |b|e|c|o|m|e|s| |v|i|m|V|a|r| |w|h|e|n| |p|r|e|c|e|d|e|d| |b|y| |!|)| +0#0000000&@14 +@75 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|'+0#e000002&|g|:|b|a|r|'|-+0#af5f00255&|>|e+0#00e0e07&|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@46 @75 -@75 -|"+0#0000e05&| |I|s@1|u|e| |#|1|4@1|2|3| |(|v|i|m|.|v|i|m|:| |O|p|t| |o|u|t| |o|f| |v|i|m|S|e|a|r|c|h|*|)| +0#0000000&@27 > @74 +|"+0#0000e05&| |I|s@1|u|e| |#|1|4@1|2|3| |(|v|i|m|.|v|i|m|:| |O|p|t| |o|u|t| |o|f| |v|i|m|S|e|a|r|c|h|*|)| +0#0000000&@27 +@75 |?+0#e000e06&|t+0#e000002&|r|u|t|h|y| +0#0000000&@67 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@60 |\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@66 @@ -15,6 +17,4 @@ |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 | +0#e000002&@1|?+0#e000e06&|t+0#e000002&|r|u|t|h|y| +0#0000000&@65 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@58 -@2|\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64 -@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67 -@57|4|0|5|,|0|-|1| @6|9|8|%| +@57|4|0|6|,|0|-|1| @6|9|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_expressions_24.dump b/runtime/syntax/testdir/dumps/vim_expressions_24.dump new file mode 100644 index 0000000000..6231d525cc --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_expressions_24.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@58 +@2|\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64 +@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67 +@2|\+0#e000e06&| +0#0000000&@2|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64 +@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67 +@2>e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@61 +|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|4|2|4|,|3| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_function_call_00.dump b/runtime/syntax/testdir/dumps/vim_function_calls_00.dump similarity index 85% rename from runtime/syntax/testdir/dumps/vim_function_call_00.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_00.dump index 538215dfff..68d1ec63a1 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_00.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_00.dump @@ -1,11 +1,11 @@ >"+0#0000e05#ffffff0| |V|i|m| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@54 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@26 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@33 @75 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62 @75 @75 -|"+0#0000e05&| |c|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44 +|"+0#0000e05&| |C|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44 @75 |"+0#0000e05&| |a|p@1|e|n|d| |b|r|o|w|s|e| |c|a|l@1| |c|h|d|i|r| |c|o|n|f|i|r|m| |c|o|p|y| |d|e|l|e|t|e| |e|v|a|l| |e|x|e|c|u|t|e| |f|i|l|t|e|r| |f|u|n|c|t|i|o|n |"| |i|n|s|e|r|t| |j|o|i|n| |m|a|p| |m|a|t|c|h| |m|o|d|e| |s|o|r|t| |s|p|l|i|t| |s|u|b|s|t|i|t|u|t|e| |s|w|a|p|n|a|m|e| |t|y|p|e| +0#0000000&@10 diff --git a/runtime/syntax/testdir/dumps/vim_function_call_01.dump b/runtime/syntax/testdir/dumps/vim_function_calls_01.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_01.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_01.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_02.dump b/runtime/syntax/testdir/dumps/vim_function_calls_02.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_02.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_02.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_03.dump b/runtime/syntax/testdir/dumps/vim_function_calls_03.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_03.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_03.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_04.dump b/runtime/syntax/testdir/dumps/vim_function_calls_04.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_04.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_04.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_05.dump b/runtime/syntax/testdir/dumps/vim_function_calls_05.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_05.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_05.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_06.dump b/runtime/syntax/testdir/dumps/vim_function_calls_06.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_06.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_06.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_07.dump b/runtime/syntax/testdir/dumps/vim_function_calls_07.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_07.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_07.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_08.dump b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump similarity index 97% rename from runtime/syntax/testdir/dumps/vim_function_call_08.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_08.dump index 655a8cc141..882b3258df 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_08.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump @@ -4,7 +4,7 @@ |u+0#af5f00255&|n|i|q| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65 @75 > @74 -|"+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66 +|"+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66 @75 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57 |c+0#af5f00255&|a|l@1| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62 diff --git a/runtime/syntax/testdir/dumps/vim_function_call_09.dump b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim_function_call_09.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_09.dump index ee2a46931e..207e4efcc1 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_09.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump @@ -4,7 +4,7 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65 @75 > @74 -|"+0#0000e05&| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61 +|"+0#0000e05&| |E|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61 @75 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57 @75 diff --git a/runtime/syntax/testdir/dumps/vim_function_call_10.dump b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim_function_call_10.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_10.dump index 867bb0d3ad..c385765365 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_10.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump @@ -1,7 +1,7 @@ |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58 @75 @75 -|"+0#0000e05&| |s|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37 +|"+0#0000e05&| |S|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37 @75 >l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60 diff --git a/runtime/syntax/testdir/dumps/vim_function_call_11.dump b/runtime/syntax/testdir/dumps/vim_function_calls_11.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_11.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_11.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_12.dump b/runtime/syntax/testdir/dumps/vim_function_calls_12.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_12.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_12.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_13.dump b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim_function_call_13.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_13.dump index ef1fca4713..6ad6d7d0a9 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_13.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump @@ -9,7 +9,7 @@ |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53 @75 @75 -|"+0#0000e05&| |n|o|t| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@51 +|"+0#0000e05&| |N|o|t| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@51 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55 |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55 diff --git a/runtime/syntax/testdir/dumps/vim_function_call_14.dump b/runtime/syntax/testdir/dumps/vim_function_calls_14.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_function_call_14.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_14.dump diff --git a/runtime/syntax/testdir/dumps/vim_function_call_15.dump b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump similarity index 93% rename from runtime/syntax/testdir/dumps/vim_function_call_15.dump rename to runtime/syntax/testdir/dumps/vim_function_calls_15.dump index a932e5fb87..bf9957334c 100644 --- a/runtime/syntax/testdir/dumps/vim_function_call_15.dump +++ b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump @@ -1,5 +1,5 @@ | +0&#ffffff0@74 -|"+0#0000e05&| |c|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50 +|"+0#0000e05&| |C|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50 @75 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@51 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44 diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_00.dump b/runtime/syntax/testdir/dumps/vim_function_variables_00.dump index 8e12eae4bb..fc69801f61 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_00.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@38 @75 +@75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 @2|"+0#0000e05&| |:|l|e|t| +0#0000000&@66 @75 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_01.dump b/runtime/syntax/testdir/dumps/vim_function_variables_01.dump index c86a8f5e3e..fd296bc039 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_01.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -@2>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +@2>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @@ -16,5 +17,4 @@ @75 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @57|1|9|,|3| @10|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_02.dump b/runtime/syntax/testdir/dumps/vim_function_variables_02.dump index c868567978..a06d1aa3b9 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_02.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 -@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 -> @74 +@2>l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @@ -16,5 +17,4 @@ @75 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 -@57|3|7|,|0|-|1| @8|7|%| +@57|3|7|,|3| @10|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_03.dump b/runtime/syntax/testdir/dumps/vim_function_variables_03.dump index d8e00be7a1..3dcc8e7170 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_03.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_03.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +| +0&#ffffff0@74 +@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@75 -@2>l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 +> @74 +@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @@ -16,5 +17,4 @@ @75 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@57|5@1|,|3| @9|1|2|%| +@57|5@1|,|0|-|1| @7|1|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_04.dump b/runtime/syntax/testdir/dumps/vim_function_variables_04.dump index b494c6e792..d33a29da62 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_04.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +| +0&#ffffff0@74 +@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -@2>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +@2>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@57|7|3|,|3| @9|1|7|%| +@57|7|3|,|3| @9|1|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_05.dump b/runtime/syntax/testdir/dumps/vim_function_variables_05.dump index c1d9dd0bf0..88e95928d5 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_05.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_05.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +| +0&#ffffff0@74 +@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 -@2>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +@2>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @57|9|1|,|3| @9|2|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_06.dump b/runtime/syntax/testdir/dumps/vim_function_variables_06.dump index 0d54bab7e1..cde39acfb7 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_06.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_06.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|0+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -> @74 +@2>l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|0+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|:+0#0000000&|2+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|1+0#e000002&|:+0#0000000&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@57|1|0|9|,|0|-|1| @6|2|6|%| +@57|1|0|9|,|3| @8|2|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_07.dump b/runtime/syntax/testdir/dumps/vim_function_variables_07.dump index c7a38f849e..b114753a03 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_07.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_07.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -> @74 +@2>l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @@ -16,5 +17,4 @@ @75 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -@57|1|2|7|,|0|-|1| @6|3|0|%| +@57|1|2|7|,|3| @8|3|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_08.dump b/runtime/syntax/testdir/dumps/vim_function_variables_08.dump index 8b1c14859a..5c74c14aa2 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_08.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_08.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -> @74 +@2>l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @@ -16,5 +17,4 @@ @75 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|t|_|k|1| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|E|s|c|>|[+0#e000002&|2|3|4|;|"| +0#0000000&@47 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@57|1|4|5|,|0|-|1| @6|3|5|%| +@57|1|4|5|,|3| @8|3|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_09.dump b/runtime/syntax/testdir/dumps/vim_function_variables_09.dump index e05918f544..2d3d20fe19 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_09.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_09.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +| +0&#ffffff0@74 +@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@75 -@2>l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +> @74 +@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -@75 -@57|1|6|3|,|3| @8|3|9|%| +@57|1|6|3|,|0|-|1| @6|3|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_10.dump b/runtime/syntax/testdir/dumps/vim_function_variables_10.dump index 9eb9acc6eb..338836f681 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_10.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_10.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +@75 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44 -@2>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @60 +@2>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44 +@2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @60 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62 @@ -16,5 +17,4 @@ @8|\+0#e000e06&| +0#0000000&@1|@+0#e000e06&|b|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 -@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @57|1|8|1|,|3| @8|4@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_11.dump b/runtime/syntax/testdir/dumps/vim_function_variables_11.dump index 54ff6e8ce4..6e2e0519aa 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_11.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_11.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 +@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50 @75 -@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 -@2>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63 +@2>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 +@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @60 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@36 @@ -16,5 +17,4 @@ @8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|;+0#0000000&| |&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@43 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62 -@8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59 @57|1|9@1|,|3| @8|4|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_12.dump b/runtime/syntax/testdir/dumps/vim_function_variables_12.dump index 1ffe2a810a..0e972533da 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_12.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_12.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62 +@8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59 @8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 @2|l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| @64 -@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61 -@8>\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +@8>\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61 +@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 |.+0#e000002&@2| +0#0000000&@71 @@ -16,5 +17,4 @@ |E+0#e000e06&|N|D| +0#0000000&@71 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47 | +0#e000002&@1|.@2| +0#0000000&@69 -| +0#e000e06&@1|E|N|D| +0#0000000&@69 @57|2|1|7|,|2|-|9| @6|5|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_13.dump b/runtime/syntax/testdir/dumps/vim_function_variables_13.dump index 4de7e3c5f3..cf9f6cc8ed 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_13.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_13.dump @@ -1,9 +1,10 @@ -| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69 +| +0#e000002#ffffff0@1|.@2| +0#0000000&@69 +| +0#e000e06&@1|E|N|D| +0#0000000&@69 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@47 | +0#e000002&@3|.@2| +0#0000000&@67 | +0#e000e06&@1|E|N|D| +0#0000000&@69 -@75 -@2>"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@54 +> @74 +@2|"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@54 @75 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @61 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@52 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 -@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50 -@57|2|3|5|,|3| @8|5|8|%| +@57|2|3|5|,|0|-|1| @6|5|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_14.dump b/runtime/syntax/testdir/dumps/vim_function_variables_14.dump index 433231a017..c4d5265aaa 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_14.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_14.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50 +| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 +@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50 @75 @2|"+0#0000e05&| |:|u|n|l|e|t| +0#0000000&@64 @75 -@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63 -@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59 +@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63 +@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 @@ -16,5 +17,4 @@ @75 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@62 @2|u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@61 -@75 @57|2|5|3|,|3| @8|6|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_15.dump b/runtime/syntax/testdir/dumps/vim_function_variables_15.dump index 898c57e92d..663c073c1d 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_15.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_15.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@61 +@75 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @59 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|:+0#0000000&|]| @58 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|[+0#0000000&|'+0#e000002&|t|w|o|'|]+0#0000000&| @55 -@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@58 -> @74 +@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@58 +@75 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 @@ -16,5 +17,4 @@ @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @75 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 -@75 -@57|2|7|1|,|0|-|1| @6|6|7|%| +@57|2|7|1|,|3| @8|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_16.dump b/runtime/syntax/testdir/dumps/vim_function_variables_16.dump index d9a11d2aab..816d15ccb0 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_16.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_16.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@1|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49 +@75 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44 @75 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@55 -|.+0#e000002&@2| +0#0000000&@71 ->E+0#e000e06&|N|D| +0#0000000&@71 +>.+0#e000002&@2| +0#0000000&@71 +|E+0#e000e06&|N|D| +0#0000000&@71 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50 | +0#e000002&@1|.@2| +0#0000000&@69 | +0#e000e06&@1|E|N|D| +0#0000000&@69 @@ -16,5 +17,4 @@ @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@45 | +0#e000002&@3|.@2| +0#0000000&@67 | +0#e000e06&@1|E|N|D| +0#0000000&@69 -@75 @57|2|8|9|,|1| @8|7|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_17.dump b/runtime/syntax/testdir/dumps/vim_function_variables_17.dump index add83c3db5..139a557165 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_17.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_17.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69 +@75 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @59 @75 -@2|"+0#0000e05&| |:|f|o|r| +0#0000000&@66 -> @74 +@2>"+0#0000e05&| |:|f|o|r| +0#0000000&@66 +@75 @2|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66 @75 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 -@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 -@57|3|0|7|,|0|-|1| @6|7|6|%| +@57|3|0|7|,|3| @8|7|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_18.dump b/runtime/syntax/testdir/dumps/vim_function_variables_18.dump index afed84abcd..05464652d5 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_18.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_18.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 +| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 +@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 @75 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 -@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 -@2>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44 +@2>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44 @75 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@56 @@ -16,5 +17,4 @@ @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@43 @75 -@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 @57|3|2|5|,|3| @8|8|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_19.dump b/runtime/syntax/testdir/dumps/vim_function_variables_19.dump index 4c2ac534d1..b6c1b12216 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_19.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_19.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 +| +0&#ffffff0@74 +@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 -@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 -> @74 +@8>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 +@75 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 @@ -16,5 +17,4 @@ @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 -@75 -@57|3|4|3|,|0|-|1| @6|8|5|%| +@57|3|4|3|,|2|-|9| @6|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_20.dump b/runtime/syntax/testdir/dumps/vim_function_variables_20.dump index ecee1dcb4f..05682bce4c 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_20.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_20.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 +@75 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 -@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42 -> @74 +@2>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42 +@75 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@58 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@54 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@58 @@ -16,5 +17,4 @@ @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@41 @75 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57 -@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53 -@57|3|6|1|,|0|-|1| @6|9|0|%| +@57|3|6|1|,|3| @8|8|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_21.dump b/runtime/syntax/testdir/dumps/vim_function_variables_21.dump index 6eb25b0d93..3cbed5db1f 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_21.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_21.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@1|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53 +| +0&#ffffff0@1|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57 +@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 -@75 -@2>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 +> @74 +@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@43 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@40 @@ -16,5 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|g+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|l+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 -|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 -@57|3|7|9|,|3| @8|9|4|%| +@57|3|7|9|,|0|-|1| @6|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_22.dump b/runtime/syntax/testdir/dumps/vim_function_variables_22.dump index 0b19595af7..380217a62d 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_22.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_22.dump @@ -1,9 +1,10 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 +|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 @75 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 -|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 ->f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +>f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|l+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|s+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 @@ -16,5 +17,4 @@ @75 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3 -|e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46 -@57|3|9|7|,|1| @8|9@1|%| +@57|3|9|7|,|1| @8|9|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_23.dump b/runtime/syntax/testdir/dumps/vim_function_variables_23.dump index 852ce0e1d1..85733da6fa 100644 --- a/runtime/syntax/testdir/dumps/vim_function_variables_23.dump +++ b/runtime/syntax/testdir/dumps/vim_function_variables_23.dump @@ -1,4 +1,5 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3 +|e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46 @75 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 > @74 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -| +0#0000000&@56|4|1|3|,|0|-|1| @6|B|o|t| +| +0#0000000&@56|4|1|4|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_00.dump b/runtime/syntax/testdir/dumps/vim_key_notation_00.dump index ea37115957..a6cd90a18e 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_00.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |K|e|y| |n|o|t|a|t|i|o|n| +0#0000000&@60 @75 +@75 |m+0#af5f00255&|a|p| +0#0000000&|f|o@1| @67 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|p|a|c|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|T|a|b|>| +0#0000000&@61 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|s|c|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|S|I|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_01.dump b/runtime/syntax/testdir/dumps/vim_key_notation_01.dump index b14d575da9..46c4c926f2 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_01.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|S|>| +0#0000000&@62 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|n|t|e|r|>| +0#0000000&@59 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|S|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|c|k|S|p|a|c|e|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|s|c|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|S|I|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|s|l|a|s|h|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|l|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|l|e|t|e|>| +0#0000000&@58 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|D|o|w|n|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|L|e|f|t|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|R|i|g|h|t|>| +0#0000000&@58 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54 @57|1|9|,|7| @10|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_02.dump b/runtime/syntax/testdir/dumps/vim_key_notation_02.dump index 5826a4eccb..87a6258d89 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_02.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|R|i|g|h|t|>| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|E|n|d|>| +0#0000000&@56 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|>| +0#0000000&@62 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|>| +0#0000000&@62 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|4|>| +0#0000000&@62 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|>| +0#0000000&@62 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|4|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|5|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|6|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|7|>| +0#0000000&@62 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|4|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|5|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|6|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61 @57|3|7|,|7| @9|2|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_03.dump b/runtime/syntax/testdir/dumps/vim_key_notation_03.dump index ccb9f026d8..484a0c3e5d 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_03.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_03.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|6|>| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|8|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|9|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|0|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|1|>| +0#0000000&@61 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2@1|>| +0#0000000&@61 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|1|>| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2@1|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|3|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|4|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|5|>| +0#0000000&@61 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|2|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3@1|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|4|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61 @57|5@1|,|7| @9|3@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_04.dump b/runtime/syntax/testdir/dumps/vim_key_notation_04.dump index d346187521..f852d6fee4 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_04.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|4|>| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|6|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|7|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|1|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|2|>| +0#0000000&@61 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|3|>| +0#0000000&@61 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|2|>| +0#0000000&@61 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|3|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|4|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|H|e|l|p|>| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|U|n|d|o|>| +0#0000000&@60 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|z|H|o|m|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|n|d|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|E|n|d|>| +0#0000000&@60 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60 @57|7|3|,|7| @9|4|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_05.dump b/runtime/syntax/testdir/dumps/vim_key_notation_05.dump index 2962483d0a..4a85d5e010 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_05.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_05.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|E|n|d|>| +0#0000000&@60 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|z|E|n|d|>| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|g|e|U|p|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|g|e|D|o|w|n|>| +0#0000000&@56 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|U|p|>| +0#0000000&@57 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|D|o|w|n|>| +0#0000000&@55 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|U|p|>| +0#0000000&@57 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|D|o|w|n|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|l|u|s|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|M|i|n|u|s|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|D|i|v|i|d|e|>| +0#0000000&@57 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|3|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|4|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|5|>| +0#0000000&@62 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62 -@57|9|1|,|7| @9|5|8|%| +@57|9|1|,|7| @9|5|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_06.dump b/runtime/syntax/testdir/dumps/vim_key_notation_06.dump index 66a80f213e..008f04fd36 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_06.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_06.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|5|>| +0#0000000&@62 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|7|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|8|>| +0#0000000&@62 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|9|>| +0#0000000&@62 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|l|t|>| +0#0000000&@62 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|>| +0#0000000&@59 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|l|t|>| +0#0000000&@62 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|N|e|t|M|o|u|s|e|>| +0#0000000&@56 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|c|M|o|u|s|e|>| +0#0000000&@56 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|J|s|b|M|o|u|s|e|>| +0#0000000&@56 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|D|r|a|g|>| +0#0000000&@56 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|>| +0#0000000&@53 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|N|M|>| +0#0000000&@51 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55 @57|1|0|9|,|7| @8|7|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_07.dump b/runtime/syntax/testdir/dumps/vim_key_notation_07.dump index a05017e018..8bec3fe58e 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_07.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_07.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|N|M|>| +0#0000000&@51 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|M|o|u|s|e|>| +0#0000000&@53 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|D|r|a|g|>| +0#0000000&@54 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|R|e|l|e|a|s|e|>| +0#0000000&@51 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|M|o|u|s|e|>| +0#0000000&@54 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|D|r|a|g|>| +0#0000000&@55 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|M|o|u|s|e|>| +0#0000000&@54 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|D|r|a|g|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|R|e|l|e|a|s|e|>| +0#0000000&@52 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|o|l@1|W|h|e@1|l|U|p|>| +0#0000000&@51 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|o|l@1|W|h|e@1|l|D|o|w|n|>| +0#0000000&@49 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|1|R|e|l|e|a|s|e|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|M|o|u|s|e|>| +0#0000000&@57 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|D|r|a|g|>| +0#0000000&@58 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55 @57|1|2|7|,|7| @8|8|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_08.dump b/runtime/syntax/testdir/dumps/vim_key_notation_08.dump index 37db049f7d..70a7ff8408 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_08.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_08.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|D|r|a|g|>| +0#0000000&@58 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|r|o|p|>| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|N|u|l|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|N|R|>| +0#0000000&@61 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|l|u|g|>| +0#0000000&@60 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|u|r|s|o|r|H|o|l|d|>| +0#0000000&@54 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|l|u|g|>| +0#0000000&@60 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|u|r|s|o|r|H|o|l|d|>| +0#0000000&@54 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|I|g|n|o|r|e|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|m|d|>| +0#0000000&@61 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|i|p|t|C|m|d|>| +0#0000000&@55 @@ -16,5 +17,4 @@ @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|c|f|i|l|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|f|i|l|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|b|u|f|>| +0#0000000&@60 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58 -@57|1|4|5|,|7| @8|9|5|%| +@57|1|4|5|,|7| @8|9|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_09.dump b/runtime/syntax/testdir/dumps/vim_key_notation_09.dump index d9adc7b3fa..156de87e1c 100644 --- a/runtime/syntax/testdir/dumps/vim_key_notation_09.dump +++ b/runtime/syntax/testdir/dumps/vim_key_notation_09.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|b|u|f|>| +0#0000000&@60 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|i|l|e|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|t|a|c|k|>| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&@58 -@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|l|n|u|m|>| +0#0000000&@59 -@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|l|n|u|m|>| +0#0000000&@58 +@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|l|n|u|m|>| +0#0000000&@59 +@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|l|n|u|m|>| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|c|l|i|e|n|t|>| +0#0000000&@58 @75 |~+0#4040ff13&| @73 @@ -16,5 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 | +0#0000000&@56|1|6|3|,|7| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_lambda_00.dump b/runtime/syntax/testdir/dumps/vim_lambdas_00.dump similarity index 92% rename from runtime/syntax/testdir/dumps/vim_lambda_00.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_00.dump index 2925e38099..5d365c3f3f 100644 --- a/runtime/syntax/testdir/dumps/vim_lambda_00.dump +++ b/runtime/syntax/testdir/dumps/vim_lambdas_00.dump @@ -1,7 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@50 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|O|p|e|r|a|t|o|r| |T|o|d|o| +0#0000000&@27 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|B|r|a|c|e| @3|T|o|d|o| +0#0000000&@27 -|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|F|u|n|c|P|a|r|a|m| @5|I|d|e|n|t|i|f|i|e|r| +0#0000000&@21 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|B|r|a|c|e| |T|o|d|o| +0#0000000&@30 +|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|F|u|n|c|P|a|r|a|m| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@26 @75 @75 |l+0#af5f00255&|e|t| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@61 @@ -15,6 +15,6 @@ |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|-+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r|}+0#0000001#ffff4012| +0#0000000#ffffff0@50 @75 @75 -|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 +|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 @75 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_lambda_01.dump b/runtime/syntax/testdir/dumps/vim_lambdas_01.dump similarity index 96% rename from runtime/syntax/testdir/dumps/vim_lambda_01.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_01.dump index 96d9489350..4de33e5fdd 100644 --- a/runtime/syntax/testdir/dumps/vim_lambda_01.dump +++ b/runtime/syntax/testdir/dumps/vim_lambdas_01.dump @@ -2,7 +2,7 @@ |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|-+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r|}+0#0000001#ffff4012| +0#0000000#ffffff0@50 @75 @75 -|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 +|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54 > @74 |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|-|>| +0#0000000#ffffff0@61 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 diff --git a/runtime/syntax/testdir/dumps/vim_lambda_02.dump b/runtime/syntax/testdir/dumps/vim_lambdas_02.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_02.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_02.dump diff --git a/runtime/syntax/testdir/dumps/vim_lambda_03.dump b/runtime/syntax/testdir/dumps/vim_lambdas_03.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_03.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_03.dump diff --git a/runtime/syntax/testdir/dumps/vim_lambda_04.dump b/runtime/syntax/testdir/dumps/vim_lambdas_04.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_04.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_04.dump diff --git a/runtime/syntax/testdir/dumps/vim_lambda_05.dump b/runtime/syntax/testdir/dumps/vim_lambdas_05.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_05.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_05.dump diff --git a/runtime/syntax/testdir/dumps/vim_lambda_06.dump b/runtime/syntax/testdir/dumps/vim_lambdas_06.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_06.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_06.dump diff --git a/runtime/syntax/testdir/dumps/vim_lambda_07.dump b/runtime/syntax/testdir/dumps/vim_lambdas_07.dump similarity index 100% rename from runtime/syntax/testdir/dumps/vim_lambda_07.dump rename to runtime/syntax/testdir/dumps/vim_lambdas_07.dump diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump index d6b526ffda..b9fd0ad5fe 100644 --- a/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump +++ b/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| |w|i|t|h| |i|n|t|e|r|s|p|e|r|s|e|d| |c|o|m@1|e|n|t|s| +0#0000000&@23 @75 +@75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&| +0#0000000&@61 @6|"+0#0000e05&|\| |p|a|r|a|m| |a| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|a+0#00e0e07&|,+0#0000000&| @64 @@ -16,5 +17,4 @@ @8|"+0#0000e05&|\| |p|r|i|n|t| |b| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|b|}+0#e000e06&|,+0#0000000&| @54 @8|"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56 -@8|\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump index e5a9a186ac..11577d8de2 100644 --- a/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump +++ b/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@7|"+0#0000e05&|\| |p|r|i|n|t| |a| +0#0000000&@56 +| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|$|"| @62 +@8|"+0#0000e05&|\| |p|r|i|n|t| |a| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|a|}+0#e000e06&|,+0#0000000&| @54 @8|"+0#0000e05&|\| |p|r|i|n|t| |b| +0#0000000&@56 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|b|}+0#e000e06&|,+0#0000000&| @54 -@8|"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56 -@8>\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55 +@8>"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56 +@8|\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55 @8|"+0#0000e05&|\| |e|n|d| |s|t|r|i|n|g| +0#0000000&@53 @8|\+0#e000e06&|"+0#0000000&| @64 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63 @@ -16,5 +17,4 @@ @6|"+0#0000e05&|\| |a|r|g| |3| +0#0000000&@60 @6|\+0#e000e06&| +0#0000000&|3+0#e000002&@1| +0#0000000&@64 @6|\+0#e000e06&|)| +0#0000000&@66 -@75 -@57|1|9|,|2|-|9| @7|4|3|%| +@57|1|9|,|2|-|9| @7|4|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump index b9abdc03fe..23b5388a9e 100644 --- a/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump +++ b/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@5|\+0#e000e06&|)| +0#0000000&@66 +@75 |l+0#af5f00255&|e|t| +0#0000000&|d+0#00e0e07&|i|c|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|#+0#e000e06&|{| +0#0000000&@61 @6|"+0#0000e05&|\| |p|a|i|r| |1| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|a+0#00e0e07&|:| +0#0000000&|1+0#e000002&|,+0#0000000&| @61 -@6|"+0#0000e05&|\| |p|a|i|r| |2| +0#0000000&@59 -@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|2+0#e000002&|,+0#0000000&| @61 +@6>"+0#0000e05&|\| |p|a|i|r| |2| +0#0000000&@59 +@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|2+0#e000002&|,+0#0000000&| @61 @6|"+0#0000e05&|\| |p|a|i|r| |3| +0#0000000&@59 @6|\+0#e000e06&| +0#0000000&|c+0#00e0e07&|:+0#0000000&| |3+0#e000002&| +0#0000000&@62 @6|\+0#e000e06&|}| +0#0000000&@66 @@ -16,5 +17,4 @@ @6|"+0#0000e05&|\| |e|l|e|m|e|n|t| |3| +0#0000000&@56 @6|\+0#e000e06&| +0#0000000&|3+0#e000002&| +0#0000000&@65 @6|\+0#e000e06&|]| +0#0000000&@66 -|~+0#4040ff13&| @73 -| +0#0000000&@56|3|7|,|7| @9|B|o|t| +@57|3|7|,|7| @9|9|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump new file mode 100644 index 0000000000..9ff096f479 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@5|\+0#e000e06&|]| +0#0000000&@66 +> @74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|5|1|,|0|-|1| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_new_00.dump b/runtime/syntax/testdir/dumps/vim_new_00.dump index db3b48aac7..511a5f9552 100644 --- a/runtime/syntax/testdir/dumps/vim_new_00.dump +++ b/runtime/syntax/testdir/dumps/vim_new_00.dump @@ -1,20 +1,20 @@ >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64 +|#+0#0000e05&| |V|i|m| |:|n|e|w| |c|o|m@1|a|n|d| |a|n|d| |c|l|a|s@1| |c|o|n|s|t|r|u|c|t|o|r|s| +0#0000000&@33 +|#+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|m|o|v|e| |t|o| |v|i|m|9|_|c|o|n|s|t|r|u|c|t|o|r| |a|n|d| |c|r|e|a|t|e| |n|e|w| |v|i|m|_|e|x|_|n|e|w| |a|n|d| |v|i|m|9|_|e|x|_|n|e|w| +0#0000000& +|#+0#0000e05&| @6|t|e|s|t|s| +0#0000000&@61 +@75 @75 -|#+0#0000e05&| |V|i|m| |:|n|e|w| |c|o|m@1|a|n|d| |a|n|d| |c|l|a|s@1| |c|o|n|s|t|r|u|c|t|o|r|s|.| +0#0000000&@32 |c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t| @64 -@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57 -@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 -@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@52 -@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 -@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@47 -@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60 +@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@63 +@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 +@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@58 +@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 +@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53 +@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66 @75 |T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@64 |T|e|s|t|.|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@59 |T|e|s|t|.|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@54 |n+0#af5f00255&|e|w| +0#0000000&@71 -|q+0#af5f00255&|u|i|t| +0#0000000&@70 -|~+0#4040ff13&| @73 -|~| @73 -| +0#0000000&@56|1|,|1| @10|A|l@1| +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_new_01.dump b/runtime/syntax/testdir/dumps/vim_new_01.dump new file mode 100644 index 0000000000..06651c4734 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_new_01.dump @@ -0,0 +1,20 @@ +|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@66 +@75 +|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@64 +|T|e|s|t|.|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@59 +|T|e|s|t|.|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@54 +>n+0#af5f00255&|e|w| +0#0000000&@71 +|q+0#af5f00255&|u|i|t| +0#0000000&@70 +@75 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump similarity index 93% rename from runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump rename to runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump index 52c115f5d5..acb0a2e698 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump +++ b/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump @@ -1,6 +1,7 @@ >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|f|a|l|s|e| +0#0000000&@19 @75 +@75 |"+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@55 @75 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60 @@ -16,5 +17,4 @@ |}+0#e000e06&| +0#0000000&@73 @75 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 -@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump similarity index 53% rename from runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump rename to runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump index 856c330834..6b22d4113b 100644 --- a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump +++ b/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump @@ -1,10 +1,12 @@ -|c+0#af5f00255#ffffff0|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61 +| +0&#ffffff0@74 +|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61 @2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 @75 -|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 -@2>#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 +>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52 +@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53 |}+0#e000e06&| +0#0000000&@73 +@75 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -15,6 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|9|,|3| @9|B|o|t| +| +0#0000000&@56|1|9|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump similarity index 61% rename from runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump rename to runtime/syntax/testdir/dumps/vim_nvim_features_00.dump index c7dab677a0..eb0e402765 100644 --- a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump @@ -1,20 +1,20 @@ ->"+0#0000e05#ffffff0| |N|e|o|v|i|m| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@44 +>"+0#0000e05#ffffff0| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@44 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|v|i|m|_|f|e|a|t|u|r|e|s| |=| |[|"|n|v|i|m|"|]| +0#0000000&@21 @75 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|l|u|a| +0#0000000&|v+0#00e0e07&|:|m|s|g|p|a|c|k|_|t|y|p|e|s| +0#0000000&|v+0#00e0e07&|:|r|e|l|n|u|m| +0#0000000&|v+0#00e0e07&|:|s|t|d|e|r@1| +0#0000000&|v+0#00e0e07&|:|t|e|r|m|r|e|q|u|e|s|t| +0#0000000&|v+0#00e0e07&|:|v|i|r|t|n|u|m| +0#0000000&@6 @75 +@75 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c|h|a|n@1|e|l| +0#0000000&|&+0#00e0e07&|i|n|c@1|o|m@1|a|n|d| +0#0000000&|&+0#00e0e07&|m|o|u|s|e|s|c|r|o|l@1| +0#0000000&|&+0#00e0e07&|p|u|m|b|l|e|n|d| +0#0000000&|&+0#00e0e07&|r|e|d|r|a|w|d|e|b|u|g| +0#0000000&|&+0#00e0e07&|s|c|r|o|l@1|b|a|c|k| +0#0000000&@1 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s|h|a|d|a| +0#0000000&|&+0#00e0e07&|s|h|a|d|a|f|i|l|e| +0#0000000&|&+0#00e0e07&|s|t|a|t|u|s|c|o|l|u|m|n| +0#0000000&|&+0#00e0e07&|t|e|r|m|p|a|s|t|e|f|i|l|t|e|r| +0#0000000&|&+0#00e0e07&|t|e|r|m|s|y|n|c| +0#0000000&|&+0#00e0e07&|w|i|n|b|a|r| +0#0000000&@3 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w|i|n|b|l|e|n|d| +0#0000000&|&+0#00e0e07&|w|i|n|h|i|g|h|l|i|g|h|t| +0#0000000&@46 @75 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|,|1| @10|A|l@1| +@75 +|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|p|i|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|s|e|n|d|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|g|e|t|(+0#e000e06&|)| +0#0000000&@61 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump new file mode 100644 index 0000000000..834941044b --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|s|e|n|d|(+0#e000e06&|)| +0#0000000&@59 +>c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|g|e|t|(+0#e000e06&|)| +0#0000000&@61 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|p|o|p|(+0#e000e06&|)| +0#0000000&@61 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|p|u|s|h|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|s|e|t|(+0#e000e06&|)| +0#0000000&@61 +|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|s|i|z|e|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|i|c|t|w|a|t|c|h|e|r|a|d@1|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|i|c|t|w|a|t|c|h|e|r|d|e|l|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|f+0#00e0e07&|i|l|e|_|r|e|a|d|a|b|l|e|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|h+0#00e0e07&|i|g|h|l|i|g|h|t|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|h+0#00e0e07&|i|g|h|l|i|g|h|t|I|D|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|p|i|d|(+0#e000e06&|)| +0#0000000&@61 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|r|e|s|i|z|e|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|e|n|d|(+0#e000e06&|)| +0#0000000&@60 +@57|1|9|,|1| @10|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump new file mode 100644 index 0000000000..fe5afce6fd --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|e|n|d|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|t|o|p|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|w|a|i|t|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|a|s|t|_|b|u|f@1|e|r|_|n|r|(+0#e000e06&|)| +0#0000000&@53 +>c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|e|n|u|_|g|e|t|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|s|g|p|a|c|k|d|u|m|p|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|s|g|p|a|c|k|p|a|r|s|e|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|e|g|_|r|e|c|o|r|d|e|d|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|n|o|t|i|f|y|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|r|e|q|u|e|s|t|(+0#e000e06&|)| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|s|t|o|p|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|e|r|v|e|r|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|e|r|v|e|r|s|t|o|p|(+0#e000e06&|)| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|o|c|k|c|o|n@1|e|c|t|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|d|i|o@1|p|e|n|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|d|p|a|t|h|(+0#e000e06&|)| +0#0000000&@60 +|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|e|r|m|o|p|e|n|(+0#e000e06&|)| +0#0000000&@59 +@57|3|7|,|1| @9|1|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump new file mode 100644 index 0000000000..3b3a4fc657 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|t+0#00e0e07&|e|r|m|o|p|e|n|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|e|s|t|_|w|r|i|t|e|_|l|i|s|t|_|l|o|g|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|a|i|t|(+0#e000e06&|)| +0#0000000&@63 +@75 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|a|d@1|_|h|i|g|h|l|i|g|h|t|(+0#e000e06&|)| +0#0000000&@45 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|a|t@1|a|c|h|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|l|e|a|r|_|h|i|g|h|l|i|g|h|t|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|l|e|a|r|_|n|a|m|e|s|p|a|c|e|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|r|e|a|t|e|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@39 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|b|u|f|_|d|e|b|u|g|_|e|x|t|m|a|r|k|s|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|e|t|e|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|e|x|t|m|a|r|k|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@42 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|c|h|a|n|g|e|d|t|i|c|k|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|c|o|m@1|a|n|d|s|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@41 +@57|5@1|,|1| @9|2|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump new file mode 100644 index 0000000000..372d91cb72 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@41 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|s|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|l|i|n|e|s|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|o|f@1|s|e|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|i|s|_|l|o|a|d|e|d|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|l|i|n|e|_|c|o|u|n|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|e|x|t|m|a|r|k|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|l|i|n|e|s|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50 +@57|7|3|,|1| @9|3|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump new file mode 100644 index 0000000000..bdb3d147c0 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|v|i|r|t|u|a|l|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@42 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|b|u|f|_|s|t|a|t|s|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|a|l@1|_|d|i|c|t|_|f|u|n|c|t|i|o|n|(+0#e000e06&|)| +0#0000000&@44 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|a|l@1|_|f|u|n|c|t|i|o|n|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|l|e|a|r|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|m|d|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|o|m@1|a|n|d|_|o|u|t|p|u|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|c|o|m|p|l|e|t|e|_|s|e|t|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|a|u|g|r|o|u|p|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|a|u|t|o|c|m|d|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|b|u|f|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|n|a|m|e|s|p|a|c|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@45 +@57|9|1|,|1| @9|4|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump new file mode 100644 index 0000000000..713a60e1db --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|t|o|c|m|d|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|c|h|o|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|r@1|_|w|r|i|t|e|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|r@1|_|w|r|i|t|e|l|n|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|v|a|l|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|v|a|l|_|s|t|a|t|u|s|l|i|n|e|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|(+0#e000e06&|)| +0#0000000&@58 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|2|(+0#e000e06&|)| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|f|e@1|d|k|e|y|s|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|l@1|_|o|p|t|i|o|n|s|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@42 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@50 +@57|1|0|9|,|1| @8|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump new file mode 100644 index 0000000000..38ba63c4b1 --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|h|a|n|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|l|o|r|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|l|o|r|_|m|a|p|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|m@1|a|n|d|s|(+0#e000e06&|)| +0#0000000&@50 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|n|t|e|x|t|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|i|d|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|g|e|t|_|l|i|b|_|d|i|r|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|o|d|e|(+0#e000e06&|)| +0#0000000&@54 +@57|1|2|7|,|1| @8|5|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump new file mode 100644 index 0000000000..f453d1f93a --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|o|d|e|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|n|a|m|e|s|p|a|c|e|s|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|i|n|f|o|2|(+0#e000e06&|)| +0#0000000&@46 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|v|a|l|u|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|p|r|o|c|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|p|r|o|c|_|c|h|i|l|d|r|e|n|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|g|e|t|_|r|u|n|t|i|m|e|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|r|u|n|t|i|m|e|_|f|i|l|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|a|r@1|a|y|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|d|i|c|t|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|f|l|o|a|t|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|i|n|p|u|t|(+0#e000e06&|)| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|i|n|p|u|t|_|m|o|u|s|e|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|s|p|e|c|t|_|c|e|l@1|(+0#e000e06&|)| +0#0000000&@49 +@57|1|4|5|,|1| @8|6@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump new file mode 100644 index 0000000000..2e170fe20a --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|s|p|e|c|t|_|c|e|l@1|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|v|a|l|i|d|a|t|e|_|g|l|y|p|h|_|c|a|c|h|e|(+0#e000e06&|)| +0#0000000&@39 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|b|u|f|s|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|c|h|a|n|s|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|r|u|n|t|i|m|e|_|p|a|t|h|s|(+0#e000e06&|)| +0#0000000&@44 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|t|a|b|p|a|g|e|s|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|u|i|s|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|w|i|n|s|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|o|a|d|_|c|o|n|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|n|o|t|i|f|y|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|n|s|_|g|e|t|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|n|s|_|s|e|t|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|p|e|n|_|t|e|r|m|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|p|e|n|_|w|i|n|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|u|t|_|w|r|i|t|e|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|r|s|e|_|c|m|d|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|r|s|e|_|e|x|p|r|e|s@1|i|o|n|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|s|t|e|(+0#e000e06&|)| +0#0000000&@57 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|u|t|(+0#e000e06&|)| +0#0000000&@59 +@57|1|6|3|,|1| @8|7|4|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump new file mode 100644 index 0000000000..84d342c51d --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|u|t|(+0#e000e06&|)| +0#0000000&@59 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|r|e|d|r|a|w|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|r|e|p|l|a|c|e|_|t|e|r|m|c|o|d|e|s|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|r|u|n|t|i|m|e|_|i|n|s|p|e|c|t|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|s|c|r|e@1|n|s|h|o|t|(+0#e000e06&|)| +0#0000000&@51 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|l|e|c|t|_|p|o|p|u|p|m|e|n|u|_|i|t|e|m|(+0#e000e06&|)| +0#0000000&@41 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|d|i|r|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@43 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|_|n|s|_|f|a|s|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@52 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|o|p|t|i|o|n|_|v|a|l|u|e|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54 +@57|1|8|1|,|1| @8|8|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump new file mode 100644 index 0000000000..22bc66747a --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|s|t|a|t|s|(+0#e000e06&|)| +0#0000000&@56 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|t|r|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@44 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|l|i|s|t|_|w|i|n|s|(+0#e000e06&|)| +0#0000000&@45 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|s|e|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|u|n|p|a|c|k|(+0#e000e06&|)| +0#0000000&@55 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@53 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|c|o|n|f|i|g|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|c|u|r|s|o|r|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48 +@57|1|9@1|,|1| @8|9|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump new file mode 100644 index 0000000000..d5033fb36e --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump @@ -0,0 +1,20 @@ +|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|p|o|s|i|t|i|o|n|(+0#e000e06&|)| +0#0000000&@46 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@47 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|h|i|d|e|(+0#e000e06&|)| +0#0000000&@54 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@50 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|c|o|n|f|i|g|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|c|u|r|s|o|r|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@49 +|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|t|e|x|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@47 +@75 +|~+0#4040ff13&| @73 +| +0#0000000&@56|2|1|7|,|1| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/vim_shebang_00.dump b/runtime/syntax/testdir/dumps/vim_shebang_00.dump index c79da4422e..ffb7bafa08 100644 --- a/runtime/syntax/testdir/dumps/vim_shebang_00.dump +++ b/runtime/syntax/testdir/dumps/vim_shebang_00.dump @@ -1,7 +1,7 @@ >#+0#e000e06#ffffff0|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53 -@75 |"+0#0000e05&| |V|i|m| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@56 @75 +@75 |#+0#ffffff16#ff404010|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000#ffffff0@53 |~+0#4040ff13&| @73 |~| @73 diff --git a/runtime/syntax/testdir/dumps/vim_variables_00.dump b/runtime/syntax/testdir/dumps/vim_variables_00.dump index f6764484d1..b06b1497c0 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_00.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_00.dump @@ -1,5 +1,6 @@ >"+0#0000e05#ffffff0| |V|i|m| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@47 @75 +@75 |"+0#0000e05&| |:|l|e|t| +0#0000000&@68 @75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60 @@ -16,5 +17,4 @@ @75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/vim_variables_01.dump b/runtime/syntax/testdir/dumps/vim_variables_01.dump index 8f133984aa..2d0f659031 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_01.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_01.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +| +0&#ffffff0@74 +|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 -|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 ->l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @57|1|9|,|1| @10|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_02.dump b/runtime/syntax/testdir/dumps/vim_variables_02.dump index ce0a8c3443..fac2cbf866 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_02.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_02.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 -@75 ->l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +> @74 +|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@57|3|7|,|1| @10|7|%| +@57|3|7|,|0|-|1| @8|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_03.dump b/runtime/syntax/testdir/dumps/vim_variables_03.dump index ac24e5e75b..cf025188cd 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_03.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_03.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 -|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 ->l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +>l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @75 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -@75 @57|5@1|,|1| @9|1|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_04.dump b/runtime/syntax/testdir/dumps/vim_variables_04.dump index 4f3b2aadbd..b633655bac 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_04.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_04.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@75 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -> @74 +>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@75 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 @75 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 -@75 -@57|7|3|,|0|-|1| @7|1|7|%| +@57|7|3|,|1| @9|1|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_05.dump b/runtime/syntax/testdir/dumps/vim_variables_05.dump index 0601c4344b..0a11e8d22a 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_05.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_05.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 +@75 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 ->l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@75 @57|9|1|,|1| @9|2|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_06.dump b/runtime/syntax/testdir/dumps/vim_variables_06.dump index 833f52b62b..031115c191 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_06.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_06.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +@75 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @75 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@75 ->l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +> @74 +|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@57|1|0|9|,|1| @8|2|6|%| +@57|1|0|9|,|0|-|1| @6|2|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_07.dump b/runtime/syntax/testdir/dumps/vim_variables_07.dump index ded6062d5c..a8219d9829 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_07.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_07.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 -@75 ->l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +> @74 +|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 @75 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -@57|1|2|7|,|1| @8|3|0|%| +@57|1|2|7|,|0|-|1| @6|3|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_08.dump b/runtime/syntax/testdir/dumps/vim_variables_08.dump index d209554930..5ca7f0d364 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_08.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_08.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -@75 ->l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +> @74 +|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 |l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 @75 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|t|_|k|1| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|E|s|c|>|[+0#e000002&|2|3|4|;|"| +0#0000000&@49 @75 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 -|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 -@57|1|4|5|,|1| @8|3|5|%| +@57|1|4|5|,|0|-|1| @6|3|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_09.dump b/runtime/syntax/testdir/dumps/vim_variables_09.dump index 6627a389ce..737a044c63 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_09.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_09.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 +|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58 @75 -|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 -> @74 +>l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 +@75 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 @75 -|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 -@57|1|6|3|,|0|-|1| @6|4|0|%| +@57|1|6|3|,|1| @8|4|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_10.dump b/runtime/syntax/testdir/dumps/vim_variables_10.dump index 29931ed158..d7a7d46d4b 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_10.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_10.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 +| +0&#ffffff0@74 +|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 -|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62 -@6>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62 +@6|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @64 @6|\+0#e000e06&| +0#0000000&@1|&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53 @@ -16,5 +17,4 @@ @75 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 -|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 -@57|1|8|1|,|7| @8|4@1|%| +@57|1|8|1|,|1| @8|4@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_11.dump b/runtime/syntax/testdir/dumps/vim_variables_11.dump index 40fcb3a5cc..042f712354 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_11.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_11.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 +|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @75 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@48 -|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65 -@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @62 +>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65 +@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @62 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@38 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|;+0#0000000&| |&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@45 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @64 @6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @61 -@6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 -@57|1|9@1|,|7| @8|4|9|%| +@57|1|9@1|,|1| @8|4|9|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_12.dump b/runtime/syntax/testdir/dumps/vim_variables_12.dump index 5117e1ad03..d2acc484d5 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_12.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_12.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @61 +@6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54 |l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 |l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| @66 @6|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @63 -@6|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 -> @74 +@6>\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56 +@75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59 |.+0#e000002&@2| +0#0000000&@71 |E+0#e000e06&|N|D| +0#0000000&@71 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@49 |.+0#e000002&@2| +0#0000000&@71 |E+0#e000e06&|N|D| +0#0000000&@71 -|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49 -@57|2|1|7|,|0|-|1| @6|5|3|%| +@57|2|1|7|,|7| @8|5|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_13.dump b/runtime/syntax/testdir/dumps/vim_variables_13.dump index bfa84286a1..11593c5d7e 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_13.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_13.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49 +|E+0#e000e06#ffffff0|N|D| +0#0000000&@71 +|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49 |.+0#e000002&@2| +0#0000000&@71 |E+0#e000e06&|N|D| +0#0000000&@71 @75 -|"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@56 -> @74 +>"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@56 +@75 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@67 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @63 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@67 @@ -16,5 +17,4 @@ |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52 -@75 -@57|2|3|5|,|0|-|1| @6|5|8|%| +@57|2|3|5|,|1| @8|5|8|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_14.dump b/runtime/syntax/testdir/dumps/vim_variables_14.dump index 4cb8061bb6..e85091b1d8 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_14.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_14.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52 +@75 |"+0#0000e05&| |:|u|n|l|e|t| +0#0000000&@66 @75 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 -|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 ->u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 +>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61 +|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 @75 @@ -16,5 +17,4 @@ |u+0#af5f00255&|n|l|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@64 |u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@63 @75 -|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61 @57|2|5|3|,|1| @8|6|3|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_15.dump b/runtime/syntax/testdir/dumps/vim_variables_15.dump index 73cc0c676e..567fd59df5 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_15.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_15.dump @@ -1,9 +1,10 @@ -|u+0#af5f00255#ffffff0|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61 +| +0&#ffffff0@74 +|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61 |u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|:+0#0000000&|]| @60 |u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|[+0#0000000&|'+0#e000002&|t|w|o|'|]+0#0000000&| @57 |u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@60 -@75 ->u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55 +> @74 +|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@54 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@52 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 @@ -16,5 +17,4 @@ @75 |c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51 @75 -|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 -@57|2|7|1|,|1| @8|6|7|%| +@57|2|7|1|,|0|-|1| @6|6|7|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_16.dump b/runtime/syntax/testdir/dumps/vim_variables_16.dump index 1b0ddfab06..5a4618c68b 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_16.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_16.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 +| +0&#ffffff0@74 +|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46 @75 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57 |.+0#e000002&@2| +0#0000000&@71 -|E+0#e000e06&|N|D| +0#0000000&@71 ->c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 +>E+0#e000e06&|N|D| +0#0000000&@71 +|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52 |.+0#e000002&@2| +0#0000000&@71 |E+0#e000e06&|N|D| +0#0000000&@71 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52 @@ -16,5 +17,4 @@ |.+0#e000002&@2| +0#0000000&@71 |E+0#e000e06&|N|D| +0#0000000&@71 @75 -|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 @57|2|8|9|,|1| @8|7|2|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_17.dump b/runtime/syntax/testdir/dumps/vim_variables_17.dump index 07cb153d52..2a49205a91 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_17.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_17.dump @@ -1,9 +1,10 @@ -|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 +| +0&#ffffff0@74 +|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @61 @75 |"+0#0000e05&| |:|f|o|r| +0#0000000&@68 -@75 ->f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 +> @74 +|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68 @75 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52 @@ -16,5 +17,4 @@ |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 -@75 -@57|3|0|7|,|1| @8|7|6|%| +@57|3|0|7|,|0|-|1| @6|7|6|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_18.dump b/runtime/syntax/testdir/dumps/vim_variables_18.dump index 75c9d8000d..4e6913502a 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_18.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_18.dump @@ -1,9 +1,10 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 +@75 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 -|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 -> @74 +>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 +@75 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@62 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@58 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@62 @@ -16,5 +17,4 @@ |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@45 @75 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61 -|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57 -@57|3|2|5|,|0|-|1| @6|8|1|%| +@57|3|2|5|,|1| @8|8|1|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_19.dump b/runtime/syntax/testdir/dumps/vim_variables_19.dump index 853644e398..5510ea6406 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_19.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_19.dump @@ -1,9 +1,10 @@ -|l+0#af5f00255#ffffff0|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57 +|l+0#af5f00255#ffffff0|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61 +|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 -@75 ->l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 +> @74 +|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44 @@ -16,5 +17,4 @@ @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 @75 -|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 -@57|3|4|3|,|1| @8|8|6|%| +@57|3|4|3|,|0|-|1| @6|8|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_20.dump b/runtime/syntax/testdir/dumps/vim_variables_20.dump index e280dd0c4d..2b1c0c7e30 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_20.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_20.dump @@ -1,9 +1,10 @@ -|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 +| +0&#ffffff0@74 +|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44 -@75 ->u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60 +> @74 +|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60 |u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@56 |u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @@ -16,5 +17,4 @@ @75 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55 -|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 -@57|3|6|1|,|1| @8|9|0|%| +@57|3|6|1|,|0|-|1| @6|9|0|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_21.dump b/runtime/syntax/testdir/dumps/vim_variables_21.dump index ecc9a4bf42..a721556daf 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_21.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_21.dump @@ -1,9 +1,10 @@ -|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 +|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55 +|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63 @75 -|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 ->u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 +>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49 +|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42 @75 @@ -16,5 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|l+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 -|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 @57|3|7|9|,|1| @8|9|5|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_22.dump b/runtime/syntax/testdir/dumps/vim_variables_22.dump index afb4dbf42a..0b19595af7 100644 --- a/runtime/syntax/testdir/dumps/vim_variables_22.dump +++ b/runtime/syntax/testdir/dumps/vim_variables_22.dump @@ -1,9 +1,10 @@ -|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 +|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51 @75 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 -|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 ->f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +>f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 +|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|l+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|s+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|a+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35 @@ -16,5 +17,4 @@ |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46 -@75 -@57|3|9|7|,|1| @8|B|o|t| +@57|3|9|7|,|1| @8|9@1|%| diff --git a/runtime/syntax/testdir/dumps/vim_variables_23.dump b/runtime/syntax/testdir/dumps/vim_variables_23.dump new file mode 100644 index 0000000000..6b00839e2c --- /dev/null +++ b/runtime/syntax/testdir/dumps/vim_variables_23.dump @@ -0,0 +1,20 @@ +|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46 +> @74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|4|1@1|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/input/setup/vim9_block.vim b/runtime/syntax/testdir/input/setup/vim9_blocks.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_block.vim rename to runtime/syntax/testdir/input/setup/vim9_blocks.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_comment.vim b/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_comment.vim rename to runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_expr.vim b/runtime/syntax/testdir/input/setup/vim9_comments.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_expr.vim rename to runtime/syntax/testdir/input/setup/vim9_comments.vim diff --git a/runtime/syntax/testdir/input/setup/vim9_lambda.vim b/runtime/syntax/testdir/input/setup/vim9_expressions.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim9_lambda.vim rename to runtime/syntax/testdir/input/setup/vim9_expressions.vim diff --git a/runtime/syntax/testdir/input/setup/vim_comment.vim b/runtime/syntax/testdir/input/setup/vim9_lambdas.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_comment.vim rename to runtime/syntax/testdir/input/setup/vim9_lambdas.vim diff --git a/runtime/syntax/testdir/input/setup/vim_expr.vim b/runtime/syntax/testdir/input/setup/vim_comments.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_expr.vim rename to runtime/syntax/testdir/input/setup/vim_comments.vim diff --git a/runtime/syntax/testdir/input/setup/vim_lambda.vim b/runtime/syntax/testdir/input/setup/vim_expressions.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_lambda.vim rename to runtime/syntax/testdir/input/setup/vim_expressions.vim diff --git a/runtime/syntax/testdir/input/setup/vim_object_methods.vim b/runtime/syntax/testdir/input/setup/vim_lambdas.vim similarity index 100% rename from runtime/syntax/testdir/input/setup/vim_object_methods.vim rename to runtime/syntax/testdir/input/setup/vim_lambdas.vim diff --git a/runtime/syntax/testdir/input/vim9_block.vim b/runtime/syntax/testdir/input/vim9_blocks.vim similarity index 84% rename from runtime/syntax/testdir/input/vim9_block.vim rename to runtime/syntax/testdir/input/vim9_blocks.vim index ddc6657ff0..20a68fc5ab 100644 --- a/runtime/syntax/testdir/input/vim9_block.vim +++ b/runtime/syntax/testdir/input/vim9_blocks.vim @@ -1,6 +1,6 @@ vim9script # Vim9 blocks -# VIM_TESTSETUP set list listchars=tab:> ,trail:-,extends:>,precedes:<,nbsp:+ +# VIM_TESTSETUP set list listchars=trail:- { diff --git a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim similarity index 96% rename from runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim rename to runtime/syntax/testdir/input/vim9_builtin_object_methods.vim index 79a0626ff4..5b49ae91f8 100644 --- a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim +++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim @@ -1,5 +1,6 @@ vim9script -# Vim9 special methods new*(), empty(), len(), string() +# Vim9 special methods - new*(), empty(), len(), string() + def new() enddef diff --git a/runtime/syntax/testdir/input/vim_object_methods.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim similarity index 94% rename from runtime/syntax/testdir/input/vim_object_methods.vim rename to runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim index 11d01a6766..61396c3ba2 100644 --- a/runtime/syntax/testdir/input/vim_object_methods.vim +++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim @@ -1,10 +1,9 @@ vim9script - +# Vim |builtin-object-methods| and namesake builtin functions # VIM_TEST_SETUP hi link vim9MethodName Special # VIM_TEST_SETUP hi link vim9This Todo -# Vim |builtin-object-methods| and namesake builtin functions. class PairClassTest public const a: any public const b: any @@ -56,3 +55,4 @@ const s2: string = pair.string() echo b2 && !empty(pair) echo n2 == 2 && len(pair) == 2 echo s2 == '(0, 1)' && string(pair) == '(0, 1)' + diff --git a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim9_comment_strings.vim similarity index 83% rename from runtime/syntax/testdir/input/vim9_ex_comment_strings.vim rename to runtime/syntax/testdir/input/vim9_comment_strings.vim index fd02c1a60a..854f7d76bc 100644 --- a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim +++ b/runtime/syntax/testdir/input/vim9_comment_strings.vim @@ -1,8 +1,8 @@ vim9script - -# Vim comment strings +# Vim9 comment strings # VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true + # pre "string" post function Foo() @@ -20,3 +20,8 @@ command Foo { autocmd BufNewFile * { # pre "string" post } + +{ + # pre "string" post +} + diff --git a/runtime/syntax/testdir/input/vim9_comment.vim b/runtime/syntax/testdir/input/vim9_comments.vim similarity index 98% rename from runtime/syntax/testdir/input/vim9_comment.vim rename to runtime/syntax/testdir/input/vim9_comments.vim index 590ddd869b..1842d7ef74 100644 --- a/runtime/syntax/testdir/input/vim9_comment.vim +++ b/runtime/syntax/testdir/input/vim9_comments.vim @@ -1,6 +1,6 @@ vim9script +# Vim9 comments -# Vim comments # Vim9-script comment diff --git a/runtime/syntax/testdir/input/vim9_constructor.vim b/runtime/syntax/testdir/input/vim9_constructors.vim similarity index 92% rename from runtime/syntax/testdir/input/vim9_constructor.vim rename to runtime/syntax/testdir/input/vim9_constructors.vim index 71a2ea422f..3b49969e27 100644 --- a/runtime/syntax/testdir/input/vim9_constructor.vim +++ b/runtime/syntax/testdir/input/vim9_constructors.vim @@ -1,6 +1,5 @@ vim9script - -# Vim9 constructor +# Vim9 constructors class A diff --git a/runtime/syntax/testdir/input/vim9_def_variables.vim b/runtime/syntax/testdir/input/vim9_def_variables.vim index 4580c0eefc..97f867c122 100644 --- a/runtime/syntax/testdir/input/vim9_def_variables.vim +++ b/runtime/syntax/testdir/input/vim9_def_variables.vim @@ -1,8 +1,9 @@ vim9script +# Vim9 function variables -# Vim9 function variable highlighting def Foo() + # Declarations var foo = expr diff --git a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim index 3e5715fe06..ea89b9dfc0 100644 --- a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim @@ -1,8 +1,9 @@ vim9script # Vim9 :class command -# VIM_TEST_SETUP let g:vimsyn_folding = 'cf' +# VIM_TEST_SETUP let g:vimsyn_folding = 'cfi' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + interface Interface1 endinterface interface Interface2 diff --git a/runtime/syntax/testdir/input/vim9_ex_commands.vim b/runtime/syntax/testdir/input/vim9_ex_commands.vim index 86e063eed4..c22fb71952 100644 --- a/runtime/syntax/testdir/input/vim9_ex_commands.vim +++ b/runtime/syntax/testdir/input/vim9_ex_commands.vim @@ -1,7 +1,7 @@ vim9script - # Vim9 Ex commands + # START NOT MATCHED :@ :@@ diff --git a/runtime/syntax/testdir/input/vim9_ex_enum2.vim b/runtime/syntax/testdir/input/vim9_ex_enum2.vim index e3b3d2dc0a..f602d794fe 100644 --- a/runtime/syntax/testdir/input/vim9_ex_enum2.vim +++ b/runtime/syntax/testdir/input/vim9_ex_enum2.vim @@ -1,10 +1,9 @@ vim9script -# Vim :enum command +# Vim9 :enum command # VIM_TEST_SETUP hi link vim9EnumValue Todo - - # See: https://github.com/vim/vim/pull/16365#issuecomment-2571420551 + enum Letter # ######################################### diff --git a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim index b6dfc4ea4f..b4769d5813 100644 --- a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim @@ -1,6 +1,6 @@ vim9script -# Vim :enum command -# VIM_TEST_SETUP let g:vimsyn_folding = 'ef' +# Vim9 :enum command +# VIM_TEST_SETUP let g:vimsyn_folding = 'efi' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax # VIM_TEST_SETUP hi link vim9EnumValue Todo diff --git a/runtime/syntax/testdir/input/vim9_ex_for.vim b/runtime/syntax/testdir/input/vim9_ex_for.vim index e3c303330a..e01afc6c43 100644 --- a/runtime/syntax/testdir/input/vim9_ex_for.vim +++ b/runtime/syntax/testdir/input/vim9_ex_for.vim @@ -1,5 +1,4 @@ vim9script - # Vim9 :for command diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim index b4b9f6de0f..dda1449584 100644 --- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim @@ -1,8 +1,8 @@ vim9script - # Vim9 :function and :def tail comment errors # VIM_TEST_SETUP unlet! g:vimsyn_folding + fun Test1() abort # fun return 1 endfun # endfun @@ -42,3 +42,4 @@ endfun # endfun for d in range(1, 6) exec $'echo Test{d}()' endfor + diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim index 12f7942cf1..b2803854d4 100644 --- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim @@ -1,8 +1,8 @@ vim9script - # Vim9 :function and :def tail comments # VIM_TEST_SETUP unlet! g:vimsyn_folding + fun Test1() abort " fun return 1 endfun " endfun @@ -42,3 +42,4 @@ endfun " endfun for d in range(1, 6) exec $'echo Test{d}()' endfor + diff --git a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim index 232c3e2796..f108e749a0 100644 --- a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim +++ b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim @@ -1,8 +1,9 @@ vim9script -# Vim :interface command +# Vim9 :interface command # VIM_TEST_SETUP let g:vimsyn_folding = 'i' # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + interface Interface1 endinterface @@ -34,3 +35,4 @@ interface Interface5 def Meth1(): number def Meth2(): number endinterface + diff --git a/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim index f20d4b9421..184089c819 100644 --- a/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim +++ b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim @@ -1,4 +1,5 @@ vim9script +# Vim9 heredoc # VIM_TEST_SETUP let g:vimsyn_folding = "h" # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax diff --git a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim index 126c6dd38c..fcae0a352f 100644 --- a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim +++ b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim @@ -1,6 +1,6 @@ vim9script +# Vim9 :loadkeymap command -# Vim :loadkeymap command scriptencoding utf-8 @@ -24,3 +24,4 @@ c Special notation allowed in RHS - octal \# Line should not match as a Vim9-script comment " “ Line should not match as a legacy-script comment : # Line should not match as a Vim9-script comment + diff --git a/runtime/syntax/testdir/input/vim9_ex_type.vim b/runtime/syntax/testdir/input/vim9_ex_type.vim index bfd9eb9a26..1408ac8555 100644 --- a/runtime/syntax/testdir/input/vim9_ex_type.vim +++ b/runtime/syntax/testdir/input/vim9_ex_type.vim @@ -1,5 +1,6 @@ vim9script -# Vim :type command +# Vim9 :type command + type Foo = string type Bar = list diff --git a/runtime/syntax/testdir/input/vim9_expr.vim b/runtime/syntax/testdir/input/vim9_expressions.vim similarity index 98% rename from runtime/syntax/testdir/input/vim9_expr.vim rename to runtime/syntax/testdir/input/vim9_expressions.vim index f42392c2d7..aff8f369c5 100644 --- a/runtime/syntax/testdir/input/vim9_expr.vim +++ b/runtime/syntax/testdir/input/vim9_expressions.vim @@ -1,5 +1,5 @@ vim9script -# Vim9-script expressions +# Vim9 expressions # Number @@ -67,7 +67,7 @@ echo { # match as keys not scope dictionaries echo { b: 42, w: 42, t: 42, g: 42, l: 42, s: 42, a: 42, v: 42 } -" Register +# Register echo @" @@ echo @0 @1 @2 @3 @4 @5 @6 @7 @8 @9 diff --git a/runtime/syntax/testdir/input/vim9_function_call.vim b/runtime/syntax/testdir/input/vim9_function_calls.vim similarity index 94% rename from runtime/syntax/testdir/input/vim9_function_call.vim rename to runtime/syntax/testdir/input/vim9_function_calls.vim index 7512950255..c4245510ec 100644 --- a/runtime/syntax/testdir/input/vim9_function_call.vim +++ b/runtime/syntax/testdir/input/vim9_function_calls.vim @@ -1,14 +1,14 @@ vim9script -# Vim function calls -# VIM_TEST_SETUP highlight link vimUserFunc Todo -# VIM_TEST_SETUP highlight link vim9UserFunc Todo +# Vim9 function calls +# VIM_TEST_SETUP hi link vimUserFunc Todo +# VIM_TEST_SETUP hi link vim9UserFunc Todo call abs(42) abs(42) -# command/function distinction +# Command/function distinction # append browse call chdir confirm copy delete eval execute filter function # insert join map match mode sort split substitute swapname type @@ -161,7 +161,7 @@ uniq(42) uniq (42) -# errors +# Errors var foo = foo(42) call foo(42) @@ -182,7 +182,7 @@ echo(42) echo (42) -# expressions +# Expressions var foo = abs(42) @@ -205,7 +205,7 @@ echo Foo() + bar echo bar + Foo() -# scope modifiers and qualified names +# Scope modifiers and qualified names var foo = g:foo(42) call g:foo(42) @@ -257,7 +257,7 @@ call g:module#foo(42) g:module#foo(42) -# not builtin functions +# User, not builtin, functions call g:substitute() call b:substitute() @@ -294,7 +294,7 @@ substitute#substitute() g:substitute#substitute() -# chained function calls +# Chained function calls module.foo().bar() module.foo().substitute() diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim new file mode 100644 index 0000000000..037392134b --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim @@ -0,0 +1,36 @@ +vim9script +# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo +# VIM_TEST_SETUP highlight link vim9EnumValue Identifier +# VIM_TEST_SETUP let g:vimsyn_folding = "ef" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# See: https://github.com/vim/vim/pull/17313#issuecomment-3033537127 (Aliaksei Budavei) + + +enum CommonPair + HelloWorld('hello', 'world'), + Booleans(true, false) + + const _fst: any + const _snd: any + + def new(fst: T, snd: U) + this._fst = fst + this._snd = snd + enddef + + def First(): T + return this._fst + enddef + + def Second(): T + return this._snd + enddef + + def string(): string + return printf("(%s, %s)", this._fst, this._snd) + enddef +endenum + +echo CommonPair.HelloWorld +echo CommonPair.Booleans + diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim new file mode 100644 index 0000000000..f1abbdb3b1 --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim @@ -0,0 +1,215 @@ +vim9script +# VIM_TEST_SETUP let g:vimsyn_folding = "cfi" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo +# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei) + + +# See https://github.com/vim/vim/pull/16604#issuecomment-265202845 . +export interface Listable + def Cons(_: E): Listable + def Reverse(): Listable + def Rest(): Listable + def First(): E + def empty(): bool + def len(): number + def string(): string +endinterface + +enum EmptyList implements Listable + INSTANCE + + def Cons(value: E): Listable + return List.new(value) + enddef + + def Reverse(): Listable + return this + enddef + + def Rest(): Listable + return this + enddef + + def First(): E + return null + enddef + + def empty(): bool + return true + enddef + + def len(): number + return 0 + enddef + + def string(): string + return '[]' + enddef +endenum + +class List implements Listable + const _value: any + const _size: number + var _next: Listable + + def new(value: E) + this._value = value + this._size = 1 + this._next = EmptyList.INSTANCE + enddef + + def _newCons(value: E, size: number) + this._value = value + this._size = size + enddef + + def Cons(value: E): Listable + const list: List = List._newCons(value, (this._size + 1)) + list._next = this + return list + enddef + + def Reverse(): Listable + var result: Listable = List.new(this.First()) + var list: Listable = this.Rest() + + while !list.empty() + result = result.Cons(list.First()) + list = list.Rest() + endwhile + + return result + enddef + + def Rest(): Listable + return this._next + enddef + + def First(): E + return this._value + enddef + + def empty(): bool + return (this._size == 0) + enddef + + def len(): number + return this._size + enddef + + def string(): string + if this.empty() + return '[]' + endif + + var text: string = '[' .. string(this.First()) .. ', ' + var list: Listable = this.Rest() + + while !list.empty() + text ..= string(list.First()) .. ', ' + list = list.Rest() + endwhile + + return strpart(text, 0, (strlen(text) - 2)) .. ']' + enddef +endclass + +export def MakeEmptyList(): Listable + return EmptyList.INSTANCE +enddef + +export def MakeList(value: E): Listable + return List.new(value) +enddef + +export def Map(listable: Listable, Mapper: func(T): U): Listable + var result: Listable = EmptyList.INSTANCE + var list: Listable = listable + + while !list.empty() + result = result.Cons(Mapper(list.First())) + list = list.Rest() + endwhile + + return result.Reverse() +enddef + +export def Filter(listable: Listable, Predicate: func(T): bool): Listable + var result: Listable = EmptyList.INSTANCE + var list: Listable = listable + + while !list.empty() + if Predicate(list.First()) + result = result.Cons(list.First()) + endif + + list = list.Rest() + endwhile + + return result.Reverse() +enddef + +############################################################ + +echo MakeEmptyList() + +const listX: Listable = MakeEmptyList() + .Cons(0).Cons(1).Cons(2).Cons(3) +const listY: Listable = MakeList(0) + .Cons(1).Cons(2).Cons(3) +echo listX == listY +echo listX +echo listX.Reverse() +echo MakeEmptyList().Reverse() +echo Filter(listX, (value: number) => value % 2 != 0) +echo Map(listX, (value: number) => nr2char((value + 60), 1)) + +echo 4 listX.len() listY.len() +echo listX +echo listY + +const list3X: Listable = listX.Rest() +const list3Y: Listable = listY.Rest() +echo 3 list3X.len() list3Y.len() +echo list3X +echo list3Y + +const list2X: Listable = list3X.Rest() +const list2Y: Listable = list3Y.Rest() +echo 2 list2X.len() list2Y.len() +echo list2X +echo list2Y + +const list1X: Listable = list2X.Rest() +const list1Y: Listable = list2Y.Rest() +echo 1 list1X.len() list1Y.len() +echo list1X +echo list1Y + +const list0X: Listable = list1X.Rest() +const list0Y: Listable = list1Y.Rest() +echo 0 list0X.len() list0Y.len() +echo list0X +echo list0Y + +const list0X_: Listable = list0X.Rest() +const list0Y_: Listable = list0Y.Rest() +echo 0 list0X_.len() list0Y_.len() +echo list0X_ +echo list0Y_ + +const list0X__: Listable = list0X_.Rest() +const list0Y__: Listable = list0Y_.Rest() +echo 0 list0X__.len() list0Y__.len() +echo list0X__ +echo list0Y__ + + +const listZ: Listable = MakeList(MakeList(-1)) +const listZZ: Listable = listZ.Cons(MakeList(0)) + .Cons(MakeList(1)) + .Cons(MakeList(2)) + .Cons(MakeList(3)) +echo listZZ + diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim new file mode 100644 index 0000000000..fb8f65116e --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim @@ -0,0 +1,177 @@ +vim9script +# VIM_TEST_SETUP let g:vimsyn_folding = "cf" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo +# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei) + +# See https://github.com/vim/vim/issues/14330#issuecomment-2028938515 . +export class Set + final _elements: dict + const _Mapper: func(number, string): any + const ToStringer: func(any): string + const FromStringer: func(string): any + + static def _Mapper(F: func(string): E): func(number, string): E + return ((G: func(string): E) => (_: number, v: string): E => G(v))(F) + enddef + + def new() + this._elements = {} + this._Mapper = _Mapper((s: string): E => eval(s)) + this.ToStringer = (a: E): string => string(a) + this.FromStringer = (s: string): E => eval(s) + enddef + + def newFromList(elements: list, ToStringer: func(E): string, + FromStringer: func(string): E) + this._elements = elements + ->reduce(((F: func(E): string) => (d: dict, v: E) => + extend({[F(v)]: 1}, d))(ToStringer), + {}) + this._Mapper = _Mapper(FromStringer) + this.ToStringer = ToStringer + this.FromStringer = FromStringer + enddef + + def _FromList(elements: list): Set + return Set.newFromList(elements, this.ToStringer, this.FromStringer) + enddef + + def Contains(element: E): bool + return has_key(this._elements, this.ToStringer(element)) + enddef + + def Elements(): list + return keys(this._elements)->mapnew(this._Mapper) + enddef + + def empty(): bool + return empty(this._elements) + enddef + + def len(): number + return len(this._elements) + enddef + + def string(): string + return string(keys(this._elements)) + enddef + + # {1, 2, 3} ⊇ {1, 2}. + def Superset(that: Set): bool + return (len(this._elements) >= len(that._elements)) && that._elements + ->keys() + ->indexof(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(this)) < 0 + enddef + + # {1, 2} ⊆ {1, 2, 3}. + def Subset(that: Set): bool + return (len(this._elements) <= len(that._elements)) && this._elements + ->keys() + ->indexof(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(that)) < 0 + enddef + + # {1, 2, 3} ∪ {2, 3, 4} = {1, 2, 3, 4}. + def Union(that: Set): Set + return this._FromList({} + ->extend(that._elements) + ->extend(this._elements) + ->keys() + ->map(this._Mapper)) + enddef + + # {1, 2, 3} ∩ {2, 3, 4} = {2, 3}. + def Intersection(that: Set): Set + return this._FromList(this._elements + ->keys() + ->filter(((set: Set) => (_: number, v: string) => set._elements + ->has_key(v))(that)) + ->map(this._Mapper)) + enddef + + # {1, 2, 3} \ {2, 3, 4} = {1}. + # {2, 3, 4} \ {1, 2, 3} = {4}. + def SetDifference(that: Set): Set + return this._FromList(this._elements + ->keys() + ->filter(((set: Set) => (_: number, v: string) => !set._elements + ->has_key(v))(that)) + ->map(this._Mapper)) + enddef + + # {1, 2, 3} △ {2, 3, 4} = {1, 4}. + def SymmetricDifference(that: Set): Set + return this.Union(that).SetDifference(this.Intersection(that)) + enddef +endclass + +############################################################ + +const ToStr: func(number): string = (s: number) => string(s) +const FromStr: func(string): number = (s: string) => str2nr(s) + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Subset(Set.newFromList([1, 2], ToStr, FromStr)) +echo Set.newFromList([1, 2], ToStr, FromStr) + .Subset(Set.newFromList([1, 2, 3], ToStr, FromStr)) +echo Set.newFromList([1, 2], ToStr, FromStr) + .Superset(Set.newFromList([1, 2, 3], ToStr, FromStr)) +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Superset(Set.newFromList([1, 2], ToStr, FromStr)) + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Union(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .Union(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .Intersection(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .Intersection(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .SetDifference(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .SetDifference(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +echo Set.newFromList([1, 2, 3], ToStr, FromStr) + .SymmetricDifference(Set.newFromList([2, 3, 4], ToStr, FromStr)) + .Elements() +echo Set.newFromList([2, 3, 4], ToStr, FromStr) + .SymmetricDifference(Set.newFromList([1, 2, 3], ToStr, FromStr)) + .Elements() + +############################################################ + +const none: Set = Set.new() +echo none.len() +echo none.empty() +echo none.string() +echo string(none.Elements()) + +const sets: Set = Set.newFromList( + [Set.new(), Set.new(), Set.new(), Set.new()], + (o: Set): string => string(o), + (_: string): Set => Set.new()) +echo sets.len() +echo sets.empty() +echo sets.string() +echo string(sets.Elements()) + +const lists: Set = Set.newFromList>( + [[[[[]]]]], + (o: list): string => string(o), + (s: string): list => eval(s)) +echo lists.len() +echo lists.empty() +echo lists.string() +echo string(lists.Elements>()) + diff --git a/runtime/syntax/testdir/input/vim9_generic_functions.vim b/runtime/syntax/testdir/input/vim9_generic_functions.vim new file mode 100644 index 0000000000..4800752d3f --- /dev/null +++ b/runtime/syntax/testdir/input/vim9_generic_functions.vim @@ -0,0 +1,97 @@ +vim9script +# Vim9 generic functions +# VIM_TEST_SETUP let g:vimsyn_folding = "cf" +# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax +# VIM_TEST_SETUP hi link vim9DefTypeParam Todo + + +# :help generic-functions + +def MyFunc(param1: T): T + var f: A + var x = param1 + return x +enddef + +MyFunc>() + + +def Flatten(x: list>): list + var result: list = [] + for inner in x + result += inner + endfor + return result +enddef + +echo Flatten([[1, 2], [3]]) + + +class A + def Foo() + enddef +endclass +var a = A.new() +a.Foo() + + +def MakeEcho(): func(T): T + return (x: T): T => x +enddef + +var EchoNumber = MakeEcho() +echo EchoNumber(123) + +var EchoString = MakeEcho() +echo EchoString('abc') + +# FIXME: add specific command handling +# defcompile MyFunc, dict> + +# disassemble MyFunc> +# disassemble MyFunc> + + +# funcrefs + +var Foo = Bar +Execute(Bar) + +var Foo = bar.Baz +Execute(bar.Baz) + +class Foo + def _MethodA(arg: T) + echo arg + enddef + def MethodB() + var F = this._MethodA + F("text") + enddef +endclass + +class Bar extends Foo + def MethodC() + var F = super._MethodA + F("text") + enddef +endclass + + +# Issue: https://github.com/vim/vim/pull/17722#issuecomment-3075531052 + +export def Id(): func(U): U + return (X_: U) => X_ +enddef + +export def Const(): func(U): func(V): U + return (X_: U) => (_: V) => X_ +enddef + +export def Flip(): func(func(U): func(V): W): func(V): func(U): W + return (F_: func(U): func(V): W) => (Y_: V) => (X_: U) => F_(X_)(Y_) +enddef + +echo Const()(2)(null) + == Flip()(Const())(null)(2) + diff --git a/runtime/syntax/testdir/input/vim9_lambda.vim b/runtime/syntax/testdir/input/vim9_lambdas.vim similarity index 97% rename from runtime/syntax/testdir/input/vim9_lambda.vim rename to runtime/syntax/testdir/input/vim9_lambdas.vim index 81d9dc27b1..4f7d1cde3c 100644 --- a/runtime/syntax/testdir/input/vim9_lambda.vim +++ b/runtime/syntax/testdir/input/vim9_lambdas.vim @@ -1,10 +1,9 @@ vim9script +# Vim9 lambda expressions # VIM_TEST_SETUP hi link vim9LambdaOperator Todo # VIM_TEST_SETUP hi link vim9LambdaParen Todo -# Vim 9 lambda expressions - var Foo: func var expr = 0 @@ -72,7 +71,7 @@ Foo = (x: number, ...y: list): list => expr Foo = (x: number, y: number): list => expr -# post operator comments +# Post-operator comments Foo = () => # comment expr @@ -86,7 +85,7 @@ Foo = () => expr -# line continuations +# Line continuations Foo = (x: string, \ y: number, @@ -112,7 +111,7 @@ Foo = (x: string, \ number => expr -# funcref call +# Funcref call echo (() => 42)() echo ((x: string): number => 42)("foo") diff --git a/runtime/syntax/testdir/input/vim9_legacy_header.vim b/runtime/syntax/testdir/input/vim9_legacy_header.vim index 66aeb39612..75fde68c68 100644 --- a/runtime/syntax/testdir/input/vim9_legacy_header.vim +++ b/runtime/syntax/testdir/input/vim9_legacy_header.vim @@ -1,3 +1,6 @@ +" Vim9 legacy script header + + " comment if !has('vim9script') @@ -14,3 +17,4 @@ vim9script noclear # string only recognised with leading char "useless string" + diff --git a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim index 6e0e71e24d..db48abd967 100644 --- a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim +++ b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim @@ -1,4 +1,8 @@ -" VIM_TEST_SETUP let g:vimsyn_folding = "H" | set fdm=syntax +" Vim9 legacy script header +" VIM_TEST_SETUP let g:vimsyn_folding = "H" +" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax + + " comment if !has('vim9script') @@ -15,3 +19,4 @@ vim9script noclear # string only recognised with leading char "useless string" + diff --git a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim similarity index 83% rename from runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim rename to runtime/syntax/testdir/input/vim9_no_comment_strings.vim index dcea14d28d..b9bdddb914 100644 --- a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim +++ b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim @@ -1,8 +1,8 @@ vim9script - -# Vim comment strings +# Vim9 no comment strings # VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false + # pre "string" post function Foo() @@ -20,3 +20,8 @@ command Foo { autocmd BufNewFile * { # pre "string" post } + +{ + # pre "string" post +} + diff --git a/runtime/syntax/testdir/input/vim9_shebang.vim b/runtime/syntax/testdir/input/vim9_shebang.vim index c012fd9fc9..bd5ca914fc 100644 --- a/runtime/syntax/testdir/input/vim9_shebang.vim +++ b/runtime/syntax/testdir/input/vim9_shebang.vim @@ -1,7 +1,8 @@ #!/usr/bin/env vim -S vim9script +# Vim9 shebang line -# Vim shebang line # just a line comment #!/usr/bin/env vim -S + diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim index 0370dd7681..43f29fedee 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim @@ -1,9 +1,9 @@ vim9script - # Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9This Todo # VIM_TEST_SETUP hi link vim9Super Todo + def Echo(...args: list) echo args enddef diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim index 326eaf099c..8db05e5501 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim @@ -1,5 +1,5 @@ vim9script - +# Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9Super Todo # VIM_TEST_SETUP hi link vim9This Todo # See: https://github.com/vim/vim/pull/16476#issuecomment-2638191110 diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim index fb1f610f88..a80c8c8737 100644 --- a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim +++ b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim @@ -1,5 +1,5 @@ vim9script - +# Vim9 this and super keywords # VIM_TEST_SETUP hi link vim9Super Todo # VIM_TEST_SETUP hi link vim9This Todo # See: https://github.com/vim/vim/pull/16476#issuecomment-2635119478 diff --git a/runtime/syntax/testdir/input/vim9_tuple.vim b/runtime/syntax/testdir/input/vim9_tuples.vim similarity index 99% rename from runtime/syntax/testdir/input/vim9_tuple.vim rename to runtime/syntax/testdir/input/vim9_tuples.vim index 99370a55d4..2470f38b2f 100644 --- a/runtime/syntax/testdir/input/vim9_tuple.vim +++ b/runtime/syntax/testdir/input/vim9_tuples.vim @@ -1,5 +1,4 @@ vim9script - # Vim9 tuples diff --git a/runtime/syntax/testdir/input/vim9_variables.vim b/runtime/syntax/testdir/input/vim9_variables.vim index 3521045290..8347bd7eee 100644 --- a/runtime/syntax/testdir/input/vim9_variables.vim +++ b/runtime/syntax/testdir/input/vim9_variables.vim @@ -1,7 +1,7 @@ vim9script - # Vim9 variable highlighting + # Declarations var foo = expr diff --git a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim_comment_strings.vim similarity index 99% rename from runtime/syntax/testdir/input/vim_ex_comment_strings.vim rename to runtime/syntax/testdir/input/vim_comment_strings.vim index 4214d6b3a0..0626403941 100644 --- a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim +++ b/runtime/syntax/testdir/input/vim_comment_strings.vim @@ -1,6 +1,7 @@ " Vim comment strings " VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true + " pre "string" post function Foo() @@ -18,3 +19,4 @@ command Foo { autocmd BufNewFile * { # pre "string" post } + diff --git a/runtime/syntax/testdir/input/vim_comment.vim b/runtime/syntax/testdir/input/vim_comments.vim similarity index 99% rename from runtime/syntax/testdir/input/vim_comment.vim rename to runtime/syntax/testdir/input/vim_comments.vim index 2ca67875bb..0cababe111 100644 --- a/runtime/syntax/testdir/input/vim_comment.vim +++ b/runtime/syntax/testdir/input/vim_comments.vim @@ -1,5 +1,6 @@ " Vim comments + " Legacy-script comment # 42 " comment @@ -70,3 +71,4 @@ endif def CommentTitle() # Title: ... enddef + diff --git a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim index 7360e38317..5965311e82 100644 --- a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim +++ b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim @@ -1,20 +1,24 @@ " Vim :abbreviate commands +" VIM_TEST_SETUP hi link vimMapLhs Identifier +" VIM_TEST_SETUP hi link vimMapRhs Todo +" VIM_TEST_SETUP hi link vimMapRhsContinue Todo + abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar noreabbrev foo foobar cnoreabbrev cfoo cfoobar -inoreabbrev ifoo cfoobar +inoreabbrev ifoo ifoobar abbrev foo foobar cabbrev cfoo cfoobar -iabbrev ifoo cfoobar +iabbrev ifoo ifoobar unabbrev foo cunabbrev cfoo @@ -23,3 +27,28 @@ iunabbrev ifoo abclear cabclear iabclear + + +" Multiline RHS + +abbrev foo + \ foobar + +abbrev foo + \ + \ foobar + +abbrev foo + "\ comment + \ foobar + +abbrev foo + "\ comment + \ foo + "\ comment + \bar + +abbrev lhs + "\ comment (matches as RHS but harmless) +echo "clear" + diff --git a/runtime/syntax/testdir/input/vim_ex_augroup.vim b/runtime/syntax/testdir/input/vim_ex_augroup.vim index 7f7f3463c3..f7022ecd88 100644 --- a/runtime/syntax/testdir/input/vim_ex_augroup.vim +++ b/runtime/syntax/testdir/input/vim_ex_augroup.vim @@ -1,7 +1,7 @@ " Vim :augroup command " VIM_TEST_SETUP let g:vimsyn_folding = "a" " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax -" VIM_TEST_SETUP highlight link vimAugroupName Todo +" VIM_TEST_SETUP hi link vimAugroupName Todo augroup foo diff --git a/runtime/syntax/testdir/input/vim_ex_autocmd.vim b/runtime/syntax/testdir/input/vim_ex_autocmd.vim index 8b5b53e0b4..2216a427ec 100644 --- a/runtime/syntax/testdir/input/vim_ex_autocmd.vim +++ b/runtime/syntax/testdir/input/vim_ex_autocmd.vim @@ -1,6 +1,6 @@ " Vim :autocmd command -" VIM_TEST_SETUP highlight vimAutoCmdGroup Todo -" VIM_TEST_SETUP highlight vimUserAutoEvent Title +" VIM_TEST_SETUP hi link vimAutoCmdGroup Todo +" VIM_TEST_SETUP hi link vimUserAutoEvent Title " Define @@ -211,7 +211,7 @@ doautocmd foogroup BufRead *.txt | echo "Foo" doautocmd foogroup BufRead *.txt | " comment -" patterns +" Patterns au BufRead */*.txt diff --git a/runtime/syntax/testdir/input/vim_ex_behave.vim b/runtime/syntax/testdir/input/vim_ex_behave.vim index a1e99f0d8a..6f5e5ec124 100644 --- a/runtime/syntax/testdir/input/vim_ex_behave.vim +++ b/runtime/syntax/testdir/input/vim_ex_behave.vim @@ -1,7 +1,9 @@ -" Vim behave command +" Vim :behave command + behave mswin behave xterm behave! mswin behave! xterm + diff --git a/runtime/syntax/testdir/input/vim_ex_call.vim b/runtime/syntax/testdir/input/vim_ex_call.vim index ae6bdc99e8..809a4103f3 100644 --- a/runtime/syntax/testdir/input/vim_ex_call.vim +++ b/runtime/syntax/testdir/input/vim_ex_call.vim @@ -1,7 +1,7 @@ " Vim :call command -" functions for which there are same-named Ex commands +" Functions with same-named Ex commands call browse(save, title, initdir, default) call call(func, arglist, dict) @@ -49,3 +49,4 @@ call Foo(arg1, arg2) let res = call(func, arglist, dict) let res = call (func, arglist, dict) + diff --git a/runtime/syntax/testdir/input/vim_ex_catch.vim b/runtime/syntax/testdir/input/vim_ex_catch.vim index f0e2a8fdc3..f7fad2672f 100644 --- a/runtime/syntax/testdir/input/vim_ex_catch.vim +++ b/runtime/syntax/testdir/input/vim_ex_catch.vim @@ -1,5 +1,6 @@ " Vim :catch command + " :help :catch catch /^Vim:Interrupt$/ " catch interrupts (CTRL-C) @@ -15,3 +16,4 @@ catch " same as /.*/ try | sleep 100 | catch /^Vim:Interrupt$/ | endtry try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry + diff --git a/runtime/syntax/testdir/input/vim_ex_command.vim b/runtime/syntax/testdir/input/vim_ex_command.vim index 8342b68de2..6fd59bf108 100644 --- a/runtime/syntax/testdir/input/vim_ex_command.vim +++ b/runtime/syntax/testdir/input/vim_ex_command.vim @@ -1,15 +1,15 @@ " Vim :command, :delcommand and :comclear commands -" VIM_TEST_SETUP highlight link vimUserCmdName Todo -" VIM_TEST_SETUP highlight link vimDelcommandName Todo +" VIM_TEST_SETUP hi link vimUserCmdName Todo +" VIM_TEST_SETUP hi link vimDelcommandName Todo -" list +" List command command F -" define +" Define command Foo echo "Foo" command! Foo echo "Foo" @@ -53,7 +53,7 @@ def Foo2() enddef -" multiline define +" Multiline define command! -addr=lines \ -bang @@ -112,12 +112,12 @@ command! \ echo "Bar" -" errors +" Errors command! -badattr=arguments -bang -badattr -nargs=* Foo echo "Foo" -" delete +" Delete delcommand Foo delcommand -buffer Foo @@ -161,3 +161,10 @@ command -range=% -nargs=? -bang Tb { command -range=% -nargs=? -bang Tb :,s/\v"[^"]*"/\=substitute(submatch(0), " ", "•", "g")/ge + +" Unreported issue (:map with trailing bar in replacement text) +command! Foo + \ map lhs rhs | + \ abbreviate foo bar | + \ echo "Foo" + diff --git a/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim index 22fafb0db5..64b4782f69 100644 --- a/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim +++ b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim @@ -1,4 +1,4 @@ -" Vim ex command modifiers +" Vim Ex command modifiers aboveleft echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_commands.vim b/runtime/syntax/testdir/input/vim_ex_commands.vim index 3098606b11..351e20ad83 100644 --- a/runtime/syntax/testdir/input/vim_ex_commands.vim +++ b/runtime/syntax/testdir/input/vim_ex_commands.vim @@ -1,5 +1,6 @@ " Ex commands + " START NOT MATCHED :@ :@@ diff --git a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim index 965c543da8..27c93a0e6c 100644 --- a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim +++ b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim @@ -1,5 +1,6 @@ " Vim :debuggreedy command + debuggreedy 0debuggreedy diff --git a/runtime/syntax/testdir/input/vim_ex_def.vim b/runtime/syntax/testdir/input/vim_ex_def.vim index 819a1ada2c..7b1d39f4d1 100644 --- a/runtime/syntax/testdir/input/vim_ex_def.vim +++ b/runtime/syntax/testdir/input/vim_ex_def.vim @@ -1,7 +1,7 @@ " Vim :def command -" list +" List def def Foo @@ -13,7 +13,7 @@ def Foo | echo "Foo" def Foo " comment -" definition +" Definition " empty definition def Foo() @@ -60,7 +60,7 @@ def s:ls() enddef -" return types +" Return types def Foo(): void enddef @@ -88,7 +88,7 @@ def Foo() enddef # comment -" parameters +" Parameters def Foo(x: bool, y = 42, z: string = "zed") enddef @@ -105,7 +105,7 @@ def Test(lines: list = [line('.'), line('.')]): void enddef -" comments +" Comments def Foo() # Vim9-script comment @@ -113,13 +113,13 @@ def Foo() enddef -" leading command separator +" Leading command separator echo "Foo" | def Foo() enddef -" command modifiers +" Command modifiers silent! def Foo() enddef diff --git a/runtime/syntax/testdir/input/vim_ex_def_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_fold.vim index 0d344ed99a..00aff00e89 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_fold.vim @@ -3,7 +3,7 @@ " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax -" list +" List def def Foo @@ -15,7 +15,7 @@ def Foo | echo "Foo" def Foo " comment -" definition +" Definition " empty definition def Foo() @@ -62,7 +62,7 @@ def s:ls() enddef -" return types +" Return types def Foo(): void enddef @@ -90,7 +90,7 @@ def Foo() enddef # comment -" parameters +" Parameters def Foo(x: bool, y = 42, z: string = "zed") enddef @@ -102,7 +102,7 @@ def Foo( enddef -" comments +" Comments def Foo() # Vim9-script comment @@ -110,19 +110,19 @@ def Foo() enddef -" command modifiers +" Command modifiers silent! def Foo() enddef -" leading command separator +" Leading command separator echo "Foo" | def Foo() enddef -" fold-region ending +" Fold-region ending def Foo() # enddef diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested.vim b/runtime/syntax/testdir/input/vim_ex_def_nested.vim index 3b9302d94e..57800ebcd3 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_nested.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_nested.vim @@ -2,6 +2,7 @@ vim9script # Vim9 :def command (nested) # VIM_TEST_SETUP hi link vim9This Todo + class Test const name: string @@ -19,3 +20,4 @@ class Test endclass echo Test.new() + diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim index f21310754b..897d25e50f 100644 --- a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim @@ -1,10 +1,10 @@ vim9script - # Vim9 :def command (nested) # VIM_TEST_SETUP let g:vimsyn_folding = 'f' # VIM_TEST_SETUP setl fdc=2 fdm=syntax # VIM_TEST_SETUP hi link vim9This Todo + class Test const name: string @@ -22,3 +22,4 @@ class Test endclass echo Test.new() + diff --git a/runtime/syntax/testdir/input/vim_ex_echo.vim b/runtime/syntax/testdir/input/vim_ex_echo.vim index bebd28229d..7715df1cbc 100644 --- a/runtime/syntax/testdir/input/vim_ex_echo.vim +++ b/runtime/syntax/testdir/input/vim_ex_echo.vim @@ -9,7 +9,7 @@ echoerr "Answer = " 42 echoconsole "Answer = " 42 -" trailing bar vs OR operator +" Trailing bar vs OR operator " OR operator echo foo || bar @@ -25,7 +25,7 @@ echo "Foo" || echohl WarningMsg | echo "Don't panic!" | echohl None -" line continuations +" Line continuations echo "Answer = " "\ comment @@ -37,7 +37,7 @@ echo \ 42 -" trailing bar and comments +" Trailing bar and comments " :echo without {expr} echo| echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_execute.vim b/runtime/syntax/testdir/input/vim_ex_execute.vim index 0346781bf3..a88e1f4645 100644 --- a/runtime/syntax/testdir/input/vim_ex_execute.vim +++ b/runtime/syntax/testdir/input/vim_ex_execute.vim @@ -17,7 +17,7 @@ endif execute 'while i < 5 | echo i | let i = i + 1 | endwhile' -" trailing bar vs OR operator +" Trailing bar vs OR operator " OR operator execute foo || bar ? "Foo" : "NotFoo" @@ -31,7 +31,7 @@ execute "Foo" | | execute "Foo" || -" line continuations +" Line continuations execute "call" "\ comment @@ -43,7 +43,7 @@ execute \ "Foo()" -" trailing bar and comments +" Trailing bar and comments " :execute without {expr} execute| echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_filter.vim b/runtime/syntax/testdir/input/vim_ex_filter.vim index 0c8947f1d7..79471c9f9f 100644 --- a/runtime/syntax/testdir/input/vim_ex_filter.vim +++ b/runtime/syntax/testdir/input/vim_ex_filter.vim @@ -1,5 +1,5 @@ " Vim :filter command -" VIM_TEST_SETUP highlight link vimCmdSep Operator +" VIM_TEST_SETUP hi link vimCmdSep Operator filter pa\%(tt\)ern oldfiles diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim b/runtime/syntax/testdir/input/vim_ex_function.vim index cf070139d0..ad57f641a5 100644 --- a/runtime/syntax/testdir/input/vim_ex_function.vim +++ b/runtime/syntax/testdir/input/vim_ex_function.vim @@ -1,7 +1,7 @@ " Vim :function command -" list +" List function function Foo @@ -13,7 +13,7 @@ function Foo | echo "Foo" function Foo " comment -" definition +" Definition " empty definition function Foo() @@ -111,7 +111,7 @@ function s:ls() endfunction -" modifiers +" Modifiers function Foo() range endfunction @@ -176,7 +176,7 @@ function Foo() endfunction " comment -" parameters +" Parameters function Foo(x, y, z, ...) return 42 @@ -217,7 +217,7 @@ function Foo( endfunction -" arguments +" Arguments function Foo(a, b, c) echo a:a a:b a:c @@ -236,7 +236,7 @@ function Test(lines = [line('.'), line('.')]) endfunction -" comments +" Comments function Foo() " Legacy-script comment @@ -245,13 +245,13 @@ function Foo() endfunction -" command modifiers +" Command modifiers silent! function Foo() endfunction -" leading command separator +" Leading command separator echo "Foo" | function Foo() endfunction diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim index e5d746439a..dbcba980b8 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim @@ -1,6 +1,7 @@ " Vim :function and :def tail comment errors " VIM_TEST_SETUP unlet! g:vimsyn_folding + fun s:Test1() abort # fun return 1 endfun # endfun @@ -41,3 +42,4 @@ for d in range(1, 6)->reverse() exec $'echo s:Test{d}()' exec $'delfunction s:Test{d}' endfor + diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim index e46bf752e6..a29d3a9988 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim @@ -1,6 +1,7 @@ " Vim :function and :def tail comments " VIM_TEST_SETUP unlet! g:vimsyn_folding + fun s:Test1() abort " fun return 1 endfun " endfun @@ -41,3 +42,4 @@ for d in range(1, 6)->reverse() exec $'echo s:Test{d}()' exec $'delfunction s:Test{d}' endfor + diff --git a/runtime/syntax/testdir/input/vim_ex_function_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_fold.vim index 37a8fa4439..3517506adb 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_fold.vim @@ -3,7 +3,7 @@ " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax -" list +" List function function Foo @@ -15,7 +15,7 @@ function Foo | echo "Foo" function Foo " comment -" definition +" Definition " empty definition function Foo() @@ -113,7 +113,7 @@ function s:ls() endfunction -" modifiers +" Modifiers function Foo() range endfunction @@ -178,7 +178,7 @@ function Foo() endfunction " comment -" parameters +" Parameters function Foo(x, y, z, ...) return 42 @@ -219,7 +219,7 @@ function Foo( endfunction -" arguments +" Arguments function Foo(a, b, c) echo a:a a:b a:c @@ -238,7 +238,7 @@ function Test(lines = [line('.'), line('.')]) endfunction -" comments +" Comments function Foo() " Legacy-script comment @@ -247,13 +247,13 @@ function Foo() endfunction -" command modifiers +" Command modifiers silent! function Foo() endfunction -" leading command separator +" Leading command separator echo "Foo" | function Foo() endfunction @@ -267,7 +267,7 @@ func! s:func(_, func) endfunc -" fold-region ending +" Fold-region ending function Foo() " endfunction diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested.vim b/runtime/syntax/testdir/input/vim_ex_function_nested.vim index 749b57238e..0e0c36a1fa 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_nested.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_nested.vim @@ -1,5 +1,6 @@ " Vim :def and :function commands (nested) + def FunA(): string def DoFunA(): string return "." @@ -36,3 +37,4 @@ echo FunA() echo FunB() echo FunC() echo FunD() + diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim index d966ef386d..a2563b8471 100644 --- a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim +++ b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim @@ -2,6 +2,7 @@ " VIM_TEST_SETUP let g:vimsyn_folding = 'f' " VIM_TEST_SETUP setl fdc=2 fdm=syntax + def FunA(): string def DoFunA(): string return "." @@ -38,3 +39,4 @@ echo FunA() echo FunB() echo FunC() echo FunD() + diff --git a/runtime/syntax/testdir/input/vim_ex_grep.vim b/runtime/syntax/testdir/input/vim_ex_grep.vim index 234f2d9620..8e4e72df92 100644 --- a/runtime/syntax/testdir/input/vim_ex_grep.vim +++ b/runtime/syntax/testdir/input/vim_ex_grep.vim @@ -16,7 +16,7 @@ grepadd! 'pat\|tern' foo.txt lgrepadd! 'pat\|tern' foo.txt -" special filename characters +" Special filename characters grep 'pat\|tern' % lgrep 'pat\|tern' % @@ -31,7 +31,7 @@ grepadd! 'pat\|tern' % lgrepadd! 'pat\|tern' % -" trailing bar, no tail comment +" Trailing bar, no tail comment grep 'pat\|tern' foo.txt | echo "Foo" lgrep 'pat\|tern' foo.txt | echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_highlight.vim b/runtime/syntax/testdir/input/vim_ex_highlight.vim index 51a618df44..1e53e176ce 100644 --- a/runtime/syntax/testdir/input/vim_ex_highlight.vim +++ b/runtime/syntax/testdir/input/vim_ex_highlight.vim @@ -2,7 +2,7 @@ " VIM_TEST_SETUP hi link vimHiGroup Todo -" list +" List highlight highlight Comment @@ -11,12 +11,12 @@ highlight ErrorMsg highlight Foo -" reset +" Reset highlight clear -" disable +" Disable highlight clear Comment highlight clear Conceal @@ -29,7 +29,7 @@ highlight ErrorMsg NONE highlight Foo NONE -" add/modify +" Add/modify highlight Comment cterm=underline highlight Conceal cterm=underline @@ -42,7 +42,7 @@ highlight default ErrorMsg term=bold highlight Foo ErrorMsg term=bold -" link +" Link highlight link Foo Comment highlight! link Foo Comment @@ -52,7 +52,7 @@ highlight link Foo ErrorMsg highlight! link Foo ErrorMsg -" default link +" Default link highlight default link Foo Comment highlight! default link Foo Comment @@ -62,7 +62,7 @@ highlight default link Foo ErrorMsg highlight! default link Foo ErrorMsg -" line continuation and command separator +" Line continuation and command separator hi Comment "\ comment diff --git a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim index adc59e675f..7c45ab5e6a 100644 --- a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim +++ b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim @@ -68,7 +68,7 @@ line2 EOS -" trim +" Trim let foo =<< trim END line1 @@ -81,7 +81,7 @@ END END -" interpolation +" Interpolation let foo =<< eval END line{1 + 0} @@ -103,7 +103,7 @@ END line{1 + 1} END -" no interpolation (escaped { and }) +" No interpolation (escaped { and }) let foo =<< eval END line{{1 + 0}} @@ -126,7 +126,7 @@ END END -" no interpolation +" No interpolation let foo =<< END line{1 + 0} @@ -149,7 +149,7 @@ END END -" end marker must not be followed by whitespace +" End marker must not be followed by whitespace " assert_equal(foo, ["END "]) let foo =<< END @@ -225,7 +225,7 @@ END END -" end markers +" End markers let foo =<< !@#$%^&*()_+ line1 diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim index 8f4484db5c..4271e0eb12 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command + scriptencoding utf-8 let b:keymap_name = "syntax-test" @@ -22,3 +23,4 @@ c Special notation allowed in RHS - octal # Line should not match as a Vim9-script comment \" “ Line should not match as a legacy-script comment : " Line should not match as a legacy-script comment + diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim index 029af2cb3b..4f4c5af40f 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command (after "|") + scriptencoding utf-8 let b:keymap_name = "syntax-test" diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim index 61578b6a0f..9500cbd5bc 100644 --- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim +++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim @@ -1,5 +1,6 @@ " Vim :loadkeymap command (after ":") + scriptencoding utf-8 let b:keymap_name = "syntax-test" diff --git a/runtime/syntax/testdir/input/vim_ex_make.vim b/runtime/syntax/testdir/input/vim_ex_make.vim index 7ce87f2e35..0ef3046d7d 100644 --- a/runtime/syntax/testdir/input/vim_ex_make.vim +++ b/runtime/syntax/testdir/input/vim_ex_make.vim @@ -1,6 +1,6 @@ " Vim :*make commands -" VIM_TEST_SETUP highlight link vimCmdSep Operator -" VIM_TEST_SETUP highlight link vimMakeBarEscape Special +" VIM_TEST_SETUP hi link vimCmdSep Operator +" VIM_TEST_SETUP hi link vimMakeBarEscape Special make @@ -16,13 +16,13 @@ make! -options target lmake! -options target -" special filename characters +" Special filename characters make % lmake % -" trailing bar, no tail comment +" Trailing bar, no tail comment make tar\|get | echo "Foo" lmake tar\|get | echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_map.vim b/runtime/syntax/testdir/input/vim_ex_map.vim index 5d469b2c23..b7c33ef498 100644 --- a/runtime/syntax/testdir/input/vim_ex_map.vim +++ b/runtime/syntax/testdir/input/vim_ex_map.vim @@ -1,4 +1,8 @@ " Vim :map commands +" VIM_TEST_SETUP hi link vimMapLhs Identifier +" VIM_TEST_SETUP hi link vimMapRhs Todo +" VIM_TEST_SETUP hi link vimMapRhsContinue Todo + map! map! lhs rhs @@ -44,7 +48,7 @@ map _l :!ls | more^M:echo "rhs" map lhs :search('foo\\|bar'):echo "rhs" -" multiline RHS +" Multiline RHS map baz \ :echo ( @@ -117,3 +121,4 @@ nnoremap bar :echo ( " /autoload/netrw.vim if !hasmapto('NetrwOpenFile') |nmap % NetrwOpenFile|endif + diff --git a/runtime/syntax/testdir/input/vim_ex_menu.vim b/runtime/syntax/testdir/input/vim_ex_menu.vim index f65493d519..87098e031c 100644 --- a/runtime/syntax/testdir/input/vim_ex_menu.vim +++ b/runtime/syntax/testdir/input/vim_ex_menu.vim @@ -1,5 +1,6 @@ " Vim :menu commands + " :help disable menus menu disable &File.&Open\.\.\. amenu enable * diff --git a/runtime/syntax/testdir/input/vim_ex_menutranslate.vim b/runtime/syntax/testdir/input/vim_ex_menutranslate.vim index 5e0289d65b..8986cd36a7 100644 --- a/runtime/syntax/testdir/input/vim_ex_menutranslate.vim +++ b/runtime/syntax/testdir/input/vim_ex_menutranslate.vim @@ -1,5 +1,6 @@ " Vim :menutranslate command + menutranslate clear menutranslate clear | echo "Foo" menutranslate clear " comment diff --git a/runtime/syntax/testdir/input/vim_ex_normal.vim b/runtime/syntax/testdir/input/vim_ex_normal.vim index 174a3c7fb3..6bd73982bc 100644 --- a/runtime/syntax/testdir/input/vim_ex_normal.vim +++ b/runtime/syntax/testdir/input/vim_ex_normal.vim @@ -1,20 +1,30 @@ " Vim :normal command + normal j normal! j normal!j -" no trailing bar + +" No trailing bar + normal j 42|echo "not echo command" -" no trailing comment + +" No trailing comment + normal j "0p -" multiline arg + +" Multiline arg + normal j \k "\ comment \j -" word-boundary required after name (old bug) + +" Issue: word-boundary required after name (old bug) + normalj + diff --git a/runtime/syntax/testdir/input/vim_ex_profile.vim b/runtime/syntax/testdir/input/vim_ex_profile.vim index b2ff571e27..ba80aaab7f 100644 --- a/runtime/syntax/testdir/input/vim_ex_profile.vim +++ b/runtime/syntax/testdir/input/vim_ex_profile.vim @@ -15,7 +15,7 @@ profdel file MyScript.vim profdel here -" tail comment +" Tail comment profile start /tmp/myprofile " comment profile stop " comment @@ -31,7 +31,7 @@ profdel file MyScript.vim " comment profdel here " comment -" trailing command +" Trailing command profile start /tmp/myprofile | echo "Foo" profile stop | echo "Foo" diff --git a/runtime/syntax/testdir/input/vim_ex_sleep.vim b/runtime/syntax/testdir/input/vim_ex_sleep.vim index 49fd31e80c..534550c503 100644 --- a/runtime/syntax/testdir/input/vim_ex_sleep.vim +++ b/runtime/syntax/testdir/input/vim_ex_sleep.vim @@ -1,5 +1,6 @@ " Vim :sleep command + sleep " sleep for one second 5 sleep " sleep for five seconds sleep 100m " sleep for 100 milliseconds @@ -9,3 +10,4 @@ sleep! " sleep for one second 5 sleep! " sleep for five seconds sleep! 100m " sleep for 100 milliseconds 100 sleep! m " sleep for 100 milliseconds + diff --git a/runtime/syntax/testdir/input/vim_ex_throw.vim b/runtime/syntax/testdir/input/vim_ex_throw.vim index 4adbc88485..c64afc8d71 100644 --- a/runtime/syntax/testdir/input/vim_ex_throw.vim +++ b/runtime/syntax/testdir/input/vim_ex_throw.vim @@ -1,5 +1,7 @@ " Vim :throw command + " :help :throw try | throw "oops" | catch /^oo/ | echo "caught" | endtry + diff --git a/runtime/syntax/testdir/input/vim_ex_vimgrep.vim b/runtime/syntax/testdir/input/vim_ex_vimgrep.vim index 97b9b86f7d..b7688a014e 100644 --- a/runtime/syntax/testdir/input/vim_ex_vimgrep.vim +++ b/runtime/syntax/testdir/input/vim_ex_vimgrep.vim @@ -1,7 +1,7 @@ " Vim :*vimgrep and :*vimgrepadd commands -" VIM_TEST_SETUP highlight link vimVimgrepFile Todo -" VIM_TEST_SETUP highlight link vimCmdSep Operator -" VIM_TEST_SETUP highlight link vimVimgrepBarEscape Special +" VIM_TEST_SETUP hi link vimVimgrepFile Todo +" VIM_TEST_SETUP hi link vimCmdSep Operator +" VIM_TEST_SETUP hi link vimVimgrepBarEscape Special vimgrep pa\%(tt\)ern foo.txt diff --git a/runtime/syntax/testdir/input/vim_expr.vim b/runtime/syntax/testdir/input/vim_expressions.vim similarity index 99% rename from runtime/syntax/testdir/input/vim_expr.vim rename to runtime/syntax/testdir/input/vim_expressions.vim index e2c0dcbad3..ae146c021e 100644 --- a/runtime/syntax/testdir/input/vim_expr.vim +++ b/runtime/syntax/testdir/input/vim_expressions.vim @@ -1,3 +1,6 @@ +" Vim expressions + + " String echo 'It''s a string' diff --git a/runtime/syntax/testdir/input/vim_function_call.vim b/runtime/syntax/testdir/input/vim_function_calls.vim similarity index 94% rename from runtime/syntax/testdir/input/vim_function_call.vim rename to runtime/syntax/testdir/input/vim_function_calls.vim index 50e4a3bf35..eed260c8bd 100644 --- a/runtime/syntax/testdir/input/vim_function_call.vim +++ b/runtime/syntax/testdir/input/vim_function_calls.vim @@ -1,11 +1,11 @@ " Vim function calls -" VIM_TEST_SETUP highlight link vimUserFunc Todo +" VIM_TEST_SETUP hi link vimUserFunc Todo call abs(42) -" command/function distinction +" Command/function distinction " append browse call chdir confirm copy delete eval execute filter function " insert join map match mode sort split substitute swapname type @@ -143,7 +143,7 @@ uniq(42) uniq (42) -" errors +" Errors let foo = foo(42) call foo(42) @@ -161,7 +161,7 @@ echo(42) echo (42) -" expressions +" Expressions let foo = abs(42) @@ -176,7 +176,7 @@ echo Foo() + bar echo bar + Foo() -" scope modifiers and qualified names +" Scope modifiers and qualified names let foo = s:foo(42) call s:foo(42) @@ -238,7 +238,7 @@ let foo = g:module#foo(42) call g:module#foo(42) -" not builtin functions +" Not builtin functions call s:substitute() call g:substitute() @@ -264,7 +264,7 @@ call substitute#substitute() call g:substitute#substitute() -" chained function calls +" Chained function calls call module.foo().bar() call module.foo().substitute() diff --git a/runtime/syntax/testdir/input/vim_function_variables.vim b/runtime/syntax/testdir/input/vim_function_variables.vim index 490896d283..9a5fa140f5 100644 --- a/runtime/syntax/testdir/input/vim_function_variables.vim +++ b/runtime/syntax/testdir/input/vim_function_variables.vim @@ -1,5 +1,6 @@ " Vim function variable highlighting + function Foo() " :let diff --git a/runtime/syntax/testdir/input/vim_key_notation.vim b/runtime/syntax/testdir/input/vim_key_notation.vim index 8572499293..5730e62bf6 100644 --- a/runtime/syntax/testdir/input/vim_key_notation.vim +++ b/runtime/syntax/testdir/input/vim_key_notation.vim @@ -1,5 +1,6 @@ " Key notation + map foo \ \ diff --git a/runtime/syntax/testdir/input/vim_lambda.vim b/runtime/syntax/testdir/input/vim_lambdas.vim similarity index 94% rename from runtime/syntax/testdir/input/vim_lambda.vim rename to runtime/syntax/testdir/input/vim_lambdas.vim index 47c194662e..5503e3fb32 100644 --- a/runtime/syntax/testdir/input/vim_lambda.vim +++ b/runtime/syntax/testdir/input/vim_lambdas.vim @@ -1,7 +1,7 @@ " Vim lambda expressions " VIM_TEST_SETUP hi link vimLambdaOperator Todo -" VIM_TEST_SETUP hi link vimLambdaBrace Todo -" VIM_TEST_SETUP hi link vimFuncParam Identifier +" VIM_TEST_SETUP hi link vimLambdaBrace Todo +" VIM_TEST_SETUP hi link vimFuncParam Identifier let expr = 42 @@ -15,7 +15,7 @@ let Foo = {x, ... -> expr} let Foo = {x, y -> expr} -" line continuations +" Line continuations let Foo = {-> "\ comment diff --git a/runtime/syntax/testdir/input/vim_line_continuation.vim b/runtime/syntax/testdir/input/vim_line_continuation.vim index a32666af34..b7a004b49b 100644 --- a/runtime/syntax/testdir/input/vim_line_continuation.vim +++ b/runtime/syntax/testdir/input/vim_line_continuation.vim @@ -1,5 +1,6 @@ " Vim line continuations with interspersed comments + function Foo( "\ param a \ a, @@ -47,3 +48,4 @@ let array = [ "\ element 3 \ 3 \] + diff --git a/runtime/syntax/testdir/input/vim_new.vim b/runtime/syntax/testdir/input/vim_new.vim index 985cfd3c11..e7e18142bf 100644 --- a/runtime/syntax/testdir/input/vim_new.vim +++ b/runtime/syntax/testdir/input/vim_new.vim @@ -1,13 +1,16 @@ vim9script +# Vim :new command and class constructors +# TODO: move to vim9_constructor and create new vim_ex_new and vim9_ex_new +# tests + -# Vim :new command and class constructors. class Test - def new() - enddef - def newOther() - enddef - def newyetanother() - enddef + def new() + enddef + def newOther() + enddef + def newyetanother() + enddef endclass Test.new() @@ -15,3 +18,4 @@ Test.newOther() Test.newyetanother() new quit + diff --git a/runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim b/runtime/syntax/testdir/input/vim_no_comment_strings.vim similarity index 99% rename from runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim rename to runtime/syntax/testdir/input/vim_no_comment_strings.vim index d9b53b3a30..3a28ab101a 100644 --- a/runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim +++ b/runtime/syntax/testdir/input/vim_no_comment_strings.vim @@ -1,6 +1,7 @@ " Vim comment strings " VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false + " pre "string" post function Foo() @@ -18,3 +19,4 @@ command Foo { autocmd BufNewFile * { # pre "string" post } + diff --git a/runtime/syntax/testdir/input/vim_nvim_features.vim b/runtime/syntax/testdir/input/vim_nvim_features.vim new file mode 100644 index 0000000000..b1b477ed01 --- /dev/null +++ b/runtime/syntax/testdir/input/vim_nvim_features.vim @@ -0,0 +1,229 @@ +" Neovim-specific highlighting +" VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"] + + +echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum + + +echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback +echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar +echo &winblend &winhighlight + + +call api_info() +call buffer_exists() +call buffer_name() +call buffer_number() +call chanclose() +call chansend() +call ctxget() +call ctxpop() +call ctxpush() +call ctxset() +call ctxsize() +call dictwatcheradd() +call dictwatcherdel() +call file_readable() +call highlight_exists() +call highlightID() +call jobclose() +call jobpid() +call jobresize() +call jobsend() +call jobstart() +call jobstop() +call jobwait() +call last_buffer_nr() +call menu_get() +call msgpackdump() +call msgpackparse() +call reg_recorded() +call rpcnotify() +call rpcrequest() +call rpcstart() +call rpcstop() +call serverstart() +call serverstop() +call sockconnect() +call stdioopen() +call stdpath() +call termopen() +call test_write_list_log() +call wait() + +call nvim_buf_add_highlight() +call nvim_buf_attach() +call nvim_buf_clear_highlight() +call nvim_buf_clear_namespace() +call nvim_buf_create_user_command() +call nvim__buf_debug_extmarks() +call nvim_buf_delete() +call nvim_buf_del_extmark() +call nvim_buf_del_keymap() +call nvim_buf_del_mark() +call nvim_buf_del_user_command() +call nvim_buf_del_var() +call nvim_buf_get_changedtick() +call nvim_buf_get_commands() +call nvim_buf_get_extmark_by_id() +call nvim_buf_get_extmarks() +call nvim_buf_get_keymap() +call nvim_buf_get_lines() +call nvim_buf_get_mark() +call nvim_buf_get_name() +call nvim_buf_get_number() +call nvim_buf_get_offset() +call nvim_buf_get_option() +call nvim_buf_get_text() +call nvim_buf_get_var() +call nvim_buf_is_loaded() +call nvim_buf_is_valid() +call nvim_buf_line_count() +call nvim_buf_set_extmark() +call nvim_buf_set_keymap() +call nvim_buf_set_lines() +call nvim_buf_set_mark() +call nvim_buf_set_name() +call nvim_buf_set_option() +call nvim_buf_set_text() +call nvim_buf_set_var() +call nvim_buf_set_virtual_text() +call nvim__buf_stats() +call nvim_call_dict_function() +call nvim_call_function() +call nvim_clear_autocmds() +call nvim_cmd() +call nvim_command() +call nvim_command_output() +call nvim__complete_set() +call nvim_create_augroup() +call nvim_create_autocmd() +call nvim_create_buf() +call nvim_create_namespace() +call nvim_create_user_command() +call nvim_del_augroup_by_id() +call nvim_del_augroup_by_name() +call nvim_del_autocmd() +call nvim_del_current_line() +call nvim_del_keymap() +call nvim_del_mark() +call nvim_del_user_command() +call nvim_del_var() +call nvim_echo() +call nvim_err_write() +call nvim_err_writeln() +call nvim_eval() +call nvim_eval_statusline() +call nvim_exec() +call nvim_exec2() +call nvim_exec_autocmds() +call nvim_feedkeys() +call nvim_get_all_options_info() +call nvim_get_autocmds() +call nvim_get_chan_info() +call nvim_get_color_by_name() +call nvim_get_color_map() +call nvim_get_commands() +call nvim_get_context() +call nvim_get_current_buf() +call nvim_get_current_line() +call nvim_get_current_tabpage() +call nvim_get_current_win() +call nvim_get_hl() +call nvim_get_hl_by_id() +call nvim_get_hl_by_name() +call nvim_get_hl_id_by_name() +call nvim_get_hl_ns() +call nvim_get_keymap() +call nvim__get_lib_dir() +call nvim_get_mark() +call nvim_get_mode() +call nvim_get_namespaces() +call nvim_get_option() +call nvim_get_option_info() +call nvim_get_option_info2() +call nvim_get_option_value() +call nvim_get_proc() +call nvim_get_proc_children() +call nvim__get_runtime() +call nvim_get_runtime_file() +call nvim_get_var() +call nvim_get_vvar() +call nvim__id() +call nvim__id_array() +call nvim__id_dict() +call nvim__id_float() +call nvim_input() +call nvim_input_mouse() +call nvim__inspect_cell() +call nvim__invalidate_glyph_cache() +call nvim_list_bufs() +call nvim_list_chans() +call nvim_list_runtime_paths() +call nvim_list_tabpages() +call nvim_list_uis() +call nvim_list_wins() +call nvim_load_context() +call nvim_notify() +call nvim__ns_get() +call nvim__ns_set() +call nvim_open_term() +call nvim_open_win() +call nvim_out_write() +call nvim_parse_cmd() +call nvim_parse_expression() +call nvim_paste() +call nvim_put() +call nvim__redraw() +call nvim_replace_termcodes() +call nvim__runtime_inspect() +call nvim__screenshot() +call nvim_select_popupmenu_item() +call nvim_set_current_buf() +call nvim_set_current_dir() +call nvim_set_current_line() +call nvim_set_current_tabpage() +call nvim_set_current_win() +call nvim_set_hl() +call nvim_set_hl_ns() +call nvim_set_hl_ns_fast() +call nvim_set_keymap() +call nvim_set_option() +call nvim_set_option_value() +call nvim_set_var() +call nvim_set_vvar() +call nvim__stats() +call nvim_strwidth() +call nvim_tabpage_del_var() +call nvim_tabpage_get_number() +call nvim_tabpage_get_var() +call nvim_tabpage_get_win() +call nvim_tabpage_is_valid() +call nvim_tabpage_list_wins() +call nvim_tabpage_set_var() +call nvim_tabpage_set_win() +call nvim__unpack() +call nvim_win_close() +call nvim_win_del_var() +call nvim_win_get_buf() +call nvim_win_get_config() +call nvim_win_get_cursor() +call nvim_win_get_height() +call nvim_win_get_number() +call nvim_win_get_option() +call nvim_win_get_position() +call nvim_win_get_tabpage() +call nvim_win_get_var() +call nvim_win_get_width() +call nvim_win_hide() +call nvim_win_is_valid() +call nvim_win_set_buf() +call nvim_win_set_config() +call nvim_win_set_cursor() +call nvim_win_set_height() +call nvim_win_set_hl_ns() +call nvim_win_set_option() +call nvim_win_set_var() +call nvim_win_set_width() +call nvim_win_text_height() + diff --git a/runtime/syntax/testdir/input/vim_nvim_variables.vim b/runtime/syntax/testdir/input/vim_nvim_variables.vim deleted file mode 100644 index 661d0474c8..0000000000 --- a/runtime/syntax/testdir/input/vim_nvim_variables.vim +++ /dev/null @@ -1,9 +0,0 @@ -" Neovim variable highlighting -" VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"] - -echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum - -echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback -echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar -echo &winblend &winhighlight - diff --git a/runtime/syntax/testdir/input/vim_shebang.vim b/runtime/syntax/testdir/input/vim_shebang.vim index 47a550cf5a..fd91617ae0 100644 --- a/runtime/syntax/testdir/input/vim_shebang.vim +++ b/runtime/syntax/testdir/input/vim_shebang.vim @@ -1,5 +1,5 @@ #!/usr/bin/env vim -S - " Vim shebang line + #!/usr/bin/env vim -S diff --git a/runtime/syntax/testdir/input/vim_variables.vim b/runtime/syntax/testdir/input/vim_variables.vim index da9e409ea8..110a238f44 100644 --- a/runtime/syntax/testdir/input/vim_variables.vim +++ b/runtime/syntax/testdir/input/vim_variables.vim @@ -1,5 +1,6 @@ " Vim variable highlighting + " :let let foo = expr diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim index 3d4b350d02..6dce6508a6 100644 --- a/runtime/syntax/testdir/runtest.vim +++ b/runtime/syntax/testdir/runtest.vim @@ -106,15 +106,54 @@ func HandleSwapExists() endif endfunc -" Trace ruler liveness on demand. if !empty($VIM_SYNTAX_TEST_LOG) && filewritable($VIM_SYNTAX_TEST_LOG) - def s:TraceRulerLiveness(context: string, times: number, tail: string) + " Trace liveness. + def s:TraceLiveness(context: string, times: number, tail: string) writefile([printf('%s: %4d: %s', context, times, tail)], $VIM_SYNTAX_TEST_LOG, 'a') enddef + + " Anticipate rendering idiosyncrasies (see #16559). + def s:CanFindRenderedFFFDChars( + buf: number, + in_name_and_out_name: string, + times: number): bool + if CannotUseRealEstate(in_name_and_out_name) + return false + endif + # Expect a 20-line terminal buffer (see "term_util#RunVimInTerminal()"), + # where the bottom, reserved line is of the default "&cmdheight". + var lines: list = [] + for lnum: number in range(1, 19) + if stridx(term_getline(buf, lnum), "\xef\xbf\xbd") >= 0 + add(lines, lnum) + endif + endfor + TraceLiveness('F', times, string(lines)) + return !empty(lines) + enddef else - def s:TraceRulerLiveness(_: string, _: number, _: string) + " Do not trace liveness. + def s:TraceLiveness(_: string, _: number, _: string) + enddef + + " Anticipate rendering idiosyncrasies (see #16559). + def s:CanFindRenderedFFFDChars( + buf: number, + in_name_and_out_name: string, + _: number): bool + if CannotUseRealEstate(in_name_and_out_name) + return false + endif + # Expect a 20-line terminal buffer (see "term_util#RunVimInTerminal()"), + # where the bottom, reserved line is of the default "&cmdheight". + for lnum: number in range(1, 19) + if stridx(term_getline(buf, lnum), "\xef\xbf\xbd") >= 0 + return true + endif + endfor + return false enddef endif @@ -142,6 +181,68 @@ def s:CannotDumpShellFirstPage(buf: number, _: list, ruler: list get(term_getcursor(buf), 0) != 20) enddef +def s:CannotUseRealEstate(in_name_and_out_name: string): bool + # Expect defaults from "term_util#RunVimInTerminal()". + if winwidth(1) != 75 || winheight(1) != 20 + ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)', + in_name_and_out_name, + winwidth(1), + winheight(1))) + return true + endif + return false +enddef + +" Throw an "FFFD" string if U+FFFD characters are found in the terminal buffer +" during a non-last test round; otherwise, generate a screendump and proceed +" with its verification. +def s:VerifyScreenDumpOrThrowFFFD( + buf: number, + which_page: string, + in_name_and_out_name: string, + aborted_count: number, + max_aborted_count: number, + basename: string, + opts: dict, + page_quota: dict, + seen_pages: list, + page_nr: number): number + if !has_key(page_quota, page_nr) + # Constrain management of unseen pages to the product of "wait" times + # "max_aborted_count" (see "opts" below). When _test repetition_ and + # _line rewriting_ FAIL page verification, the page gets to keep its + # unseen mark; when _test repetition_ is FAILING for a later page, all + # earlier unseen pages get another chance at _test repetition_ etc. before + # further progress can be made for the later page. + page_quota[page_nr] = max_aborted_count + endif + const with_fffd: bool = CanFindRenderedFFFDChars( + buf, + in_name_and_out_name, + (max_aborted_count - aborted_count + 1)) + if with_fffd && aborted_count > 1 + throw 'FFFD' + endif + ch_log(which_page .. ' screendump for ' .. in_name_and_out_name) + # Generate a screendump of every 19 lines of "buf", reusing the bottom line + # (or the bottom six or so lines for "*_01.dump") from the previous dump as + # the top line(s) in the next dump for continuity. Constrain generation of + # unseen pages for the last test round (via "wait"). + const status: number = g:VerifyScreenDump( + buf, + basename, + (aborted_count != max_aborted_count) + ? extend({wait: max_aborted_count}, opts, 'keep') + : opts) + if !with_fffd || (!status || !page_quota[page_nr]) + add(seen_pages, page_nr) + else + TraceLiveness('Q', (max_aborted_count - aborted_count + 1), string(page_quota)) + endif + page_quota[page_nr] -= 1 + return status +enddef + " Poll for updates of the cursor position in the terminal buffer occupying the " first window. (ALWAYS call the function or its equivalent before calling " "VerifyScreenDump()" *and* after calling any number of "term_sendkeys()".) @@ -149,12 +250,7 @@ def s:TermPollRuler( CannotDumpPage: func, # (TYPE FOR LEGACY CONTEXT CALL SITES.) buf: number, in_name_and_out_name: string): list - # Expect defaults from "term_util#RunVimInTerminal()". - if winwidth(1) != 75 || winheight(1) != 20 - ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)', - in_name_and_out_name, - winwidth(1), - winheight(1))) + if CannotUseRealEstate(in_name_and_out_name) return ['0,0-1', 'All'] endif # A two-fold role for redrawing: @@ -177,7 +273,7 @@ def s:TermPollRuler( redraw endif endwhile - TraceRulerLiveness('P', (2048 - times), in_name_and_out_name) + TraceLiveness('P', (2048 - times), in_name_and_out_name) return ruler enddef @@ -186,12 +282,7 @@ enddef " the terminal buffer. (Call the function before calling "VerifyScreenDump()" " for the first time.) def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list - # Expect defaults from "term_util#RunVimInTerminal()". - if winwidth(1) != 75 || winheight(1) != 20 - ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)', - in_name_and_out_name, - winwidth(1), - winheight(1))) + if CannotUseRealEstate(in_name_and_out_name) return ['0,0-1', 'All'] endif # The contents of "ruler". @@ -210,7 +301,7 @@ def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list = getpos('.') + var fffds: list> = [] + try + cursor(1, 1) + var prev: list = [0, 0] + var next: list = [0, 0] + next = searchpos(fffd, 'c' .. flags) + while next[0] > 0 && prev != next + add(fffds, next) + prev = next + next = searchpos(fffd, flags) + endwhile + finally + setpos('.', pos) + endtry + if !empty(fffds) + # Use "actions/upload-artifact@v4" of ci.yml for delivery. + writefile( + [printf('%s: %s', bufname('%'), string(fffds))], + 'failed/10-FFFDS', + 'a') + endif + redraw! + enddef + def s:AssertCursorForwardProgress(): bool const curnum: number = line('.') if curnum <= cursor @@ -383,12 +502,18 @@ func RunTest() return AssertCursorForwardProgress() enddef END + let MAX_ABORTED_COUNT = 5 let MAX_FAILED_COUNT = 5 - let DUMP_OPTS = exists("$VIM_SYNTAX_TEST_WAIT_TIME") && + let DUMP_OPTS = extend( + \ exists("$VIM_SYNTAX_TEST_WAIT_TIME") && \ !empty($VIM_SYNTAX_TEST_WAIT_TIME) - \ ? {'wait': max([1, str2nr($VIM_SYNTAX_TEST_WAIT_TIME)])} - \ : {} - lockvar DUMP_OPTS MAX_FAILED_COUNT XTESTSCRIPT + \ ? {'wait': max([1, str2nr($VIM_SYNTAX_TEST_WAIT_TIME)])} + \ : {}, + \ {'FileComparisonPreAction': + \ function('g:ScreenDumpDiscardFFFDChars'), + \ 'NonEqualLineComparisonPostAction': + \ function('g:ScreenDumpLookForFFFDChars')}) + lockvar DUMP_OPTS MAX_FAILED_COUNT MAX_ABORTED_COUNT XTESTSCRIPT let ok_count = 0 let disused_pages = [] let failed_tests = [] @@ -456,64 +581,118 @@ func RunTest() let args = !empty(path) \ ? prefix .. ' -S ' .. path \ : prefix - let buf = RunVimInTerminal(args, {}) - " edit the file only after catching the SwapExists event - call term_sendkeys(buf, ":edit " .. fname .. "\") - " set up the testing environment - call term_sendkeys(buf, ":call SetUpVim()\") - " load filetype specific settings - call term_sendkeys(buf, ":call LoadFiletype('" .. filetype .. "')\") + let fail = 0 - " Make a synchronisation point between buffers by requesting to echo - " a known token in the terminal buffer and asserting its availability - " with "s:TermWaitAndPollRuler()". - if filetype == 'sh' - call term_sendkeys(buf, ":call ShellInfo()\") - else - call term_sendkeys(buf, ":echo 'is_nonce'\") - endif - - let root_00 = root .. '_00' - let in_name_and_out_name = fname .. ': failed/' .. root_00 .. '.dump' - " Queue up all "term_sendkeys()"es and let them finish before returning - " from "s:TermWaitAndPollRuler()". - let ruler = s:TermWaitAndPollRuler(buf, in_name_and_out_name) - call ch_log('First screendump for ' .. in_name_and_out_name) - " Make a screendump at the start of the file: failed/root_00.dump - let fail = VerifyScreenDump(buf, root_00, DUMP_OPTS) - let nr = 0 - - " Accommodate the next code block to "buf"'s contingency for self - " wipe-out. try - let keys_a = ":call ScrollToSecondPage((18 * 75 + 1), 19, 5) | redraw!\" - let keys_b = ":call ScrollToNextPage((18 * 75 + 1), 19, 5) | redraw!\" - while s:CannotSeeLastLine(ruler) - call term_sendkeys(buf, keys_a) - let keys_a = keys_b - let nr += 1 - let root_next = printf('%s_%02d', root, nr) - let in_name_and_out_name = fname .. ': failed/' .. root_next .. '.dump' - let ruler = s:TermPollRuler( - \ function('s:CannotDumpNextPage', [buf, ruler]), - \ buf, - \ in_name_and_out_name) - call ch_log('Next screendump for ' .. in_name_and_out_name) - " Make a screendump of every 18 lines of the file: failed/root_NN.dump - let fail += VerifyScreenDump(buf, root_next, DUMP_OPTS) + let aborted_count = MAX_ABORTED_COUNT + let collected_count = 0 + let seen_pages = [] + let page_quota = {} + + " See #16559. For each processed page, repeat pre-verification steps + " from scratch (subject to page cacheing) whenever U+FFFD characters + " are found in the terminal buffer with "term_getline()", i.e. treat + " these pages as if they were distinct test files. U+FFFD characters + " found at the last attempt (see "MAX_ABORTED_COUNT") will be ignored + " and "VerifyScreenDump()" will take over with own filtering. + while aborted_count > 0 + let buf = RunVimInTerminal(args, {}) + try + " edit the file only after catching the SwapExists event + call term_sendkeys(buf, ":edit " .. fname .. "\") + " set up the testing environment + call term_sendkeys(buf, ":call SetUpVim()\") + " load filetype specific settings + call term_sendkeys(buf, ":call LoadFiletype('" .. filetype .. "')\") + + " Collect all *non-spurious* U+FFFD characters for scrutiny. + if aborted_count == 1 && collected_count != 1 + let collected_count = 1 + call term_sendkeys(buf, ":call CollectFFFDChars()\") + endif + + " Make a synchronisation point between a terminal buffer and + " another buffer by requesting to echo a known token in the former + " and asserting its availability with "s:TermWaitAndPollRuler()" + " from the latter. + if filetype == 'sh' + call term_sendkeys(buf, ":call ShellInfo()\") + else + call term_sendkeys(buf, ":echo 'is_nonce'\") + endif + + let page_nr = 0 + let root_00 = root .. '_00' + let in_name_and_out_name = fname .. ': failed/' .. root_00 .. '.dump' + " Queue up all "term_sendkeys()"es and let them finish before + " returning from "s:TermWaitAndPollRuler()". + let ruler = s:TermWaitAndPollRuler(buf, in_name_and_out_name) + if index(seen_pages, page_nr) < 0 + let fail += s:VerifyScreenDumpOrThrowFFFD( + \ buf, + \ 'First', + \ in_name_and_out_name, + \ aborted_count, + \ MAX_ABORTED_COUNT, + \ root_00, + \ DUMP_OPTS, + \ page_quota, + \ seen_pages, + \ page_nr) + " Reset "aborted_count" for another page. + let aborted_count = MAX_ABORTED_COUNT + endif + let keys_a = ":call ScrollToSecondPage((18 * 75 + 1), 19, 5) | redraw!\" + let keys_b = ":call ScrollToNextPage((18 * 75 + 1), 19, 5) | redraw!\" + + while s:CannotSeeLastLine(ruler) + call term_sendkeys(buf, keys_a) + let keys_a = keys_b + let page_nr += 1 + let root_next = printf('%s_%02d', root, page_nr) + let in_name_and_out_name = fname .. ': failed/' .. root_next .. '.dump' + let ruler = s:TermPollRuler( + \ function('s:CannotDumpNextPage', [buf, ruler]), + \ buf, + \ in_name_and_out_name) + if index(seen_pages, page_nr) < 0 + let fail += s:VerifyScreenDumpOrThrowFFFD( + \ buf, + \ 'Next', + \ in_name_and_out_name, + \ aborted_count, + \ MAX_ABORTED_COUNT, + \ root_next, + \ DUMP_OPTS, + \ page_quota, + \ seen_pages, + \ page_nr) + " Reset "aborted_count" for another page. + let aborted_count = MAX_ABORTED_COUNT + endif + endwhile + call StopVimInTerminal(buf) + break + catch /^FFFD$/ + " Clear out. + call StopVimInTerminal(buf) + while winnr('$') > 1 + close + endwhile + let aborted_count -= 1 + endtry endwhile - call StopVimInTerminal(buf) finally call delete('Xtestscript') endtry - let nr += 1 - let pagename = printf('dumps/%s_%02d.dump', root, nr) + let page_nr += 1 + let pagename = printf('dumps/%s_%02d.dump', root, page_nr) while filereadable(pagename) call add(disused_pages, pagename) - let nr += 1 - let pagename = printf('dumps/%s_%02d.dump', root, nr) + let page_nr += 1 + let pagename = printf('dumps/%s_%02d.dump', root, page_nr) endwhile " redraw here to avoid the following messages to get mixed up with screen diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 4e394d35ab..a28aa77af2 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -2,7 +2,7 @@ " Language: Vim script " Maintainer: Hirohito Higashi " Doug Kearns -" Last Change: 2025 Jul 21 +" Last Change: 2025 Aug 01 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -63,29 +63,29 @@ syn keyword vimStdPlugin contained Arguments Asm Break Cfilter Clear Continue Di " vimOptions are caught only when contained in a vimSet {{{2 " GEN_SYN_VIM: vimOption normal, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod' -syn keyword vimOption contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn co columns com comments cms commentstring cp compatible skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained cpt complete cfu completefunc cfc completefuzzycollect cia completeitemalign cot completeopt cpp completepopup csl completeslash cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile efm errorformat ek esckeys ei eventignore eiw eventignorewin skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt ph pumheight pmw pummaxwidth skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto skipwhite nextgroup=vimSetEqual,vimSetMod -syn keyword vimOption contained tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn co columns com comments cms commentstring skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained cp compatible cpt complete cfu completefunc cfc completefuzzycollect cia completeitemalign cot completeopt cpp completepopup csl completeslash cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile efm errorformat ek esckeys ei eventignore skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight hi history hk hkmap hkp hkmapp hls hlsearch skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth mm maxmem skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt ph pumheight skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse skipwhite nextgroup=vimSetEqual,vimSetMod +syn keyword vimOption contained ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight skipwhite nextgroup=vimSetEqual,vimSetMod syn keyword vimOption contained wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes skipwhite nextgroup=vimSetEqual,vimSetMod " vimOptions: These are the turn-off setting variants {{{2 " GEN_SYN_VIM: vimOption turn-off, START_STR='syn keyword vimOption contained', END_STR='' -syn keyword vimOption contained noari noallowrevins noarab noarabic noarshape noarabicshape noacd noautochdir noai noautoindent noar noautoread noasd noautoshelldir noaw noautowrite noawa noautowriteall nobk nobackup nobeval noballooneval nobevalterm noballoonevalterm nobin nobinary nobomb nobri nobreakindent nobl nobuflisted nocdh nocdhome nocin nocindent nocp nocompatible nocf noconfirm noci nocopyindent nocsre nocscoperelative nocst nocscopetag nocsverb nocscopeverbose nocrb nocursorbind nocuc nocursorcolumn nocul nocursorline nodeco nodelcombine nodiff nodg nodigraph noed noedcompatible noemo noemoji noeof noendoffile noeol noendofline noea noequalalways noeb noerrorbells noek noesckeys noet noexpandtab noex noexrc nofic nofileignorecase nofixeol nofixendofline -syn keyword vimOption contained nofen nofoldenable nofs nofsync nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkp nohkmapp nohls nohlsearch noicon noic noignorecase noimc noimcmdline noimd noimdisable nois noincsearch noinf noinfercase noim noinsertmode nojs nojoinspaces nolnr nolangnoremap nolrm nolangremap nolz nolazyredraw nolbr nolinebreak nolisp nolist nolpl noloadplugins nomagic noml nomodeline nomle nomodelineexpr noma nomodifiable nomod nomodified nomore nomousef nomousefocus nomh nomousehide nomousemev nomousemoveevent nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopvw nopreviewwindow noprompt noro noreadonly nornu norelativenumber noremap nors norestorescreen nori norevins norl norightleft noru noruler noscb noscrollbind noscf noscrollfocus -syn keyword vimOption contained nosecure nossl noshellslash nostmp noshelltemp nosr noshiftround nosn noshortname nosc noshowcmd nosft noshowfulltag nosm noshowmatch nosmd noshowmode noscs nosmartcase nosi nosmartindent nosta nosmarttab nosms nosmoothscroll nospell nosb nosplitbelow nospr nosplitright nosol nostartofline noswf noswapfile notbs notagbsearch notr notagrelative notgst notagstack notbidi notermbidi notgc notermguicolors noterse nota notextauto notx notextmode notop notildeop noto notimeout notitle nottimeout notbi nottybuiltin notf nottyfast noudf noundofile novb novisualbell nowarn nowiv noweirdinvert nowic nowildignorecase nowmnu nowildmenu nowfb nowinfixbuf nowfh nowinfixheight nowfw nowinfixwidth nowst nowlsteal nowrap nows nowrapscan nowrite -syn keyword vimOption contained nowa nowriteany nowb nowritebackup noxtermcodes +syn keyword vimOption contained noari noallowrevins noarab noarabic noarshape noarabicshape noacd noautochdir noac noautocomplete noai noautoindent noar noautoread noasd noautoshelldir noaw noautowrite noawa noautowriteall nobk nobackup nobeval noballooneval nobevalterm noballoonevalterm nobin nobinary nobomb nobri nobreakindent nobl nobuflisted nocdh nocdhome nocin nocindent nocp nocompatible nocf noconfirm noci nocopyindent nocsre nocscoperelative nocst nocscopetag nocsverb nocscopeverbose nocrb nocursorbind nocuc nocursorcolumn nocul nocursorline nodeco nodelcombine nodiff nodg nodigraph noed noedcompatible noemo noemoji noeof noendoffile noeol noendofline noea noequalalways noeb noerrorbells noek noesckeys noet noexpandtab noex noexrc nofic nofileignorecase +syn keyword vimOption contained nofixeol nofixendofline nofen nofoldenable nofs nofsync nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkp nohkmapp nohls nohlsearch noicon noic noignorecase noimc noimcmdline noimd noimdisable nois noincsearch noinf noinfercase noim noinsertmode nojs nojoinspaces nolnr nolangnoremap nolrm nolangremap nolz nolazyredraw nolbr nolinebreak nolisp nolist nolpl noloadplugins nomagic noml nomodeline nomle nomodelineexpr noma nomodifiable nomod nomodified nomore nomousef nomousefocus nomh nomousehide nomousemev nomousemoveevent nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopvw nopreviewwindow noprompt noro noreadonly nornu norelativenumber noremap nors norestorescreen nori norevins norl norightleft noru noruler +syn keyword vimOption contained noscb noscrollbind noscf noscrollfocus nosecure nossl noshellslash nostmp noshelltemp nosr noshiftround nosn noshortname nosc noshowcmd nosft noshowfulltag nosm noshowmatch nosmd noshowmode noscs nosmartcase nosi nosmartindent nosta nosmarttab nosms nosmoothscroll nospell nosb nosplitbelow nospr nosplitright nosol nostartofline noswf noswapfile notbs notagbsearch notr notagrelative notgst notagstack notbidi notermbidi notgc notermguicolors noterse nota notextauto notx notextmode notop notildeop noto notimeout notitle nottimeout notbi nottybuiltin notf nottyfast noudf noundofile novb novisualbell nowarn nowiv noweirdinvert nowic nowildignorecase nowmnu nowildmenu nowfb nowinfixbuf nowfh nowinfixheight nowfw nowinfixwidth nowst nowlsteal +syn keyword vimOption contained nowrap nows nowrapscan nowrite nowa nowriteany nowb nowritebackup noxtermcodes " vimOptions: These are the invertible variants {{{2 " GEN_SYN_VIM: vimOption invertible, START_STR='syn keyword vimOption contained', END_STR='' -syn keyword vimOption contained invari invallowrevins invarab invarabic invarshape invarabicshape invacd invautochdir invai invautoindent invar invautoread invasd invautoshelldir invaw invautowrite invawa invautowriteall invbk invbackup invbeval invballooneval invbevalterm invballoonevalterm invbin invbinary invbomb invbri invbreakindent invbl invbuflisted invcdh invcdhome invcin invcindent invcp invcompatible invcf invconfirm invci invcopyindent invcsre invcscoperelative invcst invcscopetag invcsverb invcscopeverbose invcrb invcursorbind invcuc invcursorcolumn invcul invcursorline invdeco invdelcombine invdiff invdg invdigraph inved invedcompatible invemo invemoji inveof invendoffile inveol invendofline invea invequalalways inveb inverrorbells invek invesckeys -syn keyword vimOption contained invet invexpandtab invex invexrc invfic invfileignorecase invfixeol invfixendofline invfen invfoldenable invfs invfsync invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkp invhkmapp invhls invhlsearch invicon invic invignorecase invimc invimcmdline invimd invimdisable invis invincsearch invinf invinfercase invim invinsertmode invjs invjoinspaces invlnr invlangnoremap invlrm invlangremap invlz invlazyredraw invlbr invlinebreak invlisp invlist invlpl invloadplugins invmagic invml invmodeline invmle invmodelineexpr invma invmodifiable invmod invmodified invmore invmousef invmousefocus invmh invmousehide invmousemev invmousemoveevent invnu invnumber invodev invopendevice invpaste invpi invpreserveindent invpvw invpreviewwindow -syn keyword vimOption contained invprompt invro invreadonly invrnu invrelativenumber invremap invrs invrestorescreen invri invrevins invrl invrightleft invru invruler invscb invscrollbind invscf invscrollfocus invsecure invssl invshellslash invstmp invshelltemp invsr invshiftround invsn invshortname invsc invshowcmd invsft invshowfulltag invsm invshowmatch invsmd invshowmode invscs invsmartcase invsi invsmartindent invsta invsmarttab invsms invsmoothscroll invspell invsb invsplitbelow invspr invsplitright invsol invstartofline invswf invswapfile invtbs invtagbsearch invtr invtagrelative invtgst invtagstack invtbidi invtermbidi invtgc invtermguicolors invterse invta invtextauto invtx invtextmode invtop invtildeop invto invtimeout invtitle invttimeout invtbi invttybuiltin -syn keyword vimOption contained invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwst invwlsteal invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes +syn keyword vimOption contained invari invallowrevins invarab invarabic invarshape invarabicshape invacd invautochdir invac invautocomplete invai invautoindent invar invautoread invasd invautoshelldir invaw invautowrite invawa invautowriteall invbk invbackup invbeval invballooneval invbevalterm invballoonevalterm invbin invbinary invbomb invbri invbreakindent invbl invbuflisted invcdh invcdhome invcin invcindent invcp invcompatible invcf invconfirm invci invcopyindent invcsre invcscoperelative invcst invcscopetag invcsverb invcscopeverbose invcrb invcursorbind invcuc invcursorcolumn invcul invcursorline invdeco invdelcombine invdiff invdg invdigraph inved invedcompatible invemo invemoji inveof invendoffile inveol invendofline invea invequalalways inveb inverrorbells +syn keyword vimOption contained invek invesckeys invet invexpandtab invex invexrc invfic invfileignorecase invfixeol invfixendofline invfen invfoldenable invfs invfsync invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkp invhkmapp invhls invhlsearch invicon invic invignorecase invimc invimcmdline invimd invimdisable invis invincsearch invinf invinfercase invim invinsertmode invjs invjoinspaces invlnr invlangnoremap invlrm invlangremap invlz invlazyredraw invlbr invlinebreak invlisp invlist invlpl invloadplugins invmagic invml invmodeline invmle invmodelineexpr invma invmodifiable invmod invmodified invmore invmousef invmousefocus invmh invmousehide invmousemev invmousemoveevent invnu invnumber invodev invopendevice invpaste invpi invpreserveindent +syn keyword vimOption contained invpvw invpreviewwindow invprompt invro invreadonly invrnu invrelativenumber invremap invrs invrestorescreen invri invrevins invrl invrightleft invru invruler invscb invscrollbind invscf invscrollfocus invsecure invssl invshellslash invstmp invshelltemp invsr invshiftround invsn invshortname invsc invshowcmd invsft invshowfulltag invsm invshowmatch invsmd invshowmode invscs invsmartcase invsi invsmartindent invsta invsmarttab invsms invsmoothscroll invspell invsb invsplitbelow invspr invsplitright invsol invstartofline invswf invswapfile invtbs invtagbsearch invtr invtagrelative invtgst invtagstack invtbidi invtermbidi invtgc invtermguicolors invterse invta invtextauto invtx invtextmode invtop invtildeop invto invtimeout invtitle +syn keyword vimOption contained invttimeout invtbi invttybuiltin invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwst invwlsteal invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes " termcap codes (which can also be set) {{{2 " GEN_SYN_VIM: vimOption term output code, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod' syn keyword vimOption contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo skipwhite nextgroup=vimSetEqual,vimSetMod @@ -102,15 +102,15 @@ syn match vimOption contained "t_k;" " vimOptions: These are the variable names {{{2 " GEN_SYN_VIM: vimOption normal variable, START_STR='syn keyword vimOptionVarName contained', END_STR='' -syn keyword vimOptionVarName contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn co columns com comments cms commentstring cp compatible -syn keyword vimOptionVarName contained cpt complete cfu completefunc cfc completefuzzycollect cia completeitemalign cot completeopt cpp completepopup csl completeslash cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile efm errorformat ek esckeys ei eventignore eiw eventignorewin -syn keyword vimOptionVarName contained et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring -syn keyword vimOptionVarName contained ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern -syn keyword vimOptionVarName contained mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt ph pumheight pmw pummaxwidth -syn keyword vimOptionVarName contained pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch -syn keyword vimOptionVarName contained smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto -syn keyword vimOptionVarName contained tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight -syn keyword vimOptionVarName contained wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes +syn keyword vimOptionVarName contained al aleph ari allowrevins ambw ambiwidth arab arabic arshape arabicshape acd autochdir ac autocomplete ai autoindent ar autoread asd autoshelldir aw autowrite awa autowriteall bg background bs backspace bk backup bkc backupcopy bdir backupdir bex backupext bsk backupskip bdlay balloondelay beval ballooneval bevalterm balloonevalterm bexpr balloonexpr bo belloff bin binary bomb brk breakat bri breakindent briopt breakindentopt bsdir browsedir bh bufhidden bl buflisted bt buftype cmp casemap cdh cdhome cd cdpath cedit ccv charconvert chi chistory cin cindent cink cinkeys cino cinoptions cinsd cinscopedecls cinw cinwords cb clipboard cpm clipmethod ch cmdheight cwh cmdwinheight cc colorcolumn co columns com comments cms commentstring +syn keyword vimOptionVarName contained cp compatible cpt complete cfu completefunc cfc completefuzzycollect cia completeitemalign cot completeopt cpp completepopup csl completeslash cocu concealcursor cole conceallevel cf confirm ci copyindent cpo cpoptions cm cryptmethod cspc cscopepathcomp csprg cscopeprg csqf cscopequickfix csre cscoperelative cst cscopetag csto cscopetagorder csverb cscopeverbose crb cursorbind cuc cursorcolumn cul cursorline culopt cursorlineopt debug def define deco delcombine dict dictionary diff dia diffanchors dex diffexpr dip diffopt dg digraph dir directory dy display ead eadirection ed edcompatible emo emoji enc encoding eof endoffile eol endofline ea equalalways ep equalprg eb errorbells ef errorfile efm errorformat ek esckeys ei eventignore +syn keyword vimOptionVarName contained eiw eventignorewin et expandtab ex exrc fenc fileencoding fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight hi history hk hkmap hkp hkmapp hls hlsearch +syn keyword vimOptionVarName contained icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth +syn keyword vimOptionVarName contained mm maxmem mmp maxmempattern mmt maxmemtot msc maxsearchcount mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt +syn keyword vimOptionVarName contained ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc +syn keyword vimOptionVarName contained sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize +syn keyword vimOptionVarName contained twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth +syn keyword vimOptionVarName contained wh winheight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes " GEN_SYN_VIM: vimOption term output code variable, START_STR='syn keyword vimOptionVarName contained', END_STR='' syn keyword vimOptionVarName contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo syn keyword vimOptionVarName contained t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku @@ -161,6 +161,7 @@ syn keyword vimFuncName contained reg_recording reltime reltimefloat reltimestr syn keyword vimFuncName contained sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus term_gettitle term_gettty term_list term_scrape term_sendkeys term_setansicolors syn keyword vimFuncName contained term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq utf16idx values virtcol virtcol2col visualmode wildmenumode wildtrigger win_execute win_findbuf syn keyword vimFuncName contained win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor + " Predefined variable names {{{2 " GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR='' syn keyword vimVimVarName contained count count1 prevcount errmsg warningmsg statusmsg shell_error this_session version lnum termresponse fname lang lc_time ctype charconvert_from charconvert_to fname_in fname_out fname_new fname_diff cmdarg foldstart foldend folddashes foldlevel progname servername dying exception throwpoint register cmdbang insertmode val key profiling fcs_reason fcs_choice beval_bufnr beval_winnr beval_winid beval_lnum beval_col beval_text scrollstart swapname swapchoice swapcommand char mouse_win mouse_winid mouse_lnum mouse_col operator searchforward hlsearch oldfiles windowid progpath completed_item option_new option_old option_oldlocal option_oldglobal option_command option_type errors false true none null numbermax numbermin numbersize @@ -174,6 +175,8 @@ syn keyword vimVimVarName contained vim_did_enter testing t_number t_string t_fu if s:has("nvim") syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight + syn keyword vimFuncName contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait + syn match vimFuncName contained "\" syn keyword vimVimVarName contained lua msgpack_types relnum stderr termrequest virtnum endif @@ -321,6 +324,8 @@ syn match vimVimVar "\\|[bwglstav]:\)\=\%([[:alnum:]_#.]\+\|{.\{-1,}}\)\+" - \ nextgroup=vimDefParams,vimCmdSep,vimComment,vim9Comment + \ nextgroup=vimDefTypeParams,vimDefParams,vimCmdSep,vimComment,vim9Comment \ contains=vimFunctionError,vimFunctionScope,vimFunctionSID,Tag syn match vimFunction "\" skipwhite nextgroup=vimFunctionBang,vimFunctionName,vimFunctionPattern,vimCmdSep,vimComment @@ -552,8 +557,15 @@ syn region vimDefParams contained \ end=")" \ skipwhite skipempty nextgroup=vimDefBody,vimDefComment,vimEnddef,vimReturnType,vimCommentError \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals,vimOperParen +syn region vimDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vimDefParams + \ contains=vim9DefTypeParam syn match vimFunctionParam contained "\<\h\w*\>\|\.\.\." skipwhite nextgroup=vimFunctionParamEquals syn match vimDefParam contained "\<\h\w*\>" skipwhite nextgroup=vimParamType,vimFunctionParamEquals +syn match vim9DefTypeParam contained "\<\u\w*\>" syn match vimFunctionParamEquals contained "=" skipwhite nextgroup=@vimExprList syn match vimFunctionMod contained "\<\%(abort\|closure\|dict\|range\)\>" skipwhite skipempty nextgroup=vimFunctionBody,vimFunctionComment,vimEndfunction,vimFunctionMod,vim9CommentError @@ -585,7 +597,7 @@ if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f' syn region vimDefFold \ start="\" skipwhite nextgroup=vim9MethodDefName,vim9ConstructorDefName - syn match vim9MethodDefName contained "\<\h\w*\>" nextgroup=vim9MethodDefParams contains=@vim9MethodName + syn match vim9MethodDefName contained "\<\h\w*\>" nextgroup=vim9MethodDefParams,vim9MethodDefTypeParams contains=@vim9MethodName syn region vim9MethodDefParams contained \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vim9MethodDefReturnType,vimCommentError \ contains=vimDefParam,vim9Comment,vimFunctionParamEquals + syn region vim9MethodDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9MethodDefParams + \ contains=vim9DefTypeParam syn match vim9ConstructorDefName contained "\<_\=new\w*\>" - \ nextgroup=vim9ConstructorDefParams + \ nextgroup=vim9ConstructorDefParams,vim9ConstuctorDefTypeParams \ contains=@vim9MethodName syn match vim9ConstructorDefParam contained "\<\%(this\.\)\=\h\w*\>" \ skipwhite nextgroup=vimParamType,vimFunctionParamEquals @@ -643,6 +661,12 @@ if s:vim9script \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vim9MethodDefBody,vim9MethodDefComment,vimEnddef,vimCommentError \ contains=vim9ConstructorDefParam,vim9Comment,vimFunctionParamEquals + syn region vim9ConstuctorDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9ConstructorDefParams + \ contains=vim9DefTypeParam syn region vim9MethodDefReturnType contained \ start=":\%(\s\|\n\)\@=" @@ -676,8 +700,11 @@ if s:vim9script syn cluster vim9MethodName contains=vim9MethodName,vim9MethodNameError if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f' - syn region vim9MethodDefFold contained start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\i*(" end="^\s*:\=enddef\>" contains=vim9MethodDef fold keepend extend transparent - syn region vim9MethodDefFold contained start="^\s*:\=def\s\+_\=new\i*(" end="^\s*:\=enddef\>" contains=vim9MethodDef fold keepend extend transparent + syn region vim9MethodDefFold contained + \ start="\%(^\s*\%(:\=static\s\+\)\=\)\@16<=:\=def\s\+\h\w*[<(]" + \ end="^\s*:\=enddef\>" + \ contains=vim9MethodDef + \ fold keepend extend transparent endif syn cluster vim9MethodDef contains=vim9MethodDef,vim9MethodDefFold @@ -728,12 +755,19 @@ if s:vim9script syn cluster vim9EnumNameContinue contains=vim9EnumNameContinue,vim9EnumNameContinueComment " enforce enum value list location - syn match vim9EnumValue contained "\<\a\w*\>" nextgroup=vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment + syn match vim9EnumValue contained "\<\a\w*\>" nextgroup=vim9EnumValueTypeArgs,vim9EnumValueArgList,vim9EnumValueListComma,vim9Comment syn match vim9EnumValueListComma contained "," skipwhite skipempty nextgroup=vim9EnumValue,vim9EnumValueListCommaComment syn region vim9EnumValueListCommaComment contained \ start="#" skip="\n\s*\%(\\\|#\\ \)" end="$" \ skipwhite skipempty nextgroup=vim9EnumValueListCommaComment,vim9EnumValue \ contains=@vimCommentGroup,vimCommentString + syn region vim9EnumValueTypeArgs contained + \ matchgroup=Delimiter + \ start="<\ze\a" + \ end=">" + \ nextgroup=vim9EnumValueArgList + \ contains=@vimType + \ oneline syn region vim9EnumValueArgList contained \ matchgroup=vimParenSep start="(" end=")" \ nextgroup=vim9EnumValueListComma @@ -757,7 +791,7 @@ if s:vim9script syn match vim9InterfaceName contained "\<\u\w*\>" skipwhite skipnl nextgroup=vim9Extends syn keyword vim9AbstractDef contained def skipwhite nextgroup=vim9AbstractDefName - syn match vim9AbstractDefName contained "\<\h\w*\>" skipwhite nextgroup=vim9AbstractDefParams contains=@vim9MethodName + syn match vim9AbstractDefName contained "\<\h\w*\>" skipwhite nextgroup=vim9AbstractDefParams,vim9AbstractDefTypeParams contains=@vim9MethodName syn region vim9AbstractDefParams contained \ matchgroup=Delimiter start="(" end=")" \ skipwhite skipnl nextgroup=vimDefComment,vim9AbstractDefReturnType,vimCommentError @@ -767,6 +801,12 @@ if s:vim9script \ skipwhite skipnl nextgroup=vimDefComment,vimCommentError \ contains=vimTypeSep \ transparent + syn region vim9AbstractDefTypeParams contained + \ matchgroup=Delimiter + \ start="<" + \ end=">" + \ nextgroup=vim9AbstractDefParams + \ contains=vim9DefTypeParam VimFoldi syn region vim9InterfaceBody start="\" matchgroup=vimCommand end="\" contains=@vim9InterfaceBodyList transparent @@ -1429,9 +1469,20 @@ syn match vimMapLhs contained "\%(.\|\S\)\+" contains=vimCtrlChar,vimNotation, syn match vimMapLhs contained "\%(.\|\S\)\+\ze\s*$" contains=vimCtrlChar,vimNotation,vimMapLeader skipwhite skipnl nextgroup=vimMapRhsContinue syn match vimMapBang contained "\a\@1<=!" skipwhite nextgroup=vimMapMod,vimMapLhs syn match vimMapMod contained "\%#=1<\%(buffer\|expr\|nowait\|script\|silent\|special\|unique\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs -syn region vimMapRhs contained start="\S" skip=+\\|\|\@1<=|\|\n\s*\\\|\n\s*"\\ + end="|" end="$" contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader skipnl nextgroup=vimMapRhsContinue -" assume a continuation comment introduces the RHS -syn region vimMapRhsContinue contained start=+^\s*\%(\\\|"\\ \)+ skip=+\\|\|\@1<=|\|\n\s*\\\|\n\s*"\\ + end="|" end="$" contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader +syn region vimMapRhs contained + \ start="\S" + \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+ + \ end="\ze|" + \ end="$" + \ nextgroup=vimCmdSep + \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader +syn region vimMapRhsContinue contained + \ start=+^\s*\%(\\\|["#]\\ \)+ + \ skip=+\\|\|\@1<=|\|\n\s*\%(\\\|["#]\\ \)+ + \ end="\ze|" + \ end="$" + \ nextgroup=vimCmdSep + \ contains=@vimContinue,vimCtrlChar,vimNotation,vimMapLeader syn match vimMapLeader contained "\%#=1\c<\%(local\)\=leader>" contains=vimMapLeaderKey syn keyword vimMapModKey contained buffer expr nowait script silent special unique syn case ignore @@ -1493,7 +1544,7 @@ syn match vimBracket contained "[\\<>]" syn case match " User Command Highlighting: {{{2 -syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' +syn match vimUsrCmd '^\s*\zs\u\%(\w*\)\@>\%([<.(#[]\|\s\+\%([-+*/%]\=\|\.\.\)=\)\@!' " Vim user commands @@ -2150,18 +2201,26 @@ unlet s:interfaces " Function Call Highlighting: {{{2 " (following Gautam Iyer's suggestion) " ========================== -syn match vimFunc contained "\<\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimFuncName -syn match vimUserFunc contained "\.\@1<=\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen -syn match vimUserFunc contained "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vim9MethodName,vim9Super,vim9This -syn match vimUserFunc contained "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimVarScope -syn match vimUserFunc contained "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation +syn match vimFunc contained "\<\l\w*\ze\s*(" skipwhite nextgroup=vimOperParen contains=vimFuncName +syn match vimUserFunc contained "\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs +syn match vimUserFunc contained "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vim9MethodName,vim9Super,vim9This +syn match vimUserFunc contained "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen contains=vimVarScope +syn match vimUserFunc contained "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vimVarScope,vimNotation -Vim9 syn match vim9UserFunc "^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This -Vim9 syn match vim9Func "^\s*\zs\l\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimFuncName +Vim9 syn match vim9UserFunc "^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]" skipwhite nextgroup=vimOperParen,vim9TypeArgs contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This +Vim9 syn match vim9Func "^\s*\zs\l\w*\ze(" skipwhite nextgroup=vimOperParen contains=vimFuncName syn cluster vimFunc contains=vimFunc,vimUserFunc syn cluster vim9Func contains=vim9Func,vim9UserFunc +syn region vim9TypeArgs contained + \ matchgroup=Delimiter + \ start="<\ze\a" + \ end=">" + \ nextgroup=vimOperParen + \ contains=@vimType + \ oneline + " Beginners - Patterns that involve ^ {{{2 " ========= Vim9 syn region vim9LineComment start=+^[ \t:]*\zs#.*$+ skip=+\n\s*\\\|\n\s*#\\ + end="$" contains=@vimCommentGroup,vimCommentString,vim9CommentTitle extend diff --git a/src/INSTALLvms.txt b/src/INSTALLvms.txt index 97406ab535..e1dc452aaf 100644 --- a/src/INSTALLvms.txt +++ b/src/INSTALLvms.txt @@ -31,14 +31,7 @@ Contents: ---------------------------------------------------------------------------- 1. Download files -1.1. Visit the Vim ftp site (see ftp://ftp.vim.org/pub/vim/MIRRORS) - and obtain the following three files: - - unix/vim-X.X-src.tar.gz - unix/vim-X.X-rt.tar.gz - extra/vim-X.X-extra.tar.gz - - where X.X is the version number. +1.1. Visit the Vim Repository Home You may want to clone the latest source code from https://github/vim/vim Or the last tested on OpenVMS from http://polarhome.com/vim/files/source/vms/ diff --git a/src/Make_vms.mms b/src/Make_vms.mms index fb247f3ba4..8eb2455a88 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy -# Last change: 2024 Jan 03 +# Last change: 2025-07-04 Steven M. Schweda # # This script has been tested on VMS 6.2 to 9.2 on VAX, ALPHA, IA64 and X86_64 # with MMS and MMK @@ -11,10 +11,14 @@ # vim.exe: standard (terminal, GUI/Motif, GUI/GTK) # dvim.exe: debug # +###################################################################### +# # Edit the lines in the Configuration section below for fine tuning. # # To build: mms/descrip=Make_vms.mms /ignore=warning # To clean up: mms/descrip=Make_vms.mms clean +# To display --help report: mms/descrip=Make_vms.mms help +# To display --version report: mms/descrip=Make_vms.mms version # # Hints and detailed description could be found in INSTALLVMS.TXT file. # @@ -22,10 +26,6 @@ # Configuration section. ###################################################################### -# Compiler selection. -# Comment out if you use the VAXC compiler -DECC = YES - # Build model selection # TINY - No optional features enabled # NORMAL - A default selection of features enabled @@ -53,7 +53,10 @@ MODEL = HUGE # NOTE: This part can make some complications if you're using some # predefined symbols/flags for your compiler. If does, just leave behind # the comment variable CCVER. -CCVER = YES +.IFDEF VAXC_OR_FORCE_VAXC # VAXC_OR_FORCE_VAXC +.ELSE # VAXC_OR_FORCE_VAXC +CCVER = YES # Unreliable with VAX C. +.ENDIF # VAXC_OR_FORCE_VAXC [ELSE] # Uncomment if want a debug version. Resulting executable is DVIM.EXE # Development purpose only! Normally, it should not be defined. !!! @@ -96,40 +99,172 @@ CCVER = YES # You can find some explanation in INSTALLVMS.TXT ###################################################################### +# Architecture identification and product destination selection. + +# Define old MMK architecture macros when using MMS. + +.IFDEF MMS$ARCH_NAME # MMS$ARCH_NAME +ALPHA_X_ALPHA = 1 +IA64_X_IA64 = 1 +VAX_X_VAX = 1 +X86_64_X_X86_64 = 1 +.IFDEF ARCH # ARCH +ARCH_NAME = $(ARCH) +.ELSE # ARCH +ARCH_NAME = $(MMS$ARCH_NAME) +.ENDIF # ARCH +.IFDEF $(ARCH_NAME)_X_ALPHA # $(ARCH_NAME)_X_ALPHA +__ALPHA__ = 1 +.ENDIF # $(ARCH_NAME)_X_ALPHA +.IFDEF $(ARCH_NAME)_X_IA64 # $(ARCH_NAME)_X_IA64 +__IA64__ = 1 +.ENDIF # $(ARCH_NAME)_X_IA64 +.IFDEF $(ARCH_NAME)_X_VAX # $(ARCH_NAME)_X_VAX +__VAX__ = 1 +.ENDIF # $(ARCH_NAME)_X_VAX +.IFDEF $(ARCH_NAME)_X_X86_64 # $(ARCH_NAME)_X_X86_64 +__X86_64__ = 1 +.ENDIF # $(ARCH_NAME)_X_X86_64 +.ELSE # MMS$ARCH_NAME +.IFDEF __MMK__ # __MMK__ +.IFDEF ARCH # ARCH +.IFDEF __$(ARCH)__ # __$(ARCH)__ +.ELSE # __$(ARCH)__ +__$(ARCH)__ = 1 +.ENDIF # __$(ARCH)__ +.ENDIF # ARCH +.ENDIF # __MMK__ +.ENDIF # MMS$ARCH_NAME + +# Combine command-line VAX C compiler macros. + +.IFDEF VAXC # VAXC +VAXC_OR_FORCE_VAXC = 1 +.ELSE # VAXC +.IFDEF FORCE_VAXC # FORCE_VAXC +VAXC_OR_FORCE_VAXC = 1 +.ENDIF # FORCE_VAXC +.ENDIF # VAXC + +# Analyze architecture-related and option macros. +# (Sense x86_64 before IA64 for old MMK and x86_64 cross tools.) + +.IFDEF __X86_64__ # __X86_64__ +DECC = 1 +DESTM = X86_64 +.ELSE # __X86_64__ +.IFDEF __IA64__ # __IA64__ +DECC = 1 +DESTM = IA64 +.ELSE # __IA64__ +.IFDEF __ALPHA__ # __ALPHA__ +DECC = 1 +DESTM = ALPHA +.ELSE # __ALPHA__ +.IFDEF __VAX__ # __VAX__ +.IFDEF VAXC_OR_FORCE_VAXC # VAXC_OR_FORCE_VAXC +DESTM = VAXV +.ELSE # VAXC_OR_FORCE_VAXC +DECC = 1 +DESTM = VAX +.ENDIF # VAXC_OR_FORCE_VAXC +.ELSE # __VAX__ +DESTM = UNK +UNK_DEST = 1 +.ENDIF # __VAX__ +.ENDIF # __ALPHA__ +.ENDIF # __IA64__ +.ENDIF # __X86_64__ + +.IFDEF PROD # PROD +DEST = $(PROD) +.ELSE # PROD +DEST = $(DESTM) +.ENDIF # PROD + +.FIRST +.IFDEF __MMK__ # __MMK__ + @ write sys$output "" +.ENDIF # __MMK__ + +# Create destination directory. + @ write sys$output "Destination: [.$(DEST)]" + @ write sys$output "" + @ if (f$search( "$(DEST).DIR;1") .eqs. "") then - + create /directory [.$(DEST)] + # Compiler setup -.IFDEF MMSVAX -.IFDEF DECC # VAX with DECC -CC_DEF = cc # /decc # some versions require /decc switch but when it is not required /ver might fail -PREFIX = /prefix=all/name=(upper,short) -OPTIMIZE= /noopt # do not optimize on VAX. The compiler has hard time with crypto functions -.ELSE # VAX with VAXC -CC_DEF = cc -PREFIX = -OPTIMIZE= /noopt -CCVER = -.ENDIF -.ELSE # AXP, IA64, X86 with DECC -CC_DEF = cc -PREFIX = /prefix=all/name=(upper,short) -OPTIMIZE= /opt -.IFDEF MMSX86_64 -ARCH_DEF= # ,__CRTL_VER_OVERRIDE=80400000 -.ENDIF -.ENDIF +# Optimization. The .c.obj rule will override this for specific modules +# where the VAX C compilers hang. See VAX_NOOPTIM_LIST, below. +OPTIMIZE= /optim + +.IFDEF __VAX__ # __VAX__ + +# List of modules for which "Compaq C V6.4-005 on OpenVMS VAX V7.3" +# hangs. Add more as needed (plus-separated). +VAX_NOOPTIM_LIST = blowfish+regexp+sha256 + +# Compiler command. +# Default: CC /DECC. On non-VAX, or VAX with only DEC C installed, +# /DECC is harmless. If both DEC C and VAX C are installed, and VAX C +# was selected as the default, then /DECC must be specified explicitly. +# If both are installed, and DEC C is the default, but VAX C is desired, +# then define FORCE_VAXC to get VAX C (CC /VAXC). If only VAX C is +# installed, then define VAXC to get (plain) CC. + +.IFDEF DECC # DECC +CC_DEF = cc /decc +PREFIX = /prefix=all/name=(upper,short) /repository=[.$(DEST)] +.ELSE # DECC +.IFDEF FORCE_VAXC # FORCE_VAXC +CC_DEF = cc /vaxc +.ELSE # FORCE_VAXC +CC_DEF = cc +.ENDIF # FORCE_VAXC +.ENDIF # DECC +.ELSE # __VAX__ + +# Not VAX, therefore DEC C (with /NAMES, /PREFIX, and /REPOSITORY). + +CC_DEF = cc /decc +PREFIX = /prefix=all/name=(upper,short) /repository=[.$(DEST)] + +# These floating-point options are the defaults on IA64 and x86_64. +# This makes Alpha consistent. +FLOAT = /float = ieee_float /ieee_mode = denorm_results + +# Large-file support. Unavailable on VAX and very old Alpha. To +# disable, define NOLARGE. +.IFDEF NOLARGE +.ELSE +LARGE_DEF = , "_LARGEFILE" +.ENDIF # NOLARGE [ELSE] + +# .IFDEF MMSX86_64 +# ARCH_DEF= # ,__CRTL_VER_OVERRIDE=80400000 +# .ENDIF + +.ENDIF # __VAX__ + +.IFDEF LIST +LIST_OPT = /list=[.$(DEST)] /show=(all, nomessages) +MAP_OPT = /map /cross_reference /full +.ENDIF # LIST + LD_DEF = link C_INC = [.proto] .IFDEF DEBUG DEBUG_DEF = ,"DEBUG" -TARGET = dvim.exe -CFLAGS = /debug/noopt$(PREFIX) -LDFLAGS = /debug +TARGET = [.$(DEST)]dvim.exe +CFLAGS = /debug/noopt$(PREFIX)$(FLOAT)$(LIST_OPT) +LDFLAGS = /debug $(MAP_OPT) .ELSE -TARGET = vim.exe -CFLAGS = $(OPTIMIZE)$(PREFIX) -LDFLAGS = +TARGET = [.$(DEST)]vim.exe +CFLAGS = $(OPTIMIZE)$(PREFIX)$(FLOAT)$(LIST_OPT) +LDFLAGS = $(MAP_OPT) .ENDIF # Predefined VIM directories @@ -173,7 +308,14 @@ DEFS = ,"HAVE_CONFIG_H","FEAT_GUI_GTK" LIBS = ,OS_VMS_GTK.OPT/OPT GUI_FLAG = /float=ieee/ieee=denorm/WARNINGS=(DISABLE=MACROREDEF) GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_gtk_x11.c gui_beval.c pty.c -GUI_OBJ = gui.obj gui_gtk.obj gui_gtk_f.obj gui_gtk_x11.obj gui_beval.obj pty.obj +GUI_OBJ = \ +[.$(DEST)]gui.obj \ +[.$(DEST)]gui_gtk.obj \ +[.$(DEST)]gui_gtk_f.obj \ +[.$(DEST)]gui_gtk_x11.obj \ +[.$(DEST)]gui_beval.obj \ +[.$(DEST)]pty.obj + GUI_INC = ,"/gtk_root/gtk","/gtk_root/glib" # GUI_INC_VER is used just for :ver information # this string should escape from C and DCL in the same time @@ -191,7 +333,14 @@ XPM_INC = LIBS = ,OS_VMS_MOTIF.OPT/OPT GUI_FLAG = /WARNINGS=(DISABLE=MACROREDEF) GUI_SRC = gui.c gui_motif.c gui_x11.c gui_beval.c gui_xmdlg.c gui_xmebw.c -GUI_OBJ = gui.obj gui_motif.obj gui_x11.obj gui_beval.obj gui_xmdlg.obj gui_xmebw.obj +GUI_OBJ = \ +[.$(DEST)]gui.obj \ +[.$(DEST)]gui_motif.obj \ +[.$(DEST)]gui_x11.obj \ +[.$(DEST)]gui_beval.obj \ +[.$(DEST)]gui_xmdlg.obj \ +[.$(DEST)]gui_xmebw.obj + GUI_INC = .ENDIF @@ -211,7 +360,10 @@ LIBS = PERL = perl PERL_DEF = ,"FEAT_PERL" PERL_SRC = if_perlsfio.c if_perl.xs -PERL_OBJ = if_perlsfio.obj if_perl.obj +PERL_OBJ = \ +[.$(DEST)]if_perlsfio.obj \ +[.$(DEST)]if_perl.obj + PERL_LIB = ,OS_VMS_PERL.OPT/OPT PERL_INC = ,dka0:[perlbuild.perl.lib.vms_axp.5_6_1.core] .ENDIF @@ -220,7 +372,7 @@ PERL_INC = ,dka0:[perlbuild.perl.lib.vms_axp.5_6_1.core] # Python related setup. PYTHON_DEF = ,"FEAT_PYTHON" PYTHON_SRC = if_python.c -PYTHON_OBJ = if_python.obj +PYTHON_OBJ = [.$(DEST)]if_python.obj PYTHON_LIB = ,OS_VMS_PYTHON.OPT/OPT PYTHON_INC = ,PYTHON_INCLUDE .ENDIF @@ -229,7 +381,7 @@ PYTHON_INC = ,PYTHON_INCLUDE # Python related setup. PYTHON3_DEF = ,"FEAT_PYTHON3" PYTHON3_SRC = if_python3.c -PYTHON3_OBJ = if_python3.obj +PYTHON3_OBJ = [.$(DEST)]if_python3.obj PYTHON3_LIB = ,OS_VMS_PYTHON3.OPT/OPT PYTHON3_INC = ,PYTHON3_INCLUDE .ENDIF @@ -239,7 +391,7 @@ PYTHON3_INC = ,PYTHON3_INCLUDE # TCL related setup. TCL_DEF = ,"FEAT_TCL" TCL_SRC = if_tcl.c -TCL_OBJ = if_tcl.obj +TCL_OBJ = [.$(DEST)]if_tcl.obj TCL_LIB = ,OS_VMS_TCL.OPT/OPT TCL_INC = ,dka0:[tcl80.generic] .ENDIF @@ -248,7 +400,7 @@ TCL_INC = ,dka0:[tcl80.generic] # RUBY related setup. RUBY_DEF = ,"FEAT_RUBY" RUBY_SRC = if_ruby.c -RUBY_OBJ = if_ruby.obj +RUBY_OBJ = [.$(DEST)]if_ruby.obj RUBY_LIB = ,OS_VMS_RUBY.OPT/OPT RUBY_INC = .ENDIF @@ -257,7 +409,7 @@ RUBY_INC = # LUA related setup. LUA_DEF = ,"FEAT_LUA" LUA_SRC = if_lua.c -LUA_OBJ = if_lua.obj +LUA_OBJ = [.$(DEST)]if_lua.obj LUA_LIB = ,OS_VMS_LUA.OPT/OPT LUA_INC = ,LUA$ROOT:[INCLUDE] .ENDIF @@ -273,7 +425,7 @@ XIM_DEF = ,"FEAT_XIM" # MZSCHEME related setup MZSCHEME_DEF = ,"FEAT_MZSCHEME" MZSCHEME_SRC = if_mzsch.c -MZSCHEME_OBJ = if_mzsch.obj +MZSCHEME_OBJ = [.$(DEST)]if_mzsch.obj .ENDIF .IFDEF VIM_ICONV @@ -283,7 +435,14 @@ ICONV_DEF = ,"USE_ICONV" # XDIFF related setup. XDIFF_SRC = xdiffi.c,xemit.c,xprepare.c,xutils.c,xhistogram.c,xpatience.c -XDIFF_OBJ = xdiffi.obj,xemit.obj,xprepare.obj,xutils.obj,xhistogram.obj,xpatience.obj +XDIFF_OBJ = \ +[.$(DEST)]xdiffi.obj,\ +[.$(DEST)]xemit.obj,\ +[.$(DEST)]xprepare.obj,\ +[.$(DEST)]xutils.obj,\ +[.$(DEST)]xhistogram.obj,\ +[.$(DEST)]xpatience.obj + XDIFF_INC = ,[.xdiff] .IFDEF MODIFIED_BY @@ -303,371 +462,408 @@ MODEL_DEF = "FEAT_$(MODEL)" VIMUSER = "''F$EDIT(F$GETJPI(" ","USERNAME"),"TRIM")'" VIMHOST = "''F$TRNLNM("SYS$NODE")'''F$TRNLNM("UCX$INET_HOST")'.''F$TRNLNM("UCX$INET_DOMAIN")'" -.SUFFIXES : .obj .c +.SUFFIXES : .obj .c # Case problems with old MMS? Ignore: %MMS-I-ALRINSUFFLST -ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF)$(PYTHON3_DEF) - - $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCHEME_DEF) - - $(ICONV_DEF)$(ARCH_DEF)) - +ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF) - + $(PYTHON_DEF)$(PYTHON3_DEF) $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF) - + $(XIM_DEF)$(TAG_DEF)$(MZSCHEME_DEF) $(ICONV_DEF)$(ARCH_DEF) - + $(LARGE_DEF)) - $(CFLAGS)$(GUI_FLAG) - - /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC)$(PYTHON_INC)$(PYTHON3_INC) - - $(TCL_INC)$(XDIFF_INC)$(XPM_INC)) + /include=([.$(DEST)],$(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC) - + $(PYTHON_INC)$(PYTHON3_INC)$(TCL_INC)$(XDIFF_INC)$(XPM_INC)) # CFLAGS displayed in :ver information # It is specially formatted for correct display of unix like includes # as $(GUI_INC) - replaced with $(GUI_INC_VER) # Otherwise should not be any other difference. -ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF)$(PYTHON3_DEF) - - $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCHEME_DEF) - - $(ICONV_DEF)$(ARCH_DEF)) - +ALL_CFLAGS_VER1 = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF) - + $(PYTHON_DEF)$(PYTHON3_DEF) - + $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCHEME_DEF) +ALL_CFLAGS_VER2 = $(ICONV_DEF)$(ARCH_DEF)$(LARGE_DEF)) - $(CFLAGS)$(GUI_FLAG) - - /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC)$(PYTHON_INC)$(PYTHON3_INC) - - $(TCL_INC)$(XDIFF_INC)$(XPM_INC)) + /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC) - + $(PYTHON_INC)$(PYTHON3_INC) $(TCL_INC)$(XDIFF_INC)$(XPM_INC)) ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) $(XPM_LIB)\ $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(TCL_LIB) $(RUBY_LIB) $(LUA_LIB) SRC = \ - alloc.c \ - arabic.c \ - arglist.c \ - autocmd.c \ - beval.c \ - blob.c \ - blowfish.c \ - buffer.c \ - bufwrite.c \ - change.c \ - channel.c \ - charset.c \ - cindent.c \ - clientserver.c \ - clipboard.c \ - cmdexpand.c \ - cmdhist.c \ - crypt.c \ - crypt_zip.c \ - debugger.c \ - dict.c \ - diff.c \ - digraph.c \ - drawline.c \ - drawscreen.c \ - edit.c \ - eval.c \ - evalbuffer.c \ - evalfunc.c \ - evalvars.c \ - evalwindow.c \ - ex_cmds.c \ - ex_cmds2.c \ - ex_docmd.c \ - ex_eval.c \ - ex_getln.c \ - fileio.c \ - filepath.c, \ - findfile.c \ - float.c \ - fold.c \ - getchar.c \ - gc.c \ - gui_xim.c \ - hardcopy.c \ - hashtab.c \ - help.c \ - highlight.c \ - if_cscope.c \ - if_xcmdsrv.c \ - indent.c \ - insexpand.c \ - job.c \ - json.c \ - linematch.c \ - list.c \ - locale.c \ - logfile.c \ - main.c \ - map.c \ - mark.c \ - match.c \ - mbyte.c \ - memfile.c \ - memline.c \ - menu.c \ - message.c \ - misc1.c \ - misc2.c \ - mouse.c \ - move.c \ - normal.c \ - ops.c \ - option.c \ - optionstr.c \ - os_unix.c \ - os_vms.c \ - pathdef.c \ - popupmenu.c \ - popupwin.c \ - profiler.c \ - pty.c \ - quickfix.c \ - regexp.c \ - register.c \ - screen.c \ - scriptfile.c \ - search.c \ - session.c \ - sha256.c \ - sign.c \ - sound.c \ - spell.c \ - spellfile.c \ - spellsuggest.c \ - strings.c \ - syntax.c \ - tabpanel.c \ - tag.c \ - term.c \ - terminal.c \ - termlib.c \ - testing.c \ - textformat.c \ - textobject.c \ - textprop.c \ - time.c \ - tuple.c \ - typval.c \ - ui.c \ - undo.c \ - usercmd.c \ - userfunc.c \ - version.c \ - vim9class.c \ - vim9cmds.c \ - vim9compile.c \ - vim9execute.c \ - vim9expr.c \ - vim9generics.c \ - vim9instr.c \ - vim9script.c \ - vim9type.c \ - viminfo.c \ - window.c \ - $(GUI_SRC) \ - $(XDIFF_SRC) \ - $(LUA_SRC) \ - $(MZSCHEME_SRC) \ - $(PERL_SRC) \ - $(PYTHON_SRC) \ - $(PYTHON3_SRC) \ - $(TCL_SRC) \ - $(RUBY_SRC) + alloc.c \ + arabic.c \ + arglist.c \ + autocmd.c \ + beval.c \ + blob.c \ + blowfish.c \ + buffer.c \ + bufwrite.c \ + change.c \ + channel.c \ + charset.c \ + cindent.c \ + clientserver.c \ + clipboard.c \ + cmdexpand.c \ + cmdhist.c \ + crypt.c \ + crypt_zip.c \ + debugger.c \ + dict.c \ + diff.c \ + digraph.c \ + drawline.c \ + drawscreen.c \ + edit.c \ + eval.c \ + evalbuffer.c \ + evalfunc.c \ + evalvars.c \ + evalwindow.c \ + ex_cmds.c \ + ex_cmds2.c \ + ex_docmd.c \ + ex_eval.c \ + ex_getln.c \ + fileio.c \ + filepath.c, \ + findfile.c \ + float.c \ + fold.c \ + getchar.c \ + gc.c \ + gui_xim.c \ + hardcopy.c \ + hashtab.c \ + help.c \ + highlight.c \ + if_cscope.c \ + if_xcmdsrv.c \ + indent.c \ + insexpand.c \ + job.c \ + json.c \ + linematch.c \ + list.c \ + locale.c \ + logfile.c \ + main.c \ + map.c \ + mark.c \ + match.c \ + mbyte.c \ + memfile.c \ + memline.c \ + menu.c \ + message.c \ + misc1.c \ + misc2.c \ + mouse.c \ + move.c \ + normal.c \ + ops.c \ + option.c \ + optionstr.c \ + os_unix.c \ + os_vms.c \ + [.$(DEST)]pathdef.c \ + popupmenu.c \ + popupwin.c \ + profiler.c \ + pty.c \ + quickfix.c \ + regexp.c \ + register.c \ + screen.c \ + scriptfile.c \ + search.c \ + session.c \ + sha256.c \ + sign.c \ + sound.c \ + spell.c \ + spellfile.c \ + spellsuggest.c \ + strings.c \ + syntax.c \ + tabpanel.c \ + tag.c \ + term.c \ + terminal.c \ + termlib.c \ + testing.c \ + textformat.c \ + textobject.c \ + textprop.c \ + time.c \ + tuple.c \ + typval.c \ + ui.c \ + undo.c \ + usercmd.c \ + userfunc.c \ + version.c \ + vim9class.c \ + vim9cmds.c \ + vim9compile.c \ + vim9execute.c \ + vim9expr.c \ + vim9instr.c \ + vim9generics.c \ + vim9script.c \ + vim9type.c \ + viminfo.c \ + window.c \ + $(GUI_SRC) \ + $(XDIFF_SRC) \ + $(LUA_SRC) \ + $(MZSCHEME_SRC) \ + $(PERL_SRC) \ + $(PYTHON_SRC) \ + $(PYTHON3_SRC) \ + $(TCL_SRC) \ + $(RUBY_SRC) OBJ = \ - alloc.obj \ - arabic.obj \ - arglist.obj \ - autocmd.obj \ - beval.obj \ - blob.obj \ - blowfish.obj \ - buffer.obj \ - bufwrite.obj \ - change.obj \ - channel.obj \ - charset.obj \ - cindent.obj \ - clientserver.obj \ - clipboard.obj \ - cmdexpand.obj \ - cmdhist.obj \ - crypt.obj \ - crypt_zip.obj \ - debugger.obj \ - dict.obj \ - diff.obj \ - digraph.obj \ - drawline.obj \ - drawscreen.obj \ - edit.obj \ - eval.obj \ - evalbuffer.obj \ - evalfunc.obj \ - evalvars.obj \ - evalwindow.obj \ - ex_cmds.obj \ - ex_cmds2.obj \ - ex_docmd.obj \ - ex_eval.obj \ - ex_getln.obj \ - fileio.obj \ - filepath.obj \ - findfile.obj \ - float.obj \ - fold.obj \ - getchar.obj \ - gc.obj \ - gui_xim.obj \ - hardcopy.obj \ - hashtab.obj \ - help.obj \ - highlight.obj \ - if_cscope.obj \ - if_mzsch.obj \ - if_xcmdsrv.obj \ - indent.obj \ - insexpand.obj \ - job.obj \ - json.obj \ - linematch.obj \ - list.obj \ - locale.obj \ - logfile.obj \ - main.obj \ - map.obj \ - mark.obj \ - match.obj \ - mbyte.obj \ - memfile.obj \ - memline.obj \ - menu.obj \ - message.obj \ - misc1.obj \ - misc2.obj \ - mouse.obj \ - move.obj \ - normal.obj \ - ops.obj \ - option.obj \ - optionstr.obj \ - os_unix.obj \ - os_vms.obj \ - pathdef.obj \ - popupmenu.obj \ - popupwin.obj \ - profiler.obj \ - pty.obj \ - quickfix.obj \ - regexp.obj \ - register.obj \ - screen.obj \ - scriptfile.obj \ - search.obj \ - session.obj \ - sha256.obj \ - sign.obj \ - sound.obj \ - spell.obj \ - spellfile.obj \ - spellsuggest.obj \ - strings.obj \ - syntax.obj \ - tabpanel.obj \ - tag.obj \ - term.obj \ - terminal.obj \ - termlib.obj \ - testing.obj \ - textformat.obj \ - textobject.obj \ - textprop.obj \ - time.obj \ - tuple.obj \ - typval.obj \ - ui.obj \ - undo.obj \ - usercmd.obj \ - userfunc.obj \ - version.obj \ - vim9class.obj \ - vim9cmds.obj \ - vim9compile.obj \ - vim9execute.obj \ - vim9expr.obj \ - vim9generics.obj \ - vim9instr.obj \ - vim9script.obj \ - vim9type.obj \ - viminfo.obj \ - window.obj \ - $(GUI_OBJ) \ - $(XDIFF_OBJ) \ - $(LUA_OBJ) \ - $(MZSCHEME_OBJ) \ - $(PERL_OBJ) \ - $(PYTHON_OBJ) \ - $(PYTHON3_OBJ) \ - $(TCL_OBJ) \ - $(RUBY_OBJ) + [.$(DEST)]alloc.obj \ + [.$(DEST)]arabic.obj \ + [.$(DEST)]arglist.obj \ + [.$(DEST)]autocmd.obj \ + [.$(DEST)]beval.obj \ + [.$(DEST)]blob.obj \ + [.$(DEST)]blowfish.obj \ + [.$(DEST)]buffer.obj \ + [.$(DEST)]bufwrite.obj \ + [.$(DEST)]change.obj \ + [.$(DEST)]channel.obj \ + [.$(DEST)]charset.obj \ + [.$(DEST)]cindent.obj \ + [.$(DEST)]clientserver.obj \ + [.$(DEST)]clipboard.obj \ + [.$(DEST)]cmdexpand.obj \ + [.$(DEST)]cmdhist.obj \ + [.$(DEST)]crypt.obj \ + [.$(DEST)]crypt_zip.obj \ + [.$(DEST)]debugger.obj \ + [.$(DEST)]dict.obj \ + [.$(DEST)]diff.obj \ + [.$(DEST)]digraph.obj \ + [.$(DEST)]drawline.obj \ + [.$(DEST)]drawscreen.obj \ + [.$(DEST)]edit.obj \ + [.$(DEST)]eval.obj \ + [.$(DEST)]evalbuffer.obj \ + [.$(DEST)]evalfunc.obj \ + [.$(DEST)]evalvars.obj \ + [.$(DEST)]evalwindow.obj \ + [.$(DEST)]ex_cmds.obj \ + [.$(DEST)]ex_cmds2.obj \ + [.$(DEST)]ex_docmd.obj \ + [.$(DEST)]ex_eval.obj \ + [.$(DEST)]ex_getln.obj \ + [.$(DEST)]fileio.obj \ + [.$(DEST)]filepath.obj \ + [.$(DEST)]findfile.obj \ + [.$(DEST)]float.obj \ + [.$(DEST)]fold.obj \ + [.$(DEST)]getchar.obj \ + [.$(DEST)]gc.obj \ + [.$(DEST)]gui_xim.obj \ + [.$(DEST)]hardcopy.obj \ + [.$(DEST)]hashtab.obj \ + [.$(DEST)]help.obj \ + [.$(DEST)]highlight.obj \ + [.$(DEST)]if_cscope.obj \ + [.$(DEST)]if_mzsch.obj \ + [.$(DEST)]if_xcmdsrv.obj \ + [.$(DEST)]indent.obj \ + [.$(DEST)]insexpand.obj \ + [.$(DEST)]job.obj \ + [.$(DEST)]json.obj \ + [.$(DEST)]linematch.obj \ + [.$(DEST)]list.obj \ + [.$(DEST)]locale.obj \ + [.$(DEST)]logfile.obj \ + [.$(DEST)]main.obj \ + [.$(DEST)]map.obj \ + [.$(DEST)]mark.obj \ + [.$(DEST)]match.obj \ + [.$(DEST)]mbyte.obj \ + [.$(DEST)]memfile.obj \ + [.$(DEST)]memline.obj \ + [.$(DEST)]menu.obj \ + [.$(DEST)]message.obj \ + [.$(DEST)]misc1.obj \ + [.$(DEST)]misc2.obj \ + [.$(DEST)]mouse.obj \ + [.$(DEST)]move.obj \ + [.$(DEST)]normal.obj \ + [.$(DEST)]ops.obj \ + [.$(DEST)]option.obj \ + [.$(DEST)]optionstr.obj \ + [.$(DEST)]os_unix.obj \ + [.$(DEST)]os_vms.obj \ + [.$(DEST)]pathdef.obj \ + [.$(DEST)]popupmenu.obj \ + [.$(DEST)]popupwin.obj \ + [.$(DEST)]profiler.obj \ + [.$(DEST)]pty.obj \ + [.$(DEST)]quickfix.obj \ + [.$(DEST)]regexp.obj \ + [.$(DEST)]register.obj \ + [.$(DEST)]screen.obj \ + [.$(DEST)]scriptfile.obj \ + [.$(DEST)]search.obj \ + [.$(DEST)]session.obj \ + [.$(DEST)]sha256.obj \ + [.$(DEST)]sign.obj \ + [.$(DEST)]sound.obj \ + [.$(DEST)]spell.obj \ + [.$(DEST)]spellfile.obj \ + [.$(DEST)]spellsuggest.obj \ + [.$(DEST)]strings.obj \ + [.$(DEST)]syntax.obj \ + [.$(DEST)]tabpanel.obj \ + [.$(DEST)]tag.obj \ + [.$(DEST)]term.obj \ + [.$(DEST)]terminal.obj \ + [.$(DEST)]termlib.obj \ + [.$(DEST)]testing.obj \ + [.$(DEST)]textformat.obj \ + [.$(DEST)]textobject.obj \ + [.$(DEST)]textprop.obj \ + [.$(DEST)]time.obj \ + [.$(DEST)]tuple.obj \ + [.$(DEST)]typval.obj \ + [.$(DEST)]ui.obj \ + [.$(DEST)]undo.obj \ + [.$(DEST)]usercmd.obj \ + [.$(DEST)]userfunc.obj \ + [.$(DEST)]version.obj \ + [.$(DEST)]vim9class.obj \ + [.$(DEST)]vim9cmds.obj \ + [.$(DEST)]vim9compile.obj \ + [.$(DEST)]vim9execute.obj \ + [.$(DEST)]vim9expr.obj \ + [.$(DEST)]vim9instr.obj \ + [.$(DEST)]vim9generics.obj \ + [.$(DEST)]vim9script.obj \ + [.$(DEST)]vim9type.obj \ + [.$(DEST)]viminfo.obj \ + [.$(DEST)]window.obj \ + $(GUI_OBJ) \ + $(XDIFF_OBJ) \ + $(LUA_OBJ) \ + $(MZSCHEME_OBJ) \ + $(PERL_OBJ) \ + $(PYTHON_OBJ) \ + $(PYTHON3_OBJ) \ + $(TCL_OBJ) \ + $(RUBY_OBJ) # Default target is making the executable -all : [.auto]config.h mmk_compat motif_env gtk_env perl_env python_env tcl_env ruby_env lua_env $(TARGET) +all : [.$(DEST)]config.h mmk_compat motif_env gtk_env perl_env \ + python_env tcl_env ruby_env lua_env $(TARGET) ! $@ -[.auto]config.h : $(CONFIG_H) - copy/nolog $(CONFIG_H) [.auto]config.h - -@ open/append ac [.auto]config.h +[.$(DEST)]config.h : $(CONFIG_H) + copy/nolog $(CONFIG_H) [.$(DEST)]config.h + -@ open/append ac [.$(DEST)]config.h -@ hash[0,8]=35 -@ quotes[0,8]=34 -@ if ""$(DEF_MODIFIED)"" .EQS. "YES" then write ac ''hash',"define MODIFIED_BY ",''quotes',$(MODIFIED_BY),''quotes' -@ close ac mmk_compat : - -@ open/write pd pathdef.c + -@ open/write pd [.$(DEST)]pathdef.c -@ write pd "/* Empty file to satisfy MMK depend. */" - -@ write pd "/* It will be overwritten later on... */" + -@ write pd "/* It will be overwritten later... */" -@ close pd clean : - -@ if "''F$SEARCH("*.exe")'" .NES. "" then delete/noconfirm/nolog *.exe;* - -@ if "''F$SEARCH("*.obj")'" .NES. "" then delete/noconfirm/nolog *.obj;* - -@ if "''F$SEARCH("[.auto]config.h")'" .NES. "" then delete/noconfirm/nolog [.auto]config.h;* - -@ if "''F$SEARCH("pathdef.c")'" .NES. "" then delete/noconfirm/nolog pathdef.c;* - -@ if "''F$SEARCH("if_perl.c")'" .NES. "" then delete/noconfirm/nolog if_perl.c;* - -@ if "''F$SEARCH("*.opt")'" .NES. "" then delete/noconfirm/nolog *.opt;* - -@ if "''F$SEARCH("*.dmp")'" .NES. "" then delete/noconfirm/nolog *.dmp;* + -@ if (f$search( "[.$(DEST)]*.*") .nes. "") then - + delete /noconfirm [.$(DEST)]*.*;* + -@ if (f$search( "$(DEST).DIR") .nes. "") then - + set protection = w:d $(DEST).DIR;* + -@ if (f$search( "$(DEST).DIR") .nes. "") then - + delete /noconfirm $(DEST).DIR;* + +help : + mcr sys$disk:$(TARGET) --help + +version : + mcr sys$disk:$(TARGET) --version # Link the target $(TARGET) : $(OBJ) # make an OPT file - as the obj file list is too long for one command line - -@ DIRECTORY *.OBJ. /BRIEF/COLUMNS=1/NOHEADING/NOTRAILING /SELECT=FILE=(NONODE,NODEVICE,NODIRECTORY,NOVERSION)/OUTPUT=ALL_OBJS_LIST.OPT - $(LD_DEF) $(LDFLAGS) /exe=$(TARGET) ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS) + -@ DIRECTORY [.$(DEST)]*.OBJ. /BRIEF/COLUMNS=1 /NOHEADING - + /NOTRAILING /SELECT=FILE=(NONODE,NODEVICE,NODIRECTORY,NOVERSION) - + /OUTPUT=[.$(DEST)]ALL_OBJS_LIST.OPT + -@ def_dev_dir_orig = f$environment( "default") + -@ target_name_type = - + f$parse( "$(TARGET)", , , "NAME", "SYNTAX_ONLY")+ - + f$parse( "$(TARGET)", , , "TYPE", "SYNTAX_ONLY") + -@ set default [.$(DEST)] + $(LD_DEF) $(LDFLAGS) /exe = 'target_name_type' - + ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS) + -@ set default 'def_dev_dir_orig' .c.obj : - $(CC_DEF) $(ALL_CFLAGS) $< +# Override /optimize for selected modules on VAX. +.IFDEF __VAX__ # __VAX__ + @ mod = f$parse( "$@", , , "NAME", "SYNTAX_ONLY") + @ mod = "+"+ f$edit( mod, "LOWERCASE")+ "+" + @ optim_qual = "" + @ if (f$locate( mod, "+$(VAX_NOOPTIM_LIST)+") .lt. - + f$length( "+$(VAX_NOOPTIM_LIST)+")) then optim_qual = "/nooptim" + @ if (f$locate( mod, "+$(VAX_NOOPTIM_LIST)+") .lt. - + f$length( "+$(VAX_NOOPTIM_LIST)+")) then - + @ write sys$output - + " *** NOTE: USING SPECIAL /NOOPTIMIZE RULE. ***" + $(CC_DEF) $(ALL_CFLAGS) 'optim_qual' $< /object = $@ +.ELSE # __VAX__ + $(CC_DEF) $(ALL_CFLAGS) $< /object = $@ +.ENDIF # __VAX__ [ELSE] -pathdef.c : check_ccver $(CONFIG_H) +[.$(DEST)]pathdef.c : check_ccver $(CONFIG_H) -@ write sys$output "creating PATHDEF.C file." - -@ open/write pd pathdef.c + -@ open/write pd $@ -@ write pd "/* pathdef.c -- DO NOT EDIT! */" -@ write pd "/* This file is automatically created by MAKE_VMS.MMS" -@ write pd " * Change the file MAKE_VMS.MMS Only. */" -@ write pd "typedef unsigned char char_u;" -@ write pd "char_u *default_vim_dir = (char_u *)"$(VIMLOC)";" -@ write pd "char_u *default_vimruntime_dir = (char_u *)"$(VIMRUN)";" - -@ write pd "char_u *all_cflags = (char_u *)""$(CC_DEF)$(ALL_CFLAGS_VER)"";" - -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS) /exe=$(TARGET) ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS)"";" + -@ write pd "char_u *all_cflags = (char_u *)""$(CC_DEF)""" + -@ write pd " ""$(ALL_CFLAGS_VER1)""" + -@ write pd " ""$(ALL_CFLAGS_VER2)"";" + -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS)""" + -@ write pd " ""/exe=$(TARGET) ALL_OBJS_LIST.OPT/OPT $(ALL_LIBS)"";" -@ write pd "char_u *compiler_version = (char_u *) ""''CC_VER'"";" -@ write pd "char_u *compiled_user = (char_u *) "$(VIMUSER)";" -@ write pd "char_u *compiled_sys = (char_u *) "$(VIMHOST)";" -@ write pd "char_u *compiled_arch = (char_u *) ""$(MMSARCH_NAME)"";" + -@ write pd "char_u *compiled_vers = (char_u *) """ + - + f$getsyi( "version")+ """;" -@ close pd -if_perl.c : if_perl.xs +[.$(DEST)]if_perl.c : if_perl.xs -@ $(PERL) PERL_ROOT:[LIB.ExtUtils]xsubpp -prototypes -typemap - PERL_ROOT:[LIB.ExtUtils]typemap if_perl.xs >> $@ make_vms.mms : -@ write sys$output "The name of the makefile MUST be !!!" +# WHY??? (SMS.) .IFDEF CCVER # This part can make some complications if you're using some predefined # symbols/flags for your compiler. If does, just comment out CCVER variable check_ccver : - -@ define sys$output cc_ver.tmp + -@ define /user_mode sys$error nl: + -@ define /user_mode sys$output [.$(DEST)]cc_ver.tmp -@ $(CC_DEF)/version - -@ deassign sys$output - -@ open/read file cc_ver.tmp + -@ open/read file [.$(DEST)]cc_ver.tmp -@ read file CC_VER -@ close file - -@ delete/noconfirm/nolog cc_ver.tmp.* + -@ delete/noconfirm/nolog [.$(DEST)]cc_ver.tmp.* .ELSE check_ccver : -@ ! @@ -678,24 +874,21 @@ motif_env : .IFDEF XPM -@ write sys$output "using DECW/Motif/XPM environment." -@ write sys$output "creating OS_VMS_XPM.OPT file." - -@ open/write opt_file OS_VMS_XPM.OPT -.IFDEF MMSVAX - -@ write opt_file "[.xpm.vms.vax]libxpm.olb/lib" -.ENDIF -.IFDEF MMSALPHA - -@ write opt_file "[.xpm.vms.axp]libxpm.olb/lib" -.ENDIF -.IFDEF MMSIA64 - -@ write opt_file "[.xpm.vms.ia64]libxpm.olb/lib" + -@ open/write opt_file [.$(DEST)]OS_VMS_XPM.OPT +.IFDEF __ALPHA__ +ARCH_XPM = axp +.ELSE +ARCH_XPM = $(ARCH) .ENDIF + -@ write opt_file "[.xpm.vms.$(ARCH_XPM)]libxpm.olb/lib" -@ close opt_file .ELSE -@ write sys$output "using DECW/Motif environment." .ENDIF -@ write sys$output "creating OS_VMS_MOTIF.OPT file." - -@ open/write opt_file OS_VMS_MOTIF.OPT - -@ write opt_file "sys$share:decw$xmlibshr12.exe/share,-" - -@ write opt_file "sys$share:decw$xtlibshrr5.exe/share,-" + -@ open/write opt_file [.$(DEST)]OS_VMS_MOTIF.OPT + -@ write opt_file "sys$share:decw$xmlibshr12.exe/share" + -@ write opt_file "sys$share:decw$xtlibshrr5.exe/share" -@ write opt_file "sys$share:decw$xlibshr.exe/share" -@ close opt_file .ELSE @@ -711,7 +904,7 @@ gtk_env : -@ show logical gtk_root -@ write sys$output " include path: "$(GUI_INC)"" -@ write sys$output "creating OS_VMS_GTK.OPT file." - -@ open/write opt_file OS_VMS_GTK.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_GTK.OPT -@ write opt_file "gtk_root:[glib]libglib.exe /share,-" -@ write opt_file "gtk_root:[glib.gmodule]libgmodule.exe /share,-" -@ write opt_file "gtk_root:[gtk.gdk]libgdk.exe /share,-" @@ -731,12 +924,12 @@ perl_env : -@ show logical PERLSHR -@ write sys$output " include path: ""$(PERL_INC)""" -@ show symbol perl - -@ open/write pd if_perl.c + -@ open/write pd [.$(DEST)]if_perl.c -@ write pd "/* Empty file to satisfy MMK depend. */" - -@ write pd "/* It will be overwritten later on... */" + -@ write pd "/* It will be overwritten later... */" -@ close pd -@ write sys$output "creating OS_VMS_PERL.OPT file." - -@ open/write opt_file OS_VMS_PERL.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_PERL.OPT -@ write opt_file "PERLSHR /share" -@ close opt_file .ELSE @@ -750,7 +943,7 @@ python_env : -@ show logical PYTHON_INCLUDE -@ show logical PYTHON_OLB -@ write sys$output "creating OS_VMS_PYTHON.OPT file." - -@ open/write opt_file OS_VMS_PYTHON.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_PYTHON.OPT -@ write opt_file "PYTHON_OLB:PYTHON.OLB /share" -@ close opt_file .ELSE @@ -764,7 +957,7 @@ python3_env : -@ show logical PYTHON3_INCLUDE -@ show logical PYTHON3_OLB -@ write sys$output "creating OS_VMS_PYTHON3.OPT file." - -@ open/write opt_file OS_VMS_PYTHON3.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_PYTHON3.OPT -@ write opt_file "PYTHON3_OLB:PYTHON3.OLB /share" -@ close opt_file .ELSE @@ -778,7 +971,7 @@ tcl_env : -@ show logical TCLSHR -@ write sys$output " include path: ""$(TCL_INC)""" -@ write sys$output "creating OS_VMS_TCL.OPT file." - -@ open/write opt_file OS_VMS_TCL.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_TCL.OPT -@ write opt_file "TCLSHR /share" -@ close opt_file .ELSE @@ -791,7 +984,7 @@ ruby_env : -@ write sys$output "using RUBY environment:" -@ write sys$output " include path: ""$(RUBY_INC)""" -@ write sys$output "creating OS_VMS_RUBY.OPT file." - -@ open/write opt_file OS_VMS_RUBY.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_RUBY.OPT -@ write opt_file "RUBYSHR /share" -@ close opt_file .ELSE @@ -804,7 +997,7 @@ lua_env : -@ write sys$output "using LUA environment:" -@ write sys$output " include path: ""$(LUA_INC)""" -@ write sys$output "creating OS_VMS_LUA.OPT file." - -@ open/write opt_file OS_VMS_LUA.OPT + -@ open/write opt_file [.$(DEST)]OS_VMS_LUA.OPT -@ write opt_file "LUA$ROOT:[LIB]LUA$SHR.EXE /share" -@ close opt_file .ELSE @@ -812,467 +1005,467 @@ lua_env : -@ ! .ENDIF -alloc.obj : alloc.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]alloc.obj : alloc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -arabic.obj : arabic.c vim.h -arglist.obj : arglist.c vim.h [.auto]config.h feature.h os_unix.h -autocmd.obj : autocmd.c vim.h [.auto]config.h feature.h os_unix.h -blowfish.obj : blowfish.c vim.h [.auto]config.h feature.h os_unix.h -blob.obj : blob.c vim.h [.auto]config.h feature.h os_unix.h -buffer.obj : buffer.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]arabic.obj : arabic.c vim.h +[.$(DEST)]arglist.obj : arglist.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]autocmd.obj : autocmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]blowfish.obj : blowfish.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]blob.obj : blob.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]buffer.obj : buffer.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -bufwrite.obj : bufwrite.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]bufwrite.obj : bufwrite.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -change.obj : change.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]change.obj : change.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -charset.obj : charset.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]charset.obj : charset.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -channel.obj : channel.c vim.h [.auto]config.h feature.h -cindent.obj : cindent.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]channel.obj : channel.c vim.h [.$(DEST)]config.h feature.h +[.$(DEST)]cindent.obj : cindent.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -clientserver.obj : clientserver.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]clientserver.obj : clientserver.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -clipboard.obj : clipboard.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]clipboard.obj : clipboard.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -cmdexpand.obj : cmdexpand.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]cmdexpand.obj : cmdexpand.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -cmdhist.obj : cmdhist.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]cmdhist.obj : cmdhist.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -crypt.obj : crypt.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]crypt.obj : crypt.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -crypt_zip.obj : crypt_zip.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]crypt_zip.obj : crypt_zip.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -debugger.obj : debugger.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]debugger.obj : debugger.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -dict.obj : dict.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]dict.obj : dict.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -diff.obj : diff.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]diff.obj : diff.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -digraph.obj : digraph.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]digraph.obj : digraph.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -drawline.obj : drawline.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]drawline.obj : drawline.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -drawscreen.obj : drawscreen.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]drawscreen.obj : drawscreen.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -edit.obj : edit.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]edit.obj : edit.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -eval.obj : eval.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]eval.obj : eval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -evalbuffer.obj : evalbuffer.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]evalbuffer.obj : evalbuffer.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -evalfunc.obj : evalfunc.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]evalfunc.obj : evalfunc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h version.h -evalvars.obj : evalvars.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]evalvars.obj : evalvars.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h version.h -evalwindow.obj : evalwindow.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]evalwindow.obj : evalwindow.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -ex_cmds.obj : ex_cmds.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ex_cmds.obj : ex_cmds.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -ex_cmds2.obj : ex_cmds2.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ex_cmds2.obj : ex_cmds2.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -ex_docmd.obj : ex_docmd.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ex_docmd.obj : ex_docmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h ex_cmdidxs.h -ex_eval.obj : ex_eval.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ex_eval.obj : ex_eval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -ex_getln.obj : ex_getln.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ex_getln.obj : ex_getln.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -fileio.obj : fileio.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]fileio.obj : fileio.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -filepath.obj : filepath.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]filepath.obj : filepath.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -findfile.obj : findfile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]findfile.obj : findfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -float.obj : float.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]float.obj : float.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -fold.obj : fold.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]fold.obj : fold.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -getchar.obj : getchar.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]getchar.obj : getchar.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -gc.obj : gc.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gc.obj : gc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -gui_xim.obj : gui_xim.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_xim.obj : gui_xim.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -hardcopy.obj : hardcopy.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]hardcopy.obj : hardcopy.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -hashtab.obj : hashtab.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]hashtab.obj : hashtab.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -help.obj : help.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]help.obj : help.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -highlight.obj : highlight.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]highlight.obj : highlight.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_cscope.obj : if_cscope.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_cscope.obj : if_cscope.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_xcmdsrv.obj : if_xcmdsrv.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_xcmdsrv.obj : if_xcmdsrv.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -if_mzsch.obj : if_mzsch.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_mzsch.obj : if_mzsch.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro ex_cmds.h proto.h \ errors.h globals.h if_mzsch.h -indent.obj : indent.c vim.h [.auto]config.h feature.h os_unix.h -insexpand.obj : insexpand.c vim.h [.auto]config.h feature.h os_unix.h -job.obj : job.c vim.h [.auto]config.h feature.h os_unix.h -json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]indent.obj : indent.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]insexpand.obj : insexpand.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]job.obj : job.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]json.obj : json.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -linematch.obj : linematch.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]linematch.obj : linematch.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -list.obj : list.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]list.obj : list.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -locale.obj : locale.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]locale.obj : locale.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -logfile.obj : logfile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]logfile.obj : logfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -main.obj : main.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]main.obj : main.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h \ arabic.c -map.obj : map.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]map.obj : map.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -mark.obj : mark.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]mark.obj : mark.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -match.obj : match.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]match.obj : match.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -memfile.obj : memfile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]memfile.obj : memfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -memline.obj : memline.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]memline.obj : memline.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -menu.obj : menu.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]menu.obj : menu.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -message.obj : message.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]message.obj : message.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -misc1.obj : misc1.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]misc1.obj : misc1.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h \ version.h -misc2.obj : misc2.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]misc2.obj : misc2.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -mouse.obj : mouse.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]mouse.obj : mouse.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -move.obj : move.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]move.obj : move.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -mbyte.obj : mbyte.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]mbyte.obj : mbyte.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -normal.obj : normal.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]normal.obj : normal.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h nv_cmdidxs.h nv_cmds.h -ops.obj : ops.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ops.obj : ops.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -option.obj : option.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]option.obj : option.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h optiondefs.h -optionstr.obj : optionstr.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]optionstr.obj : optionstr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -os_unix.obj : os_unix.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]os_unix.obj : os_unix.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h os_unixx.h -os_vms.obj : os_vms.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]os_vms.obj : os_vms.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h os_unixx.h -pathdef.obj : pathdef.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]pathdef.obj : [.$(DEST)]pathdef.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -popupmenu.obj : popupmenu.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]popupmenu.obj : popupmenu.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -popupwin.obj : popupwin.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]popupwin.obj : popupwin.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -pty.obj : pty.c vim.h [.auto]config.h feature.h os_unix.h -profiler.obj : profiler.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]pty.obj : pty.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]profiler.obj : profiler.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -quickfix.obj : quickfix.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]quickfix.obj : quickfix.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -regexp.obj : regexp.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]regexp.obj : regexp.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -register.obj : register.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]register.obj : register.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -scriptfile.obj : scriptfile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]scriptfile.obj : scriptfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -screen.obj : screen.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]screen.obj : screen.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -search.obj : search.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]search.obj : search.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -session.obj : session.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]session.obj : session.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -sha256.obj : sha256.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]sha256.obj : sha256.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -sign.obj : sign.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]sign.obj : sign.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ errors.h globals.h -sound.obj : sound.c vim.h [.auto]config.h feature.h -spell.obj : spell.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]sound.obj : sound.c vim.h [.$(DEST)]config.h feature.h +[.$(DEST)]spell.obj : spell.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -spellfile.obj : spellfile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]spellfile.obj : spellfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -spellsuggest.obj : spellsuggest.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]spellsuggest.obj : spellsuggest.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -strings.obj : strings.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]strings.obj : strings.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -syntax.obj : syntax.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]syntax.obj : syntax.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -tabpanel.obj : tabpanel.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]tabpanel.obj : tabpanel.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -tag.obj : tag.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]tag.obj : tag.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -term.obj : term.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]term.obj : term.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -terminal.obj : terminal.c vim.h [.auto]config.h feature.h os_unix.h -termlib.obj : termlib.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]terminal.obj : terminal.c vim.h [.$(DEST)]config.h feature.h os_unix.h +[.$(DEST)]termlib.obj : termlib.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -testing.obj : testing.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]testing.obj : testing.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -textformat.obj : textformat.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]textformat.obj : textformat.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -textobject.obj : textobject.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]textobject.obj : textobject.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -textprop.obj : textprop.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]textprop.obj : textprop.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -time.obj : time.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]time.obj : time.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -tuple.obj : tuple.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]tuple.obj : tuple.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -typval.obj : typval.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]typval.obj : typval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -ui.obj : ui.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]ui.obj : ui.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -undo.obj : undo.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]undo.obj : undo.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -usercmd.obj : usercmd.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]usercmd.obj : usercmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -userfunc.obj : userfunc.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]userfunc.obj : userfunc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h option.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ proto.h errors.h globals.h -version.obj : version.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]version.obj : version.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -viminfo.obj : viminfo.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]viminfo.obj : viminfo.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9class.obj : vim9class.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9class.obj : vim9class.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9cmds.obj : vim9cmds.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9cmds.obj : vim9cmds.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9compile.obj : vim9compile.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9compile.obj : vim9compile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9execute.obj : vim9execute.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9execute.obj : vim9execute.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9expr.obj : vim9expr.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9expr.obj : vim9expr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9generics.obj : vim9generics.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9instr.obj : vim9instr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9instr.obj : vim9instr.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9generics.obj : vim9generics.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9script.obj : vim9script.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9script.obj : vim9script.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -vim9type.obj : vim9type.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]vim9type.obj : vim9type.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -window.obj : window.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]window.obj : window.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -gui.obj : gui.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui.obj : gui.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -gui_gtk.obj : gui_gtk.c gui_gtk_f.h vim.h [.auto]config.h feature.h \ +[.$(DEST)]gui_gtk.obj : gui_gtk.c gui_gtk_f.h vim.h [.$(DEST)]config.h feature.h \ os_unix.h ascii.h keymap.h termdefs.h macros.h structs.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h \ proto.h errors.h globals.h [-.pixmaps]stock_icons.h -gui_gtk_f.obj : gui_gtk_f.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_gtk_f.obj : gui_gtk_f.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h gui_gtk_f.h -gui_motif.obj : gui_motif.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_motif.obj : gui_motif.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h [-.pixmaps]alert.xpm [-.pixmaps]error.xpm \ [-.pixmaps]generic.xpm [-.pixmaps]info.xpm [-.pixmaps]quest.xpm -gui_athena.obj : gui_athena.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_athena.obj : gui_athena.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h gui_at_sb.h -gui_gtk_x11.obj : gui_gtk_x11.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_gtk_x11.obj : gui_gtk_x11.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h gui_gtk_f.h [-.runtime]vim32x32.xpm \ [-.runtime]vim16x16.xpm [-.runtime]vim48x48.xpm version.h -gui_x11.obj : gui_x11.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_x11.obj : gui_x11.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h [-.runtime]vim32x32.xpm \ @@ -1292,56 +1485,56 @@ gui_x11.obj : gui_x11.c vim.h [.auto]config.h feature.h os_unix.h \ [-.pixmaps]tb_shell.xpm [-.pixmaps]tb_replace.xpm \ [-.pixmaps]tb_vsplit.xpm [-.pixmaps]tb_maxwidth.xpm \ [-.pixmaps]tb_minwidth.xpm -gui_at_sb.obj : gui_at_sb.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_at_sb.obj : gui_at_sb.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h gui_at_sb.h -gui_at_fs.obj : gui_at_fs.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_at_fs.obj : gui_at_fs.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h gui_at_sb.h -pty.obj : pty.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]pty.obj : pty.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h -if_perl.obj : [.auto]if_perl.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_perl.obj : [.auto]if_perl.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_perlsfio.obj : if_perlsfio.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_perlsfio.obj : if_perlsfio.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_python.obj : if_python.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_python.obj : if_python.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_tcl.obj : if_tcl.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_tcl.obj : if_tcl.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -if_ruby.obj : if_ruby.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_ruby.obj : if_ruby.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -if_lua.obj : if_lua.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]if_lua.obj : if_lua.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ errors.h globals.h version.h -beval.obj : beval.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]beval.obj : beval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h option.h ex_cmds.h proto.h \ errors.h globals.h -gui_beval.obj : gui_beval.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]gui_beval.obj : gui_beval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h -netbeans.obj : netbeans.c vim.h [.auto]config.h feature.h os_unix.h \ +[.$(DEST)]netbeans.obj : netbeans.c vim.h [.$(DEST)]config.h feature.h os_unix.h \ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ errors.h globals.h version.h -gui_xmdlg.obj : gui_xmdlg.c [.auto]config.h vim.h feature.h os_unix.h -gui_xmebw.obj : gui_xmebw.c [.auto]config.h vim.h feature.h os_unix.h -xdiffi.obj : [.xdiff]xdiffi.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h -xemit.obj : [.xdiff]xemit.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h -xprepare.obj : [.xdiff]xprepare.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h -xutils.obj : [.xdiff]xutils.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h -xhistogram.obj : [.xdiff]xhistogram.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h -xpatience.obj : [.xdiff]xpatience.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h +[.$(DEST)]gui_xmdlg.obj : gui_xmdlg.c [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]gui_xmebw.obj : gui_xmebw.c [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xdiffi.obj : [.xdiff]xdiffi.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xemit.obj : [.xdiff]xemit.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xprepare.obj : [.xdiff]xprepare.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xutils.obj : [.xdiff]xutils.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xhistogram.obj : [.xdiff]xhistogram.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h +[.$(DEST)]xpatience.obj : [.xdiff]xpatience.c [.xdiff]xinclude.h [.$(DEST)]config.h vim.h feature.h os_unix.h diff --git a/src/auto/configure b/src/auto/configure index a5b9624e75..ffe8b37270 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -8895,14 +8895,14 @@ if test ${enable_cscope+y} then : enableval=$enable_cscope; else case e in #( - e) enable_cscope="no" ;; + e) enable_cscope="yes" ;; esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 printf "%s\n" "$enable_cscope" >&6; } if test "$enable_cscope" = "yes"; then - printf "%s\n" "#define FEAT_CSCOPE 1" >>confdefs.h + printf "%s\n" "#define ENABLE_CSCOPE 1" >>confdefs.h fi diff --git a/src/clipboard.c b/src/clipboard.c index 9bb618a3fb..e83c3035c8 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@ -2356,8 +2356,6 @@ clip_wl_receive_data(Clipboard_T *cbd, const char *mime_type, int fd) FD_ZERO(&rfds); FD_SET(fd, &rfds); - tv.tv_sec = 0; - tv.tv_usec = p_wtm * 1000; #endif // Make pipe (read end) non-blocking @@ -2385,10 +2383,13 @@ clip_wl_receive_data(Clipboard_T *cbd, const char *mime_type, int fd) poll_data: #ifndef HAVE_SELECT if (poll(&pfd, 1, p_wtm) > 0) -#else - if (select(fd + 1, &rfds, NULL, NULL, &tv) > 0) -#endif continue; +#else + tv.tv_sec = 0; + tv.tv_usec = p_wtm * 1000; + if (select(fd + 1, &rfds, NULL, NULL, &tv) > 0) + continue; +#endif } break; } @@ -2621,6 +2622,11 @@ clip_wl_send_data( if (written == -1) break; total += written; + +#ifdef HAVE_SELECT + tv.tv_sec = 0; + tv.tv_usec = p_wtm * 1000; +#endif } exit: vim_free(string); diff --git a/src/config.h.in b/src/config.h.in index 1b8495515f..fce8d5f44f 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -395,7 +395,7 @@ #undef HAVE_SYSMOUSE /* Define if you want to include the Cscope interface. */ -#undef FEAT_CSCOPE +#undef ENABLE_CSCOPE /* Define if you don't want to include right-left support. */ #undef DISABLE_RIGHTLEFT diff --git a/src/configure.ac b/src/configure.ac index ca84982680..56b3c9355d 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,6 +1,6 @@ dnl configure.ac: autoconf script for Vim -dnl Process this file with autoconf 2.71 to produce "configure". +dnl Process this file with autoconf 2.72 to produce "configure". AC_INIT AC_CONFIG_SRCDIR([vim.h]) @@ -2346,10 +2346,10 @@ AC_SUBST(RUBY_LIBS) AC_MSG_CHECKING(--enable-cscope argument) AC_ARG_ENABLE(cscope, [ --enable-cscope Include cscope interface.], , - [enable_cscope="no"]) + [enable_cscope="yes"]) AC_MSG_RESULT($enable_cscope) if test "$enable_cscope" = "yes"; then - AC_DEFINE(FEAT_CSCOPE) + AC_DEFINE(ENABLE_CSCOPE) fi AC_MSG_CHECKING(--disable-netbeans argument) diff --git a/src/dict.c b/src/dict.c index d43ca863e9..5339bb52cd 100644 --- a/src/dict.c +++ b/src/dict.c @@ -1075,12 +1075,12 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal) had_comma = **arg == ','; if (had_comma) { - if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1])) + if (vim9script && !IS_WHITE_NL_OR_NUL((*arg)[1])) { semsg(_(e_white_space_required_after_str_str), ",", *arg); goto failret; } - *arg = skipwhite(*arg + 1); + *arg = skipwhite_and_nl(*arg + 1); } // the "}" can be on the next line diff --git a/src/edit.c b/src/edit.c index b1f0cb6271..7ffee77544 100644 --- a/src/edit.c +++ b/src/edit.c @@ -983,6 +983,17 @@ doESCkey: case Ctrl_H: did_backspace = ins_bs(c, BACKSPACE_CHAR, &inserted_space); auto_format(FALSE, TRUE); + if (did_backspace && p_ac && !char_avail() + && curwin->w_cursor.col > 0) + { + c = char_before_cursor(); + if (ins_compl_setup_autocompl(c)) + { + update_screen(UPD_VALID); // Show char deletion immediately + out_flush(); + goto docomplete; // Trigger autocompletion + } + } break; case Ctrl_W: // delete word before the cursor @@ -1410,6 +1421,14 @@ normalchar: // closed fold. foldOpenCursor(); #endif + // Trigger autocompletion + if (p_ac && !char_avail() && ins_compl_setup_autocompl(c)) + { + update_screen(UPD_VALID); // Show character immediately + out_flush(); + goto docomplete; + } + break; } // end of switch (c) @@ -2242,6 +2261,10 @@ insertchar( if ( !ISSPECIAL(c) && (!has_mbyte || (*mb_char2len)(c) == 1) && !has_insertcharpre() +#ifdef FEAT_EVAL + // Skip typeahead if test_override("char_avail", 1) was called. + && !disable_char_avail_for_testing +#endif && vpeekc() != NUL && !(State & REPLACE_FLAG) && !cindent_on() diff --git a/src/errors.h b/src/errors.h index 771a8b0200..92d5671ad9 100644 --- a/src/errors.h +++ b/src/errors.h @@ -3635,8 +3635,12 @@ EXTERN char e_concrete_method_str_override_with_generic_method_in_class_str[] INIT(= N_("E1433: Overriding concrete method \"%s\" in class \"%s\" with a generic method")); EXTERN char e_generic_method_str_type_arguments_mismatch_in_class_str[] INIT(= N_("E1434: Mismatched number of type variables for generic method \"%s\" in class \"%s\"")); +EXTERN char e_enum_can_only_be_used_in_script[] + INIT(= N_("E1435: Enum can only be used in a script")); +EXTERN char e_interface_can_only_be_used_in_script[] + INIT(= N_("E1436: Interface can only be used in a script")); #endif -// E1435 - E1499 unused (reserved for Vim9 class support) +// E1437 - E1499 unused (reserved for Vim9 class support) EXTERN char e_cannot_mix_positional_and_non_positional_str[] INIT(= N_("E1500: Cannot mix positional and non-positional arguments: %s")); EXTERN char e_fmt_arg_nr_unused_str[] diff --git a/src/evalfunc.c b/src/evalfunc.c index a58c6367b8..3fd704d7f7 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -5220,7 +5220,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) { // generic function start_bracket = name; - skip_generic_func_type_args(&name); + if (skip_generic_func_type_args(&name) == FAIL) + goto theend; } if (*name != NUL) s = NULL; diff --git a/src/feature.h b/src/feature.h index 1573487fc7..c043206272 100644 --- a/src/feature.h +++ b/src/feature.h @@ -236,7 +236,7 @@ /* * +cscope Unix only: Cscope support. */ -#if defined(UNIX) && defined(FEAT_HUGE) && !defined(FEAT_CSCOPE) && !defined(MACOS_X) +#if defined(UNIX) && defined(FEAT_HUGE) && defined(ENABLE_CSCOPE) && !defined(MACOS_X) # define FEAT_CSCOPE #endif diff --git a/src/globals.h b/src/globals.h index 35c141ca9b..0c2bf9480a 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1696,6 +1696,7 @@ extern char_u *all_lflags; # ifdef VMS extern char_u *compiler_version; extern char_u *compiled_arch; +extern char_u *compiled_vers; # endif extern char_u *compiled_user; extern char_u *compiled_sys; diff --git a/src/gui.c b/src/gui.c index e375a8c977..12a7e66092 100644 --- a/src/gui.c +++ b/src/gui.c @@ -396,7 +396,7 @@ gui_init_check(void) return result; } - gui.shell_created = FALSE; + gui.shell_created = false; gui.dying = FALSE; gui.in_focus = TRUE; // so the guicursor setting works gui.dragged_sb = SBAR_NONE; @@ -717,7 +717,7 @@ gui_init(void) gui_init_which_components(NULL); // All components of the GUI have been created now - gui.shell_created = TRUE; + gui.shell_created = true; #ifdef FEAT_GUI_MSWIN // Set the shell size, adjusted for the screen size. For GTK this only diff --git a/src/gui.h b/src/gui.h index e97281b3b8..4fab18afbd 100644 --- a/src/gui.h +++ b/src/gui.h @@ -252,7 +252,7 @@ typedef struct Gui int in_focus; // Vim has input focus int in_use; // Is the GUI being used? int starting; // GUI will start in a little while - int shell_created; // Has the shell been created yet? + bool shell_created; // Has the shell been created yet? int dying; // Is vim dying? Then output to terminal int dofork; // Use fork() when GUI is starting #ifdef GUI_MAY_SPAWN diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index c000a1181f..14a3367b6f 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1732,15 +1732,6 @@ gui_mch_init_check(void) } #endif -#if GTK_CHECK_VERSION(3,10,0) - // Vim currently assumes that Gtk means X11, so it cannot use native Gtk - // support for other backends such as Wayland. - // - // Use an environment variable to enable unfinished Wayland support. - if (getenv("GVIM_ENABLE_WAYLAND") == NULL) - gdk_set_allowed_backends ("x11"); -#endif - #ifdef FEAT_GUI_GNOME if (gtk_socket_id == 0) using_gnome = 1; @@ -2704,6 +2695,10 @@ global_event_filter(GdkXEvent *xev, static void mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) { +#include "../runtime/vim16x16.xpm" +#include "../runtime/vim32x32.xpm" +#include "../runtime/vim48x48.xpm" + GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin); // When started with "--echo-wid" argument, write window ID on stdout. @@ -2718,10 +2713,32 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) if (vim_strchr(p_go, GO_ICON) != NULL) { - /* - * Add an icon to the main window. For fun and convenience of the user. - */ - gtk_window_set_icon_name(GTK_WINDOW(gui.mainwin), "gvim"); + GtkIconTheme *icon_theme; + + icon_theme = gtk_icon_theme_get_default(); + + if (icon_theme && gtk_icon_theme_has_icon(icon_theme, "gvim")) + { + gtk_window_set_icon_name(GTK_WINDOW(gui.mainwin), "gvim"); + } + else + { + /* + * Add an icon to the main window. For fun and convenience of the user. + */ + GList *icons = NULL; + + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim16x16)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim32x32)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim48x48)); + + gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons); + + // TODO: is this type cast OK? + g_list_foreach(icons, (GFunc)(void *)&g_object_unref, NULL); + g_list_free(icons); + } + g_object_unref(icon_theme); } #if !defined(USE_GNOME_SESSION) diff --git a/src/insexpand.c b/src/insexpand.c index dd1a117867..64ed50e440 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -198,6 +198,24 @@ static expand_T compl_xp; static win_T *compl_curr_win = NULL; // win where completion is active static buf_T *compl_curr_buf = NULL; // buf where completion is active +#define COMPL_INITIAL_TIMEOUT_MS 80 +// Autocomplete uses a decaying timeout: starting from COMPL_INITIAL_TIMEOUT_MS, +// if the current source exceeds its timeout, it is interrupted and the next +// begins with half the time. A small minimum timeout ensures every source +// gets at least a brief chance. +static int compl_autocomplete = FALSE; // whether autocompletion is active +static int compl_timeout_ms = COMPL_INITIAL_TIMEOUT_MS; +static int compl_time_slice_expired = FALSE; // time budget exceeded for current source +static int compl_from_nonkeyword = FALSE; // completion started from non-keyword + +// Halve the current completion timeout, simulating exponential decay. +#define COMPL_MIN_TIMEOUT_MS 5 +#define DECAY_COMPL_TIMEOUT() \ + do { \ + if (compl_timeout_ms > COMPL_MIN_TIMEOUT_MS) \ + compl_timeout_ms /= 2; \ + } while (0) + // List of flags for method of completion. static int compl_cont_status = 0; # define CONT_ADDING 1 // "normal" or "adding" expansion @@ -224,6 +242,9 @@ typedef struct cpt_source_T int cs_refresh_always; // Whether 'refresh:always' is set for func int cs_startcol; // Start column returned by func int cs_max_matches; // Max items to display from this source +#ifdef ELAPSED_FUNC + elapsed_T compl_start_tv; // Timestamp when match collection starts +#endif } cpt_source_T; #define STARTCOL_NONE -9 @@ -283,7 +304,7 @@ ins_ctrl_x(void) if (!ctrl_x_mode_cmdline()) { // if the next ^X<> won't ADD nothing, then reset compl_cont_status - if (compl_cont_status & CONT_N_ADDS) + if ((compl_cont_status & CONT_N_ADDS) && !p_ac) compl_cont_status |= CONT_INTRPT; else compl_cont_status = 0; @@ -553,6 +574,9 @@ is_first_match(compl_T *match) int ins_compl_accept_char(int c) { + if (compl_autocomplete && compl_from_nonkeyword) + return FALSE; + if (ctrl_x_mode & CTRL_X_WANT_IDENT) // When expanding an identifier only accept identifier chars. return vim_isIDc(c); @@ -816,7 +840,9 @@ cfc_has_mode(void) static int is_nearest_active(void) { - return (get_cot_flags() & (COT_NEAREST | COT_FUZZY)) == COT_NEAREST; + int flags = get_cot_flags(); + return (compl_autocomplete || (flags & COT_NEAREST)) + && !(flags & COT_FUZZY); } /* @@ -1268,7 +1294,7 @@ ins_compl_del_pum(void) pum_wanted(void) { // 'completeopt' must contain "menu" or "menuone" - if ((get_cot_flags() & COT_ANY_MENU) == 0) + if ((get_cot_flags() & COT_ANY_MENU) == 0 && !compl_autocomplete) return FALSE; // The display looks bad on a B&W display. @@ -1301,7 +1327,7 @@ pum_enough_matches(void) compl = compl->cp_next; } while (!is_first_match(compl)); - if (get_cot_flags() & COT_MENUONE) + if ((get_cot_flags() & COT_MENUONE) || compl_autocomplete) return (i >= 1); return (i >= 2); } @@ -1552,7 +1578,8 @@ ins_compl_build_pum(void) int i = 0; int cur = -1; unsigned int cur_cot_flags = get_cot_flags(); - int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0; + int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0 + || compl_autocomplete; int fuzzy_filter = (cur_cot_flags & COT_FUZZY) != 0; compl_T *match_head = NULL; compl_T *match_tail = NULL; @@ -2016,10 +2043,12 @@ ins_compl_files( leader_len = (int)ins_compl_leader_len(); } - for (i = 0; i < count && !got_int && !compl_interrupted; i++) + for (i = 0; i < count && !got_int && !compl_interrupted + && !compl_time_slice_expired; i++) { fp = mch_fopen((char *)files[i], "r"); // open dictionary file - if (flags != DICT_EXACT && !shortmess(SHM_COMPLETIONSCAN)) + if (flags != DICT_EXACT && !shortmess(SHM_COMPLETIONSCAN) + && !compl_autocomplete) { msg_hist_off = TRUE; // reset in msg_trunc_attr() vim_snprintf((char *)IObuff, IOSIZE, @@ -2032,7 +2061,8 @@ ins_compl_files( // Read dictionary file line by line. // Check each line for a match. - while (!got_int && !compl_interrupted && !vim_fgets(buf, LSIZE, fp)) + while (!got_int && !compl_interrupted && !compl_time_slice_expired + && !vim_fgets(buf, LSIZE, fp)) { ptr = buf; if (regmatch != NULL) @@ -2215,6 +2245,9 @@ ins_compl_clear(void) VIM_CLEAR_STRING(compl_orig_text); compl_enter_selects = FALSE; cpt_sources_clear(); + compl_autocomplete = FALSE; + compl_from_nonkeyword = FALSE; + compl_num_bests = 0; #ifdef FEAT_EVAL // clear v:completed_item set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc_lock(VAR_FIXED)); @@ -2305,7 +2338,7 @@ ins_compl_has_preinsert(void) { int cur_cot_flags = get_cot_flags(); return (cur_cot_flags & (COT_PREINSERT | COT_FUZZY | COT_MENUONE)) - == (COT_PREINSERT | COT_MENUONE); + == (COT_PREINSERT | COT_MENUONE) && !compl_autocomplete; } /* @@ -2429,6 +2462,8 @@ ins_compl_new_leader(void) save_w_wrow = curwin->w_wrow; save_w_leftcol = curwin->w_leftcol; compl_restarting = TRUE; + if (p_ac) + compl_autocomplete = TRUE; if (ins_complete(Ctrl_N, FALSE) == FAIL) compl_cont_status = 0; compl_restarting = FALSE; @@ -2543,6 +2578,9 @@ ins_compl_restart(void) compl_cont_status = 0; compl_cont_mode = 0; cpt_sources_clear(); + compl_autocomplete = FALSE; + compl_from_nonkeyword = FALSE; + compl_num_bests = 0; } /* @@ -2903,6 +2941,9 @@ ins_compl_stop(int c, int prev_mode, int retval) edit_submode = NULL; showmode(); } + compl_autocomplete = FALSE; + compl_from_nonkeyword = FALSE; + compl_best_matches = 0; if (c == Ctrl_C && cmdwin_type != 0) // Avoid the popup menu remains displayed when leaving the @@ -3641,7 +3682,10 @@ f_complete_check(typval_T *argvars UNUSED, typval_T *rettv) RedrawingDisabled = 0; ins_compl_check_keys(0, TRUE); - rettv->vval.v_number = ins_compl_interrupted(); + if (compl_autocomplete && compl_time_slice_expired) + rettv->vval.v_number = TRUE; + else + rettv->vval.v_number = ins_compl_interrupted(); RedrawingDisabled = save_RedrawingDisabled; } @@ -4115,6 +4159,7 @@ process_next_cpt_value( { int compl_type = -1; int status = INS_COMPL_CPT_OK; + int skip_source = compl_autocomplete && compl_from_nonkeyword; st->found_all = FALSE; *advance_cpt_idx = FALSE; @@ -4122,7 +4167,8 @@ process_next_cpt_value( while (*st->e_cpt == ',' || *st->e_cpt == ' ') st->e_cpt++; - if (*st->e_cpt == '.' && !curbuf->b_scanned) + if (*st->e_cpt == '.' && !curbuf->b_scanned && !skip_source + && !compl_time_slice_expired) { st->ins_buf = curbuf; st->first_match_pos = *start_match_pos; @@ -4143,7 +4189,8 @@ process_next_cpt_value( // wrap and come back there a second time. st->set_match_pos = TRUE; } - else if (vim_strchr((char_u *)"buwU", *st->e_cpt) != NULL + else if (!skip_source && !compl_time_slice_expired + && vim_strchr((char_u *)"buwU", *st->e_cpt) != NULL && (st->ins_buf = ins_compl_next_buf( st->ins_buf, *st->e_cpt)) != curbuf) { @@ -4168,7 +4215,7 @@ process_next_cpt_value( st->dict = st->ins_buf->b_fname; st->dict_f = DICT_EXACT; } - if (!shortmess(SHM_COMPLETIONSCAN)) + if (!shortmess(SHM_COMPLETIONSCAN) && !compl_autocomplete) { msg_hist_off = TRUE; // reset in msg_trunc_attr() vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"), @@ -4186,18 +4233,6 @@ process_next_cpt_value( { if (ctrl_x_mode_line_or_eval()) compl_type = -1; - else if (*st->e_cpt == 'k' || *st->e_cpt == 's') - { - if (*st->e_cpt == 'k') - compl_type = CTRL_X_DICTIONARY; - else - compl_type = CTRL_X_THESAURUS; - if (*++st->e_cpt != ',' && *st->e_cpt != NUL) - { - st->dict = st->e_cpt; - st->dict_f = DICT_FIRST; - } - } #ifdef FEAT_COMPL_FUNC else if (*st->e_cpt == 'F' || *st->e_cpt == 'o') { @@ -4207,24 +4242,39 @@ process_next_cpt_value( compl_type = -1; } #endif -#ifdef FEAT_FIND_ID - else if (*st->e_cpt == 'i') - compl_type = CTRL_X_PATH_PATTERNS; - else if (*st->e_cpt == 'd') - compl_type = CTRL_X_PATH_DEFINES; -#endif - else if (*st->e_cpt == ']' || *st->e_cpt == 't') + else if (!skip_source) { - compl_type = CTRL_X_TAGS; - if (!shortmess(SHM_COMPLETIONSCAN)) + if (*st->e_cpt == 'k' || *st->e_cpt == 's') { - msg_hist_off = TRUE; // reset in msg_trunc_attr() - vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); - (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); + if (*st->e_cpt == 'k') + compl_type = CTRL_X_DICTIONARY; + else + compl_type = CTRL_X_THESAURUS; + if (*++st->e_cpt != ',' && *st->e_cpt != NUL) + { + st->dict = st->e_cpt; + st->dict_f = DICT_FIRST; + } } +#ifdef FEAT_FIND_ID + else if (*st->e_cpt == 'i') + compl_type = CTRL_X_PATH_PATTERNS; + else if (*st->e_cpt == 'd') + compl_type = CTRL_X_PATH_DEFINES; +#endif + else if (*st->e_cpt == ']' || *st->e_cpt == 't') + { + compl_type = CTRL_X_TAGS; + if (!shortmess(SHM_COMPLETIONSCAN) && !compl_autocomplete) + { + msg_hist_off = TRUE; // reset in msg_trunc_attr() + vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); + (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); + } + } + else + compl_type = -1; } - else - compl_type = -1; // in any case e_cpt is advanced to the next entry (void)copy_option_part(&st->e_cpt, IObuff, IOSIZE, ","); @@ -4751,7 +4801,8 @@ get_next_default_completion(ins_compl_next_state_T *st, pos_T *start_pos) int looped_around = FALSE; char_u *ptr = NULL; int len = 0; - int in_collect = (cfc_has_mode() && compl_length > 0); + int in_fuzzy_collect = (cfc_has_mode() && compl_length > 0) + || ((get_cot_flags() & COT_FUZZY) && compl_autocomplete); char_u *leader = ins_compl_leader(); int score = 0; int in_curbuf = st->ins_buf == curbuf; @@ -4777,7 +4828,7 @@ get_next_default_completion(ins_compl_next_state_T *st, pos_T *start_pos) ++msg_silent; // Don't want messages for wrapscan. - if (in_collect) + if (in_fuzzy_collect) { found_new_match = search_for_fuzzy_match(st->ins_buf, st->cur_match_pos, leader, compl_direction, @@ -4836,7 +4887,7 @@ get_next_default_completion(ins_compl_next_state_T *st, pos_T *start_pos) && start_pos->col == st->cur_match_pos->col) continue; - if (!in_collect) + if (!in_fuzzy_collect) ptr = ins_compl_get_next_word_or_line(st->ins_buf, st->cur_match_pos, &len, &cont_s_ipos); if (ptr == NULL || (ins_compl_has_preinsert() && STRCMP(ptr, compl_pattern.string) == 0)) @@ -4854,7 +4905,7 @@ get_next_default_completion(ins_compl_next_state_T *st, pos_T *start_pos) in_curbuf ? NULL : st->ins_buf->b_sfname, 0, cont_s_ipos, score) != NOTDONE) { - if (in_collect && score == compl_first_match->cp_next->cp_score) + if (in_fuzzy_collect && score == compl_first_match->cp_next->cp_score) compl_num_bests++; found_new_match = OK; break; @@ -5175,6 +5226,21 @@ prepare_cpt_compl_funcs(void) return FAIL; } +/* + * Start the timer for the current completion source. + */ + static void +compl_source_start_timer(int source_idx UNUSED) +{ +#ifdef ELAPSED_FUNC + if (compl_autocomplete && cpt_sources_array != NULL) + { + ELAPSED_INIT(cpt_sources_array[source_idx].compl_start_tv); + compl_time_slice_expired = FALSE; + } +#endif +} + /* * Safely advance the cpt_sources_index by one. */ @@ -5192,6 +5258,8 @@ advance_cpt_sources_index_safe(void) return FAIL; } +#define COMPL_FUNC_TIMEOUT_MS 300 +#define COMPL_FUNC_TIMEOUT_NON_KW_MS 1000 /* * Get the next expansion(s), using "compl_pattern". * The search starts at position "ini" in curbuf and in the direction @@ -5210,6 +5278,7 @@ ins_compl_get_exp(pos_T *ini) int found_new_match; int type = ctrl_x_mode; int may_advance_cpt_idx = FALSE; + pos_T start_pos = *ini; if (!compl_started) { @@ -5230,7 +5299,15 @@ ins_compl_get_exp(pos_T *ini) ? (char_u *)"." : curbuf->b_p_cpt); strip_caret_numbers_in_place(st.e_cpt_copy); st.e_cpt = st.e_cpt_copy == NULL ? (char_u *)"" : st.e_cpt_copy; - st.last_match_pos = st.first_match_pos = *ini; + + // In large buffers, timeout may miss nearby matches — search above cursor +#define LOOKBACK_LINE_COUNT 1000 + if (compl_autocomplete && is_nearest_active()) + { + start_pos.lnum = MAX(1, start_pos.lnum - LOOKBACK_LINE_COUNT); + start_pos.col = 0; + } + st.last_match_pos = st.first_match_pos = start_pos; } else if (st.ins_buf != curbuf && !buf_valid(st.ins_buf)) st.ins_buf = curbuf; // In case the buffer was wiped out. @@ -5242,7 +5319,14 @@ ins_compl_get_exp(pos_T *ini) if (cpt_sources_array != NULL && ctrl_x_mode_normal() && !ctrl_x_mode_line_or_eval() && !(compl_cont_status & CONT_LOCAL)) + { cpt_sources_index = 0; + if (compl_autocomplete) + { + compl_source_start_timer(0); + compl_timeout_ms = COMPL_INITIAL_TIMEOUT_MS; + } + } // For ^N/^P loop over all the flags/windows/buffers in 'complete'. for (;;) @@ -5256,15 +5340,19 @@ ins_compl_get_exp(pos_T *ini) if ((ctrl_x_mode_normal() || ctrl_x_mode_line_or_eval()) && (!compl_started || st.found_all)) { - int status = process_next_cpt_value(&st, &type, ini, + int status = process_next_cpt_value(&st, &type, &start_pos, cfc_has_mode(), &may_advance_cpt_idx); if (status == INS_COMPL_CPT_END) break; if (status == INS_COMPL_CPT_CONT) { - if (may_advance_cpt_idx && !advance_cpt_sources_index_safe()) - break; + if (may_advance_cpt_idx) + { + if (!advance_cpt_sources_index_safe()) + break; + compl_source_start_timer(cpt_sources_index); + } continue; } } @@ -5274,11 +5362,24 @@ ins_compl_get_exp(pos_T *ini) if (compl_pattern.string == NULL) break; - // get the next set of completion matches - found_new_match = get_next_completion_match(type, &st, ini); + if (compl_autocomplete && type == CTRL_X_FUNCTION) + // LSP servers may sporadically take >1s to respond (e.g., while + // loading modules), but other sources might already have matches. + // To show results quickly use a short timeout for keyword + // completion. Allow longer timeout for non-keyword completion + // where only function based sources (e.g. LSP) are active. + compl_timeout_ms = compl_from_nonkeyword + ? COMPL_FUNC_TIMEOUT_NON_KW_MS : COMPL_FUNC_TIMEOUT_MS; - if (may_advance_cpt_idx && !advance_cpt_sources_index_safe()) - break; + // get the next set of completion matches + found_new_match = get_next_completion_match(type, &st, &start_pos); + + if (may_advance_cpt_idx) + { + if (!advance_cpt_sources_index_safe()) + break; + compl_source_start_timer(cpt_sources_index); + } // break the loop for specialized modes (use 'complete' just for the // generic ctrl_x_mode == CTRL_X_NORMAL) or when we've found a new @@ -5295,7 +5396,7 @@ ins_compl_get_exp(pos_T *ini) if ((ctrl_x_mode_not_default() && !ctrl_x_mode_line_or_eval()) || compl_interrupted) break; - compl_started = TRUE; + compl_started = compl_time_slice_expired ? FALSE : TRUE; } else { @@ -5306,6 +5407,10 @@ ins_compl_get_exp(pos_T *ini) compl_started = FALSE; } + // Reset the timeout after collecting matches from function source + if (compl_autocomplete && type == CTRL_X_FUNCTION) + compl_timeout_ms = COMPL_INITIAL_TIMEOUT_MS; + // For `^P` completion, reset `compl_curr_match` to the head to avoid // mixing matches from different sources. if (!compl_dir_forward()) @@ -5321,7 +5426,7 @@ ins_compl_get_exp(pos_T *ini) i = -1; // total of matches, unknown if (found_new_match == FAIL || (ctrl_x_mode_not_default() - && !ctrl_x_mode_line_or_eval())) + && !ctrl_x_mode_line_or_eval())) i = ins_compl_make_cyclic(); if (cfc_has_mode() && compl_get_longest && compl_num_bests > 0) @@ -5628,7 +5733,8 @@ find_next_completion_match( int found_end = FALSE; compl_T *found_compl = NULL; unsigned int cur_cot_flags = get_cot_flags(); - int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0; + int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0 + || compl_autocomplete; int compl_fuzzy_match = (cur_cot_flags & COT_FUZZY) != 0; string_T *leader; @@ -5756,7 +5862,8 @@ ins_compl_next( int started = compl_started; buf_T *orig_curbuf = curbuf; unsigned int cur_cot_flags = get_cot_flags(); - int compl_no_insert = (cur_cot_flags & COT_NOINSERT) != 0; + int compl_no_insert = (cur_cot_flags & COT_NOINSERT) != 0 + || compl_autocomplete; int compl_fuzzy_match = (cur_cot_flags & COT_FUZZY) != 0; int compl_preinsert = ins_compl_has_preinsert(); @@ -5847,7 +5954,7 @@ ins_compl_next( // Enter will select a match when the match wasn't inserted and the popup // menu is visible. - if (compl_no_insert && !started) + if (compl_no_insert && !started && compl_selected_item != -1) compl_enter_selects = TRUE; else compl_enter_selects = !insert_match && compl_match_array != NULL; @@ -5859,6 +5966,29 @@ ins_compl_next( return num_matches; } +/* + * Check if the current completion source exceeded its timeout. If so, stop + * collecting, and halve the timeout. + */ + static void +check_elapsed_time(void) +{ +#ifdef ELAPSED_FUNC + if (cpt_sources_array == NULL) + return; + + elapsed_T *start_tv + = &cpt_sources_array[cpt_sources_index].compl_start_tv; + long elapsed_ms = ELAPSED_FUNC(*start_tv); + + if (elapsed_ms > compl_timeout_ms) + { + compl_time_slice_expired = TRUE; + DECAY_COMPL_TIMEOUT(); + } +#endif +} + /* * Call this while finding completions, to check whether the user has hit a key * that should change the currently displayed completion, or exit completion @@ -5919,8 +6049,14 @@ ins_compl_check_keys(int frequency, int in_compl_func) } } } - if (compl_pending != 0 && !got_int && !(cot_flags & COT_NOINSERT)) + else if (compl_autocomplete) + check_elapsed_time(); + + if (compl_pending != 0 && !got_int && !(cot_flags & COT_NOINSERT) + && !compl_autocomplete) { + // Insert the first match immediately and advance compl_shown_match, + // before finding other matches. int todo = compl_pending > 0 ? compl_pending : -compl_pending; compl_pending = 0; @@ -6074,6 +6210,7 @@ get_normal_compl_info(char_u *line, int startcol, colnr_T curs_col) compl_pattern.length = len; compl_col += curs_col; compl_length = 0; + compl_from_nonkeyword = TRUE; } else { @@ -6635,7 +6772,7 @@ ins_compl_start(void) compl_startpos.col = compl_col; } - if (!shortmess(SHM_COMPLETIONMENU)) + if (!shortmess(SHM_COMPLETIONMENU) && !compl_autocomplete) { if (compl_cont_status & CONT_LOCAL) edit_submode = (char_u *)_(ctrl_x_msgs[CTRL_X_LOCAL_MSG]); @@ -6666,7 +6803,7 @@ ins_compl_start(void) // showmode might reset the internal line pointers, so it must // be called before line = ml_get(), or when this address is no // longer needed. -- Acevedo. - if (!shortmess(SHM_COMPLETIONMENU)) + if (!shortmess(SHM_COMPLETIONMENU) && !compl_autocomplete) { edit_submode_extra = (char_u *)_("-- Searching..."); edit_submode_highl = HLF_COUNT; @@ -6835,7 +6972,7 @@ ins_complete(int c, int enable_pum) else compl_cont_status &= ~CONT_S_IPOS; - if (!shortmess(SHM_COMPLETIONMENU)) + if (!shortmess(SHM_COMPLETIONMENU) && !compl_autocomplete) ins_compl_show_statusmsg(); // Show the popup menu, unless we got interrupted. @@ -6848,6 +6985,23 @@ ins_complete(int c, int enable_pum) return OK; } +/* + * Returns TRUE if the given character 'c' can be used to trigger + * autocompletion. + */ + int +ins_compl_setup_autocompl(int c) +{ +#ifdef ELAPSED_FUNC + if (vim_isprintc(c)) + { + compl_autocomplete = TRUE; + return TRUE; + } +#endif + return FALSE; +} + /* * Remove (if needed) and show the popup menu */ @@ -7148,6 +7302,7 @@ get_cpt_func_completion_matches(callback_T *cb UNUSED) if (set_compl_globals(startcol, curwin->w_cursor.col, TRUE) == OK) { expand_by_function(0, cpt_compl_pattern.string, cb); + cpt_sources_array[cpt_sources_index].cs_refresh_always = compl_opt_refresh_always; compl_opt_refresh_always = FALSE; @@ -7200,7 +7355,10 @@ cpt_compl_refresh(void) } cpt_sources_array[cpt_sources_index].cs_startcol = startcol; if (ret == OK) + { + compl_source_start_timer(cpt_sources_index); get_cpt_func_completion_matches(cb); + } } else cpt_sources_array[cpt_sources_index].cs_startcol diff --git a/src/main.c b/src/main.c index 3554741057..5ad1003a88 100644 --- a/src/main.c +++ b/src/main.c @@ -2175,7 +2175,19 @@ command_line_scan(mparm_T *parmp) { want_argument = FALSE; c = argv[0][argv_idx++]; -#ifdef VMS +#if defined( VMS) + /* 2025-05-13 SMS + * On sufficiently recent non-VAX systems, case preservation + * of the command line is possible/routine. And quotation + * always works, and is the expected method in such cases. + * However, leaving this slash-prefix scheme available is + * nearly harmless. But note that it doesn't help with the + * case of other command-line arguments, such as file names. + * For details, see os_vms.c:vms_init(). + * On VAX and old non-VAX systems, or with SET PROC/PARSE=TRAD, + * DCL upcases the command line, and the C RTL downcases it. + * I would not say "only uses upper case command lines". + */ /* * VMS only uses upper case command lines. Interpret "-X" as "-x" * and "-/X" as "-X". @@ -2185,9 +2197,12 @@ command_line_scan(mparm_T *parmp) c = argv[0][argv_idx++]; c = TOUPPER_ASC(c); } - else - c = TOLOWER_ASC(c); -#endif + /* Note that although DCL might upcase things, the C RTL + * will only downcase them, so there should be no need for + * the following (additional?) downcasing (which spoils the + * preserve-case results): + */ +#endif /* defined( VMS) */ switch (c) { case NUL: // "vim -" read from stdin @@ -3695,9 +3710,10 @@ usage(void) break; mch_msg(_("\n or:")); } -#ifdef VMS - mch_msg(_("\nWhere case is ignored prepend / to make flag upper case")); -#endif +#if defined( VMS) + mch_msg(_("\nWhere command is down-cased, prepend / (like: -/R) to treat flag as upper-case.")); + mch_msg(_("\nOr, where supported, SET PROC/PARSE=EXT, or else quote upper-case material.")); +#endif /* defined( VMS) */ mch_msg(_("\n\nArguments:\n")); main_msg(_("--\t\t\tOnly file names after this")); diff --git a/src/misc1.c b/src/misc1.c index 41fd2bd106..40ec05bc7b 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -565,6 +565,26 @@ gchar_cursor(void) return (int)*ml_get_cursor(); } +/* + * Return the character immediately before the cursor. + */ + int +char_before_cursor(void) +{ + if (curwin->w_cursor.col == 0) + return -1; + + char_u *line = ml_get_curline(); + + if (has_mbyte) + { + char_u *p = line + curwin->w_cursor.col; + int prev_len = (*mb_head_off)(line, p - 1) + 1; + return mb_ptr2char(p - prev_len); + } + return line[curwin->w_cursor.col - 1]; +} + /* * Write a character at the current cursor position. * It is directly written into the block. diff --git a/src/option.h b/src/option.h index 317f8f21fe..23d5ccb931 100644 --- a/src/option.h +++ b/src/option.h @@ -523,6 +523,7 @@ EXTERN char_u *p_cia; // 'completeitemalign' EXTERN unsigned cia_flags; // order flags of 'completeitemalign' EXTERN char_u *p_cot; // 'completeopt' EXTERN unsigned cot_flags; // flags from 'completeopt' +EXTERN int p_ac; // 'autocomplete' // Keep in sync with p_cot_values in optionstr.c #define COT_MENU 0x001 #define COT_MENUONE 0x002 diff --git a/src/optiondefs.h b/src/optiondefs.h index 1bb972898a..212f29bbff 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -429,6 +429,11 @@ static struct vimoption options[] = {(char_u *)0L, (char_u *)0L} #endif SCTX_INIT}, +#ifdef ELAPSED_FUNC + {"autocomplete", "ac", P_BOOL|P_VI_DEF, + (char_u *)&p_ac, PV_NONE, NULL, + NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, +#endif {"autoindent", "ai", P_BOOL|P_VI_DEF, (char_u *)&p_ai, PV_AI, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, diff --git a/src/os_vms.c b/src/os_vms.c index 0a67a6b75d..42dbc4b007 100644 --- a/src/os_vms.c +++ b/src/os_vms.c @@ -9,7 +9,7 @@ * See README.txt for an overview of the Vim source code. */ -#include "vim.h" +#include "vim.h" // define _generic_64 for use in time functions #if !defined(VAX) && !defined(PROTO) @@ -18,11 +18,11 @@ // based on Alpha's gen64def.h; the file is absent on VAX typedef struct _generic_64 { # pragma __nomember_alignment - __union { // You can treat me as... + __union { // You can treat me as... // long long is not available on VAXen // unsigned __int64 gen64$q_quadword; ...a single 64-bit value, or - unsigned int gen64$l_longword [2]; // ...two 32-bit values, or + unsigned int gen64$l_longword [2]; // ...two 32-bit values, or unsigned short int gen64$w_word [4]; // ...four 16-bit values } gen64$r_quad_overlay; } GENERIC_64; @@ -583,7 +583,7 @@ vms_unix_mixed_filespec(char *in, char *out) ch = '['; SKIP_FOLLOWING_SLASHES(in); } - else if (EQN(in, "../", 3)) // Unix parent directory? + else if (EQN(in, "../", 3)) // Unix parent directory? { *out++ = '['; *out++ = '-'; @@ -593,20 +593,20 @@ vms_unix_mixed_filespec(char *in, char *out) SKIP_FOLLOWING_SLASHES(in); } else - { // not a special character - while (EQN(in, "./", 2)) // Ignore Unix "current dir" + { // not a special character + while (EQN(in, "./", 2)) // Ignore Unix "current dir" { in += 2; SKIP_FOLLOWING_SLASHES(in); } - if (strchr(in, '/') == NULL) // any more Unix directories ? + if (strchr(in, '/') == NULL) // any more Unix directories ? { - strcpy(out, in); // No - get rest of the spec + strcpy(out, in); // No - get rest of the spec return; } else { - *out++ = '['; // Yes, denote a Vms subdirectory + *out++ = '['; // Yes, denote a Vms subdirectory ch = '.'; --in; } @@ -627,7 +627,7 @@ vms_unix_mixed_filespec(char *in, char *out) ch = '.'; SKIP_FOLLOWING_SLASHES(in); } - else if (EQN(in, "../", 3)) // Unix parent directory? + else if (EQN(in, "../", 3)) // Unix parent directory? { *out++ = '-'; end_of_dir = out; @@ -637,7 +637,7 @@ vms_unix_mixed_filespec(char *in, char *out) } else { - while (EQN(in, "./", 2)) // Ignore Unix "current dir" + while (EQN(in, "./", 2)) // Ignore Unix "current dir" { end_of_dir = out; in += 2; @@ -651,7 +651,7 @@ vms_unix_mixed_filespec(char *in, char *out) ++in; } - *out = '\0'; // Terminate output file spec + *out = '\0'; // Terminate output file spec if (end_of_dir != NULL) // Terminate directory portion *end_of_dir = ']'; @@ -725,28 +725,82 @@ vms_fixfilename(void *instring) * Remove version number from file name * we need it in some special cases as: * creating swap file name and writing new file + */ + +/* + * 2025-05-13 SMS. + * Using $PARSE would be simpler and more accurate, if all-VMS (not + * mixed UNIX+VMS) path were ensured. Meanwhile, to improve (imperfect) + * handling of extended name syntax: + * o All characters (up to five (32767)) after semi-colon (or last + * of multiple dots) must be numeric. + * o Caret-escaped semi-colon (^;) or dot (^.) does not delimit + * version. + * Whether it makes sense to detect syntax errors here is not entirely + * clear. Currently, many invalid version strings are not treated as + * version strings. (More could be.) */ void vms_remove_version(void * fname) { - char_u *cp; - char_u *fp; + char_u *dp; // Dot pointer + char_u *rp; // Right pointer + int done = 0; + int vdigits = 0; - if ((cp = vim_strchr( fname, ';')) != NULL) // remove version - *cp = '\0'; - else if ((cp = vim_strrchr( fname, '.')) != NULL ) + rp = (char_u *)fname+ strlen( (char *)fname)- 1; // Rightmost char + while ((done == 0) && (rp > (char_u *)fname)) // Count digits { - if ((fp = vim_strrchr( fname, ']')) != NULL ) - {;} - else if ((fp = vim_strrchr( fname, '>')) != NULL ) - {;} + if (isdigit( *rp)) + { + vdigits++; + *rp--; + } else - fp = fname; + { + done = 1; // Quit at non-digit + } + } // while (Count digits) + + if (vdigits <= 5) // If likely version digits, check delimiter + { // (Could check for <= 32767, not just five digits or fewer.) + if (*rp == (char_u)';') + { + if ((rp >= (char_u *)fname) && (*(rp- 1) != (char_u)'^')) + { // Unescaped ";" + *rp = '\0'; // Trim off ";nnn" + } + } + else if (*rp == (char_u)'.') // Last of multiple dots? + { + if ((rp >= (char_u *)fname) && (*(rp- 1) != '^')) + { // Unescaped dot. Version requires previous one + dp = rp- 1; // Scan chars before "." + done = 0; + while ((done == 0) && (dp >= (char_u *)fname)) + { + if ((*dp == ']') || (*dp == '>') || (*dp == ':') || (*dp == '/')) + { // Possible VMS dev:[dir] delimiter (or UNIX "/") + if ((dp >= (char_u *)fname) && (*(dp- 1) != '^')) + { // Unescaped dev:[dir] (or /) delimiter + done = 1; // No previous dot found in name + } + } + else if (*dp == '.') + { // Possible dot delimiter + if ((dp >= (char_u *)fname) && (*(dp- 1) != '^')) + { // Unescaped dot delimiter + done = 1; // Previous dot found in name + *rp = '\0'; // Trim off ".nnn" + } + } + dp--; // Next char to right + } // while + } + } + // Else no version found to remove + } // if (vdigits <= 5) - while ( *fp != '\0' && fp < cp ) - if ( *fp++ == '.' ) - *cp = '\0'; - } return ; } @@ -783,23 +837,29 @@ RealWaitForChar( if (sec > 0) { // time-out specified; convert it to absolute time - // sec>0 requirement of lib$cvtf_to_internal_time() + // sec>0 requirement of lib$cvt[fs]_to_internal_time() // get current time (number of 100ns ticks since the VMS Epoch) status = sys$gettim(&time_curr); if (status != SS$_NORMAL) return 0; // error // construct the delta time -#if __G_FLOAT==0 -# ifndef VAX - // IEEE is default on IA64, but can be used on Alpha too - but not on VAX - status = lib$cvts_to_internal_time( + +/* On all non-VAX hardware architectures, the "CC /FLOAT=option" + * determines the floating-point format. The default format on Alpha + * is VAX; on IA64 and x86_64 it's IEEE. But, except on VAX, the user + * can specify either. What matters here is the actual floating-point + * format being used, not the hardware architecture. Choose the + * appropriate time conversion function accordingly. + */ +#if __IEEE_FLOAT +# define LIB_CVTX_TO_INTERNAL_TIME lib$cvts_to_internal_time // IEEE +#else +# define LIB_CVTX_TO_INTERNAL_TIME lib$cvtf_to_internal_time // VAX +#endif // __IEEE_FLOAT CVTS + + status = LIB_CVTX_TO_INTERNAL_TIME( &convert_operation, &sec, &time_diff); -# endif -#else // default on Alpha and VAX - status = lib$cvtf_to_internal_time( - &convert_operation, &sec, &time_diff); -#endif if (status != LIB$_NORMAL) return 0; // error // add them up @@ -851,3 +911,130 @@ RealWaitForChar( } } } + +#if !defined( __VAX) && (__CRTL_VER >= 70301000) + +#include +#include + +// Structure to hold a DECC$* feature name and its desired value + +typedef struct + { + char *name; + int value; + } decc_feat_t; + +int vms_init_done = -1; + +decc_feat_t decc_feat_array[] = { + + // Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED + { "DECC$ARGV_PARSE_STYLE", 1 }, + + // Preserve case for file names on ODS5 disks + { "DECC$EFS_CASE_PRESERVE", 1 }, + + // Enable multiple dots (and most characters) in ODS5 file names, + // while preserving VMS-ness of ";version" + { "DECC$EFS_CHARSET", 1 }, + + // List terminator + { (char *)NULL, 0 } }; + + +/* LIB$INITIALIZE initialization. + * + * On sufficiently recent non-VAX systems, set a collection of C RTL + * features without using the DECC$* logical name method. + * + * Note: Old VAX VMS versions may suffer from a linker complaint like + * this: + * + * %LINK-W-MULPSC, conflicting attributes for psect LIB$INITIALIZE + * in module LIB$INITIALIZE file SYS$COMMON:[SYSLIB]STARLET.OLB;1 + * + * Using a LINK options file which includes a line like this one should + * stop this complaint: + * + * PSECT_ATTR=LIB$INITIALIZE,NOPIC + */ + +/* vms_init() + * + * Uses LIB$INITIALIZE to set a collection of C RTL features without + * requiring the user to define the corresponding logical names. + * + * LIB$INITIALIZE initialization function + */ + +static void +vms_init(void) +{ + // Set the global flag to indicate that LIB$INITIALIZE worked + + vms_init_done = 1; + + int feat_index; + int feat_value; + int feat_value_max; + int feat_value_min; + int i; + int sts; + + // Loop through all items in the decc_feat_array[] + for (i = 0; decc_feat_array[i].name != NULL; i++) + { + // Get the feature index + feat_index = decc$feature_get_index(decc_feat_array[i].name); + if (feat_index >= 0) + { + // Valid item. Collect its properties + feat_value = decc$feature_get_value(feat_index, 1); + feat_value_min = decc$feature_get_value(feat_index, 2); + feat_value_max = decc$feature_get_value(feat_index, 3); + + if ((decc_feat_array[i].value >= feat_value_min) && (decc_feat_array[i].value <= feat_value_max)) + // Valid value. Set it if necessary + if (feat_value != decc_feat_array[i].value) + sts = decc$feature_set_value(feat_index, 1, decc_feat_array[i].value); + else + // Invalid DECC feature value + printf("INVALID DECC FEATURE VALUE, %d: %d <= %s <= %d.\n", + feat_value, feat_value_min, decc_feat_array[i].name, feat_value_max); + } + else + // Invalid DECC feature name + printf("UNKNOWN DECC FEATURE: %s.\n", decc_feat_array[i].name); + } +} + + +/* Get "vms_init()" into a valid, loaded LIB$INITIALIZE PSECT. */ + +#pragma nostandard + +/* Establish the LIB$INITIALIZE PSECTs, with proper alignment and + * other attributes. Note that "nopic" is significant only on VAX. + */ +#pragma extern_model save + +#pragma extern_model strict_refdef "LIB$INITIALIZE" 2, nopic, nowrt +void (*const x_vms_init)() = vms_init; + +#pragma extern_model strict_refdef "LIB$INITIALIZ" 2, nopic, nowrt +const int spare[ 8] = { 0 }; + +#pragma extern_model restore + +// Fake reference to ensure loading the LIB$INITIALIZE PSECT + +#pragma extern_model save +int LIB$INITIALIZE(void); +#pragma extern_model strict_refdef +int dmy_lib$initialize = (int) LIB$INITIALIZE; +#pragma extern_model restore + +#pragma standard + +#endif // !defined( __VAX) && (__CRTL_VER >= 70301000) diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h index ad19dbef4a..c9e75e68c3 100644 --- a/src/os_vms_conf.h +++ b/src/os_vms_conf.h @@ -9,10 +9,12 @@ #endif #endif +#include // Required early for large-file support + #define CASE_INSENSITIVE_FILENAME // Open VMS is case insensitive -#define SPACE_IN_FILENAME // There could be space between user and passwd +#define SPACE_IN_FILENAME // There could be space between user and passwd #define FNAME_ILLEGAL "|*#?%" // Illegal characters in a file name -#define BINARY_FILE_IO // Use binary fileio +#define BINARY_FILE_IO // Use binary fileio #define USE_GETCWD #define USE_SYSTEM #define XPMATTRIBUTES_TYPE XpmAttributes @@ -146,6 +148,15 @@ #define FEAT_IPV6 #define FEAT_XTERM_SAVE +#define VIM_SIZEOF_INT 4 +#define VIM_SIZEOF_LONG 4 + +#if __USE_OFF64_T +# define SIZEOF_OFF_T 8 +#else +# define SIZEOF_OFF_T 4 +#endif + // Hardware specific #if defined(__VAX) || defined(VAX) #undef HAVE_GETTIMEOFDAY @@ -156,36 +167,31 @@ #undef HAVE_ISNAN #undef HAVE_XOS_R_H #define HAVE_NO_LONG_LONG -#define VIM_SIZEOF_INT 4 -#define VIM_SIZEOF_LONG 4 #define LONG_LONG_MIN (-2147483647-1) #define LONG_LONG_MAX (2147483647) #define ULONG_LONG_MAX (4294967295U) #else // ALPHA, IA64, X86_64 +#define HAVE_FSEEKO /* Use off_t. */ #define HAVE_GETTIMEOFDAY #define HAVE_USLEEP #define HAVE_STRCASECMP #define HAVE_STRINGS_H #define HAVE_SIGSETJMP -#define HAVE_ISNAN #undef HAVE_XOS_R_H #undef HAVE_NO_LONG_LONG -#define VIM_SIZEOF_INT 4 -#define VIM_SIZEOF_LONG 8 #define LONG_LONG_MIN (-9223372036854775807-1) #define LONG_LONG_MAX (9223372036854775807) #define ULONG_LONG_MAX (18446744073709551615U) -#if defined(__x86_64) || defined(__x86_64__) -#if !defined(X86_64) -#define X86_64 -#endif -#define HAVE_ISNAN +#if defined(__DECC) && (__CRTL_VER >= 80500000) && (__STDC_VERSION__ >= 199901L) /* C99 */ #define HAVE_ISINF +#define HAVE_ISNAN +#endif + #define HAVE_XOS_R_H -#endif -#endif + +#endif /* VAX [else] */ // Compiler specific #if defined(VAXC) || defined(__VAXC) @@ -218,7 +224,7 @@ // GUI support defines #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) -#define X_INCLUDE_GRP_H // To use getgrgid +#define X_INCLUDE_GRP_H // To use getgrgid #define XUSE_MTSAFE_API #define HAVE_X11 #define WANT_X11 diff --git a/src/po/check.vim b/src/po/check.vim index 8ca48aaf41..ee3e3700bd 100644 --- a/src/po/check.vim +++ b/src/po/check.vim @@ -1,16 +1,21 @@ " Vim script for checking .po files. " -" Go through the file and verify that: -" - All %...s items in "msgid" are identical to the ones in "msgstr". -" - An error or warning code in "msgid" matches the one in "msgstr". +" Goes through the xx.po file (more than once) +" and verify various congruences +" See the comments in the code -" Last Update: 2025 Jul 10 +" Last Update: 2025 Jul 22 -if 1 " Only execute this if the eval feature is available. +if 1" Only execute this if the eval feature is available. -" using line continuation +" Using line continuation (set cpo to vim default value) +let s:save_cpo = &cpo set cpo&vim +" This only works when 'wrapscan' is not set. +let s:save_wrapscan = &wrapscan +set nowrapscan + " Function to get a split line at the cursor. " Used for both msgid and msgstr lines. " Removes all text except % items and returns the result. @@ -43,9 +48,15 @@ func! GetMline() return substitute(idline, '[^%]*\(%([1-9][0-9]*\$)\=[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g') endfunc -" This only works when 'wrapscan' is not set. -let s:save_wrapscan = &wrapscan -set nowrapscan +func! CountNl(first, last) + let nl = 0 + for lnum in range(a:first, a:last) + let nl += count(getline(lnum), "\n") + endfor + return nl +endfunc + +" main " Start at the first "msgid" line. let wsv = winsaveview() @@ -57,63 +68,72 @@ keeppatterns /^msgid\> let error = 0 while 1 + " for each "msgid" + + " check msgid "Text;editor;" + " translation must have two ";" as well let lnum = line('.') if getline(lnum) =~ 'msgid "Text;.*;"' - if getline(lnum + 1) !~ '^msgstr "\([^;]\+;\)\+"' + if getline(lnum + 1) !~ '^msgstr "\([^;]\+;\)\+"$' echomsg 'Mismatching ; in line ' . (lnum + 1) - echomsg 'Did you forget the trailing semicolon?' + echomsg 'Wrong semicolon count' if error == 0 - let error = lnum + 1 + let error = lnum + 1 endif endif endif + " check for equal number of % in msgid and msgstr + " it is skipping the no-c-format strings if getline(line('.') - 1) !~ "no-c-format" - " go over the "msgid" and "msgid_plural" lines + " skip the "msgid_plural" lines let prevfromline = 'foobar' let plural = 0 while 1 if getline('.') =~ 'msgid_plural' - let plural += 1 + let plural += 1 endif let fromline = GetMline() if prevfromline != 'foobar' && prevfromline != fromline - \ && (plural != 1 - \ || count(prevfromline, '%') + 1 != count(fromline, '%')) - echomsg 'Mismatching % in line ' . (line('.') - 1) - echomsg 'msgid: ' . prevfromline - echomsg 'msgid: ' . fromline - if error == 0 - let error = line('.') - endif + \ && (plural != 1 + \ || count(prevfromline, '%') + 1 != count(fromline, '%')) + echomsg 'possibly mismatching % in line ' . (line('.') - 1) + echomsg 'msgid: ' . prevfromline + echomsg 'msgid: ' . fromline + if error == 0 + let error = line('.') + endif endif if getline('.') !~ 'msgid_plural' - break + break endif let prevfromline = fromline endwhile + " checks that for each 'msgid' there is a 'msgstr' if getline('.') !~ '^msgstr' echomsg 'Missing "msgstr" in line ' . line('.') if error == 0 - let error = line('.') + let error = line('.') endif endif - " check all the 'msgstr' lines + " check all the 'msgstr' lines have the same number of '%' + " only the number of '%' is checked, + " %d vs. %s or %d vs. %ld go undetected while getline('.') =~ '^msgstr' let toline = GetMline() if fromline != toline - \ && (plural == 0 || count(fromline, '%') != count(toline, '%') + 1) - echomsg 'Mismatching % in line ' . (line('.') - 1) - echomsg 'msgid: ' . fromline - echomsg 'msgstr: ' . toline - if error == 0 - let error = line('.') - endif + \ && (plural == 0 || count(fromline, '%') != count(toline, '%') + 1) + echomsg 'possibly mismatching % in line ' . (line('.') - 1) + echomsg 'msgid: ' . fromline + echomsg 'msgstr: ' . toline + if error == 0 + let error = line('.') + endif endif if line('.') == line('$') - break + break endif endwhile endif @@ -142,14 +162,6 @@ if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') endif endif -func! CountNl(first, last) - let nl = 0 - for lnum in range(a:first, a:last) - let nl += count(getline(lnum), "\n") - endfor - return nl -endfunc - " Check that the \n at the end of the msgid line is also present in the msgstr " line. Skip over the header. 1 @@ -175,6 +187,55 @@ while 1 endif endwhile +" Check that the eventual continuation of 'msgstr' is well formed +" final '""', '\n"', ' "' are OK +" Beware, it can give false positives if the message is split +" in the middle of a word +1 +keeppatterns /^"MIME-Version: +while 1 + let lnum = search('^msgid\>') + if lnum <= 0 + break + endif + " "msgstr" goes from strlnum to end-1 + let strlnum = search('^msgstr\>') + let end = search('^$') + if end <= 0 + let end = line('$') + 1 + endif + " only if there is a continuation line... + if end > strlnum + 1 + let ilnum = strlnum + while ilnum < end - 1 + let iltype = 0 + if getline( ilnum ) =~ "^msgid_plural" + let iltype = 99 + endif + if getline( ilnum ) =~ "^msgstr[" + let iltype = 98 + endif + if getline( ilnum ) =~ "\"\"" + let iltype = 1 + endif + if getline( ilnum ) =~ " \"$" + let iltype = 2 + endif + if getline( ilnum ) =~ "\\\\n\"$" + let iltype = 3 + endif + if iltype == 0 + echomsg 'Possibly incorrect final at line: ' . ilnum + " TODO: make this an error + " if error == 0 + " let error = ilnum + " endif + endif + let ilnum += 1 + endwhile + endif +endwhile + " Check that the file is well formed according to msgfmts understanding if executable("msgfmt") let filename = expand("%") @@ -257,7 +318,14 @@ else exe error endif +" restore original wrapscan let &wrapscan = s:save_wrapscan unlet s:save_wrapscan +" restore original cpo +let &cpo = s:save_cpo +unlet s:save_cpo + endif + +" vim:sts=2:sw=2:et diff --git a/src/po/it.po b/src/po/it.po index 6a50d2ed6a..447327014b 100644 --- a/src/po/it.po +++ b/src/po/it.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-07-17 18:08+0200\n" -"PO-Revision-Date: 2025-07-17 18:40+0100\n" +"POT-Creation-Date: 2025-07-22 22:21+0200\n" +"PO-Revision-Date: 2025-07-22 23:00+0100\n" "Last-Translator: Antonio Colombo \n" "Language-Team: Italian\n" "Language: it\n" @@ -50,6 +50,7 @@ msgstr "auto-rimozione dell'autocomando: %s " msgid "W19: Deleting augroup that is still in use" msgstr "W19: Cancello augroup, ma è ancora in uso" +#. Highlight title msgid "" "\n" "--- Autocommands ---" @@ -146,6 +147,7 @@ msgstr "Fon" msgid "Top" msgstr "Cim" +#. localized percentage value msgid "%d%%" msgstr "%d%%" @@ -176,6 +178,9 @@ msgstr "[Dinamico]" msgid "[Scratch]" msgstr "[Volatile]" +#. don't overwrite messages here +#. must give this prompt +#. don't use emsg() here, don't want to flush the buffers msgid "WARNING: The file has been changed since reading it!!!" msgstr "AVVISO: File modificato dopo essere stato letto!!!" @@ -231,9 +236,11 @@ msgstr "W10: Avviso: Modifica a un file in sola-lettura" msgid "No display" msgstr "Manca display" +#. Failed to send, abort. msgid ": Send failed.\n" msgstr ": Invio fallito.\n" +#. Let vim start normally. msgid ": Send failed. Trying to execute locally\n" msgstr ": Invio fallito. Tento di eseguire localmente\n" @@ -422,6 +429,9 @@ msgstr "Katakana" msgid "Bopomofo" msgstr "Bopomofo" +#. row number, column number is appended +#. l10n: leave as-is unless a space after the comma is preferred +#. l10n: do not add any row/column label, due to the limited space msgid "%ld," msgstr "%ld," @@ -433,6 +443,9 @@ msgstr "" "\tImpostata l'ultima volta da " #. +#. * Yes this is ugly, I don't particularly like it either. But doing it +#. * this way has the compelling advantage that translations need not to +#. * be touched at all. See below what 'ok' and 'ync' are used for. #. msgid "&Ok" msgstr "&OK" @@ -610,6 +623,7 @@ msgstr "Salva Ridirezione" msgid "Untitled" msgstr "Senza Nome" +#. always scroll up, don't overwrite msgid "Exception thrown: %s" msgstr "Eccezione lanciata: %s" @@ -622,6 +636,7 @@ msgstr "Eccezione scartata: %s" msgid "%s, line %ld" msgstr "%s, riga %ld" +#. always scroll up, don't overwrite msgid "Exception caught: %s" msgstr "Eccezione intercettata: %s" @@ -643,6 +658,7 @@ msgstr "Errore ed interruzione" msgid "Error" msgstr "Errore" +#. if (pending & CSTP_INTERRUPT) msgid "Interrupt" msgstr "Interruzione" @@ -670,6 +686,7 @@ msgstr "[Tipo di accesso non consentito]" msgid "Vim: Reading from stdin...\n" msgstr "Vim: Leggo da stdin...\n" +#. make a copy, gui_write() may try to change it msgid "Reading from stdin..." msgstr "Leggo da stdin..." @@ -724,6 +741,7 @@ msgstr "[Unix]" msgid "[unix format]" msgstr "[in formato Unix]" +#. l10n: L as in line, B as in byte msgid "%s%ldL, %lldB" msgstr "%s%ldR, %lldB" @@ -861,15 +879,18 @@ msgstr "Trovare:" msgid "Replace with:" msgstr "Sostituire con:" +#. whole word only button msgid "Match whole word only" msgstr "Cerca solo la parola intera" +#. match case button msgid "Match case" msgstr "Maiuscole/minuscole" msgid "Direction" msgstr "Direzione" +#. 'Up' and 'Down' buttons msgid "Up" msgstr "Su" @@ -951,6 +972,8 @@ msgstr "Trova stringa" msgid "Find & Replace" msgstr "Trova & Sostituisci" +#. We fake this: Use a filter that doesn't select anything and a default +#. file name that won't be used. msgid "Not Used" msgstr "Non Utilizzato" @@ -987,6 +1010,7 @@ msgstr "Vim - Selettore Caratteri" msgid "Name:" msgstr "Nome:" +#. create toggle button msgid "Show size in Points" msgstr "Mostra dimensione in Punti" @@ -1185,6 +1209,7 @@ msgstr "numero buffer non valido" msgid "not implemented yet" msgstr "non ancora implementato" +#. ??? msgid "cannot set line(s)" msgstr "non posso impostare riga/he" @@ -1243,9 +1268,11 @@ msgstr[1] "%ld righe rientrate " msgid " Keyword completion (^N^P)" msgstr " Completamento parola (^N^P)" +#. CTRL_X_NORMAL, ^P/^N compl. msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^Rs^U^V^Y)" msgstr " modalità ^X (^]^D^E^F^I^K^L^N^O^P^Rs^U^V^Y)" +#. CTRL_X_SCROLL: depends on state msgid " Whole line completion (^L^N^P)" msgstr " Completamento riga intera (^L^N^P)" @@ -1261,12 +1288,14 @@ msgstr " Completamento Modello percorso (^N^P)" msgid " Definition completion (^D^N^P)" msgstr " Completamento Definizione (^D^N^P)" +#. CTRL_X_FINISHED msgid " Dictionary completion (^K^N^P)" msgstr " Completamento Dizionario (^K^N^P)" msgid " Thesaurus completion (^T^N^P)" msgstr " Completamento Thesaurus (^T^N^P)" +#. CTRL_X_EVAL doesn't use msg. msgid " Command-line completion (^V^N^P)" msgstr " Completamento riga-di-comando (^V^N^P)" @@ -1300,9 +1329,11 @@ msgstr " (inserisci) Scroll (^E/^Y)" msgid " (replace) Scroll (^E/^Y)" msgstr " (sostituisci) Scroll (^E/^Y)" +#. reset in msg_trunc_attr() msgid "Scanning: %s" msgstr "Scansione: %s" +#. reset in msg_trunc_attr() msgid "Scanning tags." msgstr "Scansione tag." @@ -1421,6 +1452,7 @@ msgstr "Vim: Avviso: Output non diretto a un terminale\n" msgid "Vim: Warning: Input is not from a terminal\n" msgstr "Vim: Avviso: Input non proveniente da un terminale\n" +#. just in case.. msgid "pre-vimrc command line" msgstr "riga comandi prima di vimrc" @@ -1796,6 +1828,7 @@ msgstr "Non trovo la mappatura" msgid "No marks set" msgstr "Nessuna marcatura impostata" +#. Highlight title msgid "" "\n" "mark line col file/text" @@ -1803,6 +1836,7 @@ msgstr "" "\n" "mark riga col.file/testo" +#. Highlight title msgid "" "\n" " jump line col file/text" @@ -1810,6 +1844,7 @@ msgstr "" "\n" " salt.riga col.file/testo" +#. Highlight title msgid "" "\n" "change line col text" @@ -1945,6 +1980,8 @@ msgstr "" "\n" "Adesso si potrebbe cancellare il file di .swp." +#. Warn there could be an active Vim on the same file, the user may +#. want to kill it. msgid "" "\n" "Note: process STILL RUNNING: " @@ -1955,6 +1992,7 @@ msgstr "" msgid "Using crypt key from swap file for the text file.\n" msgstr "Uso la chiave di cifratura del file swap per il file di testo.\n" +#. use msg() to start the scrolling properly msgid "Swap files found:" msgstr "Swap file trovati:" @@ -2079,6 +2117,8 @@ msgstr " NON TROVATO" msgid " NEWER than swap file!\n" msgstr " PIÙ RECENTE dello swap file!\n" +#. Some of these messages are long to allow translation to +#. other languages. msgid "" "\n" "(1) Another program may be editing the same file. If this is the case,\n" @@ -2156,6 +2196,7 @@ msgstr "" "&Q Esci\n" "&A Annulla" +#. list the matching menu mappings msgid "" "\n" "--- Menus ---" @@ -2176,6 +2217,7 @@ msgid "line %4ld:" msgstr "riga %4ld:" #. Translator: Please replace the name and email address +#. with the appropriate text for your translation. msgid "Messages maintainer: The Vim Project" msgstr "Manutentore messaggi: Antonio Colombo " @@ -2269,6 +2311,7 @@ msgid_plural "%ld lines %sed %d times" msgstr[0] "%ld righe %sa %d volta" msgstr[1] "%ld righe %se %d volte" +#. must display the prompt msgid "cannot yank; delete anyway" msgstr "non riesco a salvare in un registro; cancello comunque" @@ -2392,6 +2435,9 @@ msgstr "a %s su %s" msgid "Printing '%s'" msgstr "Stampato: '%s'" +#. Default font name for current language on MS-Windows. +#. If not translated, falls back to "Consolas". +#. This must be a fixed-pitch font. msgid "DefaultFontNameForWindows" msgstr "NomeCarattereDefaultPerWindows" @@ -2574,6 +2620,7 @@ msgid_plural "%ld lines yanked%s" msgstr[0] "%ld riga messa in registro%s" msgstr[1] "%ld righe messe in registro%s" +#. Highlight title msgid "" "\n" "Type Name Content" @@ -2692,6 +2739,7 @@ msgstr "W15: Avviso: Separatore di riga errato, forse manca ^M" msgid " (includes previously listed match)" msgstr " (comprese corrispondenze elencate prima)" +#. cursor at status line msgid "--- Included files " msgstr "--- File inclusi " @@ -2759,6 +2807,8 @@ msgstr "Avviso: Non trovo lista parole \"%s_%s.spl\" o \"%s_ascii.spl\"" msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\"" msgstr "Avviso: Non trovo lista parole \"%s.%s.spl\" o \"%s.ascii.spl\"" +#. This is probably an error. Give a warning and +#. accept the words anyway. msgid "Warning: region %s not supported" msgstr "Avviso: regione %s non supportata" @@ -2934,6 +2984,8 @@ msgid "Reading back spell file..." msgstr "Rilettura file ortografico..." #. +#. * Go through the trie of good words, soundfold each word and add it to +#. * the soundfold trie. #. msgid "Performing soundfolding..." msgstr "Eseguo soundfolding..." @@ -2974,6 +3026,8 @@ msgstr "Spiacente, nessun suggerimento" msgid "Sorry, only %ld suggestions" msgstr "Spiacente, solo %ld suggerimenti" +#. for when 'cmdheight' > 1 +#. avoid more prompt msgid "Change \"%.*s\" to:" msgstr "Cambiare \"%.*s\" in:" @@ -3048,6 +3102,7 @@ msgstr "" msgid "File \"%s\" does not exist" msgstr "Il file \"%s\" non esiste" +#. Give an indication of the number of matching tags msgid "tag %d of %d%s" msgstr "tag %d di %d%s" @@ -3063,6 +3118,7 @@ msgstr " # pri tipo tag" msgid "file\n" msgstr "file\n" +#. Highlight title msgid "" "\n" " # TO tag FROM line in file/text" @@ -3088,6 +3144,7 @@ msgstr "' non noto. Terminali disponibili predisposti sono:" msgid "defaulting to '" msgstr "predefinito a '" +#. Highlight title msgid "" "\n" "--- Terminal keys ---" @@ -3113,6 +3170,10 @@ msgstr "in esecuzione" msgid "finished" msgstr "terminato" +#. Quoting "man strftime": +#. > If the length of the result string (including the terminating +#. > null byte) would exceed max bytes, then strftime() returns 0, +#. > and the contents of the array are undefined. msgid "(Invalid)" msgstr "(Non valido)" @@ -3130,6 +3191,7 @@ msgstr "fatto eseguire nuova shell\n" msgid "Vim: Error reading input, exiting...\n" msgstr "Vim: Errore leggendo l'input, esco...\n" +#. must display the prompt msgid "No undo possible; continue anyway" msgstr "'undo' non più possibile; continuo comunque" @@ -3622,6 +3684,7 @@ msgstr "" "\n" "# File mark:\n" +#. Write the jumplist with -' msgid "" "\n" "# Jumplist (newest first):\n" @@ -3629,6 +3692,7 @@ msgstr "" "\n" "# Jumplist (dai più recenti):\n" +#. Write the info: msgid "# This viminfo file was generated by Vim %s.\n" msgstr "# Questo file viminfo è stato generato da Vim %s.\n" @@ -5875,7 +5939,7 @@ msgid "E733: Using :endwhile with :for" msgstr "E733: Uso di :endwhile con :for" msgid "E734: Wrong variable type for %s=" -msgstr "E734: Tipo di variabile errato per %s=" +msgstr "E734: Tipo della variabile errato per %s=" msgid "E735: Can only compare Dictionary with Dictionary" msgstr "E735: Posso confrontare un Dizionario solo con un altro Dizionario" @@ -7191,7 +7255,7 @@ msgstr "" "funzione %s" msgid "E1150: Script variable type changed" -msgstr "E1150: Modificato Tipo della variabile di script" +msgstr "E1150: Modificato tipo della variabile di script" msgid "E1151: Mismatched endfunction" msgstr "E1151: :endfunction senza corrispondenza" @@ -7691,7 +7755,7 @@ msgstr "" "restituisce una Lista ma un %s" msgid "E1304: Cannot use type with this variable: %s" -msgstr "E1304: Impossibile usare il Tipo con questa variabile: %s" +msgstr "E1304: Impossibile usare il tipo con questa variabile: %s" msgid "" "E1305: Cannot use \"length\", \"end_col\" and \"end_lnum\" with \"text\"" @@ -8011,7 +8075,7 @@ msgid "E1405: Class \"%s\" cannot be used as a value" msgstr "E1405: Impossibile usare Classe \"%s\" come valore" msgid "E1407: Cannot use a Typealias as a variable or value" -msgstr "E1407: Impossibile usare un Tipo alias come variabile o valore" +msgstr "E1407: Impossibile usare Typealias come variabile o valore" msgid "E1408: Final variable not supported in an interface" msgstr "E1408: Variabile Finale non supportata in un'Interfaccia" @@ -8086,8 +8150,29 @@ msgstr "E1430: Riferimento alla variabile oggetto '%s' non inizializzata" msgid "" "E1431: Abstract method \"%s\" in class \"%s\" cannot be accessed directly" msgstr "" -"E1431: Il Metodo Astratto \"%s\" nella Classe \"%s\" non può essere acceduto " -"direttamente" +"E1431: Il Metodo astratto \"%s\" nella Classe \"%s\" non può essere " +"acceduto direttamente" + +msgid "" +"E1432: Overriding generic method \"%s\" in class \"%s\" with a concrete " +"method" +msgstr "" +"E1432: Il Metodo generico \"%s\" nella Classe \"%s\" è sostituito da un " +"metodo concreto" + +msgid "" +"E1433: Overriding concrete method \"%s\" in class \"%s\" with a generic " +"method" +msgstr "" +"E1433: Il metodo concreto \"%s\" nella Classe \"%s\" è sostituito con un " +"metodo generico" + +msgid "" +"E1434: Mismatched number of type variables for generic method \"%s\" in " +"class \"%s\"" +msgstr "" +"E1434: Numero dei tipi di variabili non corrispondente per il metodo " +"generico \"%s\" nella Classe \"%s\"" msgid "E1500: Cannot mix positional and non-positional arguments: %s" msgstr "" @@ -8257,6 +8342,46 @@ msgstr "E1549: Non posso avere più di %d punti di ancoraggio diff" msgid "E1550: Failed to find all diff anchors" msgstr "E1550: Non ho trovato tutti i punti di ancoraggio diff" +msgid "E1551: Cannot open a popup window to a closing buffer" +msgstr "E1551: Non posso aprire una finestra dinamica per un buffer che " +"è in fase di chiusura" + +msgid "E1552: Type variable name must start with an uppercase letter: %s" +msgstr "E1552: Il nome del tipo di variabile deve iniziare con una lettera " +"maiuscola: %s" + +msgid "E1553: Missing comma after type in generic function: %s" +msgstr "E1553: Manca virgola dopo il tipo nella funzione generica: %s" + +msgid "E1554: Missing '>' in generic function: %s" +msgstr "E1554: Manca '>' nella funzione generica: %s" + +msgid "E1555: Empty type list specified for generic function '%s'" +msgstr "E1555: Lista di tipo vuoto specificata per la funzione generica '%s'" + +msgid "E1556: Too many types specified for generic function '%s'" +msgstr "E1556: Troppi tipi specificati per la funzione generica '%s'" + +msgid "E1557: Not enough types specified for generic function '%s'" +msgstr "E1557: Numero insufficiente di tipi specificato per la funzione " +"generica '%s'" + +msgid "E1558: Unknown generic function: %s" +msgstr "E1558: Funzione generica sconosciuta: %s" + +msgid "E1559: Type arguments missing for generic function '%s'" +msgstr "E1559: Tipo degli argomenti mancante per la funzione generica '%s'" + +msgid "E1560: Not a generic function: %s" +msgstr "E1560: Not è una funzione generica: %s" + +msgid "E1561: Duplicate type variable name: %s" +msgstr "E1561: Nome del tipo della variabile duplicato: %s" + +#. type of cmdline window or 0 +#. result of cmdline window or 0 +#. buffer of cmdline window or NULL +#. window of cmdline window or NULL msgid "--No lines in buffer--" msgstr "--File vuoto--" @@ -8294,6 +8419,7 @@ msgid "float" msgstr "numero a virgola mobile" #. +#. * Some messages that can be shared are included here. #. msgid "search hit TOP, continuing at BOTTOM" msgstr "raggiunta la CIMA nella ricerca, continuo dal FONDO" @@ -8393,6 +8519,7 @@ msgstr "il costruttore di lista non accetta parole chiave come argomenti" msgid "list index out of range" msgstr "Indice di Lista fuori intervallo" +#. No more suitable format specifications in python-2.3 msgid "internal error: failed to get Vim list item %d" msgstr "" "errore interno: non sono riuscito a ottenere l'elemento di Lista di Vim %d" diff --git a/src/po/vim.pot b/src/po/vim.pot index ca9cbdd180..cdb2e2ea2e 100644 --- a/src/po/vim.pot +++ b/src/po/vim.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-07-21 21:33+0200\n" +"POT-Creation-Date: 2025-07-25 19:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1540,7 +1540,13 @@ msgstr "" msgid "" "\n" -"Where case is ignored prepend / to make flag upper case" +"Where command is down-cased, prepend / (like: -/R) to treat flag as upper-" +"case." +msgstr "" + +msgid "" +"\n" +"Or, where supported, SET PROC/PARSE=EXT, or else quote upper-case material." msgstr "" msgid "" @@ -3386,7 +3392,7 @@ msgstr "" msgid "" "\n" -"OpenVMS version" +"OpenVMS (build) arch, version" msgstr "" msgid "" @@ -8571,6 +8577,12 @@ msgid "" "class \"%s\"" msgstr "" +msgid "E1435: Enum can only be used in a script" +msgstr "" + +msgid "E1436: Interface can only be used in a script" +msgstr "" + #, c-format msgid "E1500: Cannot mix positional and non-positional arguments: %s" msgstr "" @@ -9908,7 +9920,7 @@ msgstr "" msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P" msgstr "" -msgid "use fuzzy collection for specific completion modes" +msgid "automatic completion in insert mode" msgstr "" msgid "whether to use a popup menu for Insert mode completion" @@ -9917,6 +9929,9 @@ msgstr "" msgid "popup menu item align order" msgstr "" +msgid "use fuzzy collection for specific completion modes" +msgstr "" + msgid "options for the Insert mode completion info popup" msgstr "" diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro index 05640087cf..5c0b0e30b7 100644 --- a/src/proto/insexpand.pro +++ b/src/proto/insexpand.pro @@ -69,4 +69,6 @@ int ins_complete(int c, int enable_pum); void free_insexpand_stuff(void); int ins_compl_cancel(void); void f_complete_match(typval_T *argvars, typval_T *rettv); +int ins_compl_setup_autocompl(int c); +// void ins_compl_disable_autocompl(void); /* vim: set ft=c : */ diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro index d7c187af61..d24a61d151 100644 --- a/src/proto/misc1.pro +++ b/src/proto/misc1.pro @@ -10,6 +10,7 @@ int plines_win_col(win_T *wp, linenr_T lnum, long column); int plines_m_win(win_T *wp, linenr_T first, linenr_T last, int max); int gchar_pos(pos_T *pos); int gchar_cursor(void); +int char_before_cursor(void); void pchar_cursor(int c); char_u *skip_to_option_part(char_u *p); void check_status(buf_T *buf); diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 1573fbee00..3a92d52982 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -586,30 +586,40 @@ endfunc func Test_cpt_func_cursorcol() func CptColTest(findstart, query) if a:findstart - call assert_equal("foo bar", getline(1)) - call assert_equal(8, col('.')) + call assert_equal(b:info_compl_line, getline(1)) + call assert_equal(b:info_cursor_col, col('.')) return col('.') endif - call assert_equal("foo ", getline(1)) - call assert_equal(5, col('.')) + call assert_equal(b:expn_compl_line, getline(1)) + call assert_equal(b:expn_cursor_col, col('.')) return v:none endfunc set complete=FCptColTest new - call feedkeys("ifoo bar\", "tx") - bwipe! - new + + " Replace mode + let b:info_compl_line = "foo barxyz" + let b:expn_compl_line = "foo barbaz" + let b:info_cursor_col = 10 + let b:expn_cursor_col = 5 + call feedkeys("ifoo barbaz\2hRxy\", "tx") + + " Insert mode + let b:info_compl_line = "foo bar" + let b:expn_compl_line = "foo " + let b:info_cursor_col = 8 + let b:expn_cursor_col = 5 + call feedkeys("Sfoo bar\", "tx") + set completeopt=longest - call feedkeys("ifoo bar\", "tx") - bwipe! - new + call feedkeys("Sfoo bar\", "tx") + set completeopt=menuone - call feedkeys("ifoo bar\", "tx") - bwipe! - new + call feedkeys("Sfoo bar\", "tx") + set completeopt=menuone,preinsert - call feedkeys("ifoo bar\", "tx") + call feedkeys("Sfoo bar\", "tx") bwipe! set complete& completeopt& delfunc CptColTest @@ -3643,7 +3653,7 @@ func Test_cfc_with_longest() exe "normal ggdGShello helio heo\\\" call assert_equal("hello helio heo", getline('.')) - " kdcit + " dict call writefile(['help'], 'test_keyword.txt', 'D') set complete=ktest_keyword.txt exe "normal ggdGSh\\" @@ -4860,6 +4870,27 @@ func Test_complete_fuzzy_omnifunc_backspace() unlet g:do_complete endfunc +" Test that option shortmess=c turns off completion messages +func Test_shortmess() + CheckScreendump + + let lines =<< trim END + call setline(1, ['hello', 'hullo', 'heee']) + END + + call writefile(lines, 'Xpumscript', 'D') + let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12}) + call term_sendkeys(buf, "Goh\") + call TermWait(buf, 200) + call VerifyScreenDump(buf, 'Test_shortmess_complmsg_1', {}) + call term_sendkeys(buf, "\:set shm+=c\") + call term_sendkeys(buf, "Sh\") + call TermWait(buf, 200) + call VerifyScreenDump(buf, 'Test_shortmess_complmsg_2', {}) + + call StopVimInTerminal(buf) +endfunc + " Test 'complete' containing F{func} that complete from nonkeyword func Test_nonkeyword_trigger() @@ -4976,25 +5007,320 @@ func Test_nonkeyword_trigger() unlet g:CallCount endfunc -" Test that option shortmess=c turns off completion messages -func Test_shortmess() - CheckScreendump +func Test_autocomplete_trigger() + " Trigger expansion even when another char is waiting in the typehead + call test_override("char_avail", 1) - let lines =<< trim END - call setline(1, ['hello', 'hullo', 'heee']) - END + let g:CallCount = 0 + func! NonKeywordComplete(findstart, base) + let line = getline('.')->strpart(0, col('.') - 1) + let nonkeyword2 = len(line) > 1 && match(line[-2:-2], '\k') != 0 + if a:findstart + return nonkeyword2 ? col('.') - 3 : (col('.') - 2) + else + let g:CallCount += 1 + return [$"{a:base}foo", $"{a:base}bar"] + endif + endfunc - call writefile(lines, 'Xpumscript', 'D') - let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12}) - call term_sendkeys(buf, "Goh\") - call TermWait(buf, 200) - call VerifyScreenDump(buf, 'Test_shortmess_complmsg_1', {}) - call term_sendkeys(buf, "\:set shm+=c\") - call term_sendkeys(buf, "Sh\") - call TermWait(buf, 200) - call VerifyScreenDump(buf, 'Test_shortmess_complmsg_2', {}) + new + inoremap let b:matches = complete_info(["matches"]).matches + inoremap let b:selected = complete_info(["selected"]).selected - call StopVimInTerminal(buf) + call setline(1, ['abc', 'abcd', 'fo', 'b', '']) + set autocomplete + + " Test 1a: Nonkeyword doesn't open menu without F{func} when autocomplete + call feedkeys("GS=\\0", 'tx!') + call assert_equal([], b:matches) + call assert_equal('=', getline('.')) + " ^N opens menu of keywords (of len > 1) + call feedkeys("S=\\\\0", 'tx!') + call assert_equal(['abc', 'abcd', 'fo'], b:matches->mapnew('v:val.word')) + call assert_equal('=abc', getline('.')) + + " Test 1b: With F{func} nonkeyword collects matches + set complete=.,FNonKeywordComplete + let g:CallCount = 0 + call feedkeys("S=\\0", 'tx!') + call assert_equal(['=foo', '=bar'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + call assert_equal('=', getline('.')) + let g:CallCount = 0 + call feedkeys("S->\\0", 'tx!') + call assert_equal(['->foo', '->bar'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + call assert_equal('->', getline('.')) + + " Test 1c: Keyword after nonkeyword can collect both types of items + let g:CallCount = 0 + call feedkeys("S#a\\0", 'tx!') + call assert_equal(['abcd', 'abc', '#afoo', '#abar'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + call assert_equal('#a', getline('.')) + let g:CallCount = 0 + call feedkeys("S#a.\\0", 'tx!') + call assert_equal(['.foo', '.bar'], b:matches->mapnew('v:val.word')) + call assert_equal(3, g:CallCount) + call assert_equal('#a.', getline('.')) + let g:CallCount = 0 + call feedkeys("S#a.a\\0", 'tx!') + call assert_equal(['abcd', 'abc', '.afoo', '.abar'], b:matches->mapnew('v:val.word')) + call assert_equal(4, g:CallCount) + call assert_equal('#a.a', getline('.')) + + " Test 1d: Nonkeyword after keyword collects items again + let g:CallCount = 0 + call feedkeys("Sa\\0", 'tx!') + call assert_equal(['abcd', 'abc', 'afoo', 'abar'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + call assert_equal('a', getline('.')) + let g:CallCount = 0 + call feedkeys("Sa#\\0", 'tx!') + call assert_equal(['#foo', '#bar'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + call assert_equal('a#', getline('.')) + + " Test 2: Filter nonkeyword and keyword matches with differet startpos + for fuzzy in range(2) + if fuzzy + set completeopt+=fuzzy + endif + call feedkeys("S#ab\\\0", 'tx!') + if fuzzy + call assert_equal(['#abar', 'abc', 'abcd'], b:matches->mapnew('v:val.word')) + else " Ordering of items is by 'nearest' to cursor by default + call assert_equal(['abcd', 'abc', '#abar'], b:matches->mapnew('v:val.word')) + endif + call assert_equal(-1, b:selected) + call assert_equal('#ab', getline('.')) + call feedkeys("S#ab" . repeat("\", 3) . "\\0", 'tx!') + call assert_equal(fuzzy ? '#abcd' : '#abar', getline('.')) + call assert_equal(2, b:selected) + + let g:CallCount = 0 + call feedkeys("GS#aba\\0", 'tx!') + call assert_equal(['#abar'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + call assert_equal('#aba', getline('.')) + + let g:CallCount = 0 + call feedkeys("S#abc\\0", 'tx!') + if fuzzy + call assert_equal(['abc', 'abcd'], b:matches->mapnew('v:val.word')) + else + call assert_equal(['abcd', 'abc'], b:matches->mapnew('v:val.word')) + endif + call assert_equal(2, g:CallCount) + set completeopt& + endfor + + " Test 3: Navigate menu containing nonkeyword and keyword items + call feedkeys("S#a\\0", 'tx!') + call assert_equal(['abcd', 'abc', '#afoo', '#abar'], b:matches->mapnew('v:val.word')) + call feedkeys("S#a" . repeat("\", 3) . "\0", 'tx!') + call assert_equal('#afoo', getline('.')) + call feedkeys("S#a" . repeat("\", 3) . "\\0", 'tx!') + call assert_equal('#abc', getline('.')) + + call feedkeys("S#a.a\\0", 'tx!') + call assert_equal(['abcd', 'abc', '.afoo', '.abar'], b:matches->mapnew('v:val.word')) + call feedkeys("S#a.a" . repeat("\", 2) . "\0", 'tx!') + call assert_equal('#a.abc', getline('.')) + call feedkeys("S#a.a" . repeat("\", 3) . "\0", 'tx!') + call assert_equal('#a.afoo', getline('.')) + call feedkeys("S#a.a" . repeat("\", 3) . "\\0", 'tx!') + call assert_equal('#a.abc', getline('.')) + call feedkeys("S#a.a" . repeat("\", 6) . "\0", 'tx!') + call assert_equal('#a.abar', getline('.')) + + " Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords + let g:CallCount = 0 + call feedkeys("S#a\\\\0", 'tx!') + call assert_equal(['abc', 'abcd'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + + " Test 4b: When autocomplete menu is active, ^X^O completes omnifunc + let g:CallCount = 0 + set omnifunc=NonKeywordComplete + call feedkeys("S#a\\\\0", 'tx!') + call assert_equal(['#afoo', '#abar'], b:matches->mapnew('v:val.word')) + call assert_equal(3, g:CallCount) + + " Test 4c: When autocomplete menu is active, ^E^N completes keyword + call feedkeys("Sa\\\0", 'tx!') + call assert_equal([], b:matches->mapnew('v:val.word')) + let g:CallCount = 0 + call feedkeys("Sa\\\\0", 'tx!') + call assert_equal(['abc', 'abcd', 'afoo', 'abar'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + + " Test 4d: When autocomplete menu is active, ^X^L completes lines + %d + let g:CallCount = 0 + call setline(1, ["afoo bar", "barbar foo", "foo bar", "and"]) + call feedkeys("Goa\\\\0", 'tx!') + call assert_equal(['afoo bar', 'and'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + " Test 5: When invalid prefix stops completion, backspace should restart it + %d + set complete& + call setline(1, ["afoo bar", "barbar foo", "foo bar", "and"]) + call feedkeys("Goabc\\0", 'tx!') + call assert_equal([], b:matches->mapnew('v:val.word')) + call feedkeys("Sabc\\\\0", 'tx!') + call assert_equal(['and', 'afoo'], b:matches->mapnew('v:val.word')) + call feedkeys("Szx\\\0", 'tx!') + call assert_equal([], b:matches->mapnew('v:val.word')) + call feedkeys("Sazx\\\\0", 'tx!') + call assert_equal(['and', 'afoo'], b:matches->mapnew('v:val.word')) + + bw! + call test_override("char_avail", 0) + delfunc NonKeywordComplete + set autocomplete& + unlet g:CallCount +endfunc + +" Test autocomplete timing +func Test_autocomplete_timer() + + let g:CallCount = 0 + func! TestComplete(delay, check, refresh, findstart, base) + if a:findstart + return col('.') - 1 + else + let g:CallCount += 1 + if a:delay + sleep 310m " Exceed timeout + endif + if a:check + while !complete_check() + sleep 2m + endwhile + return v:none " This should trigger after interrupted by timeout + endif + let res = [["ab", "ac", "ad"], ["abb", "abc", "abd"], ["acb", "cc", "cd"]] + if a:refresh + return #{words: res[g:CallCount - 1], refresh: 'always'} + endif + return res[g:CallCount - 1] + endif + endfunc + + " Trigger expansion even when another char is waiting in the typehead + call test_override("char_avail", 1) + + new + inoremap let b:matches = complete_info(["matches"]).matches + inoremap let b:selected = complete_info(["selected"]).selected + set autocomplete + + call setline(1, ['abc', 'bcd', 'cde']) + + " Test 1: When matches are found before timeout expires, it exits + " 'collection' mode and transitions to 'filter' mode. + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 0\\,\ 0]) + let g:CallCount = 0 + call feedkeys("Goa\\0", 'tx!') + call assert_equal(['abc', 'ab', 'ac', 'ad'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + let g:CallCount = 0 + call feedkeys("Sab\\0", 'tx!') + call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + " Test 2: When timeout expires before all matches are found, it returns + " with partial list but still transitions to 'filter' mode. + set complete=.,Ffunction('TestComplete'\\,\ [1\\,\ 0\\,\ 0]) + let g:CallCount = 0 + call feedkeys("Sab\\0", 'tx!') + call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + " Test 3: When interrupted by ^N before timeout expires, it remains in + " 'collection' mode without transitioning. + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 1\\,\ 0]) + let g:CallCount = 0 + call feedkeys("Sa\b\\0", 'tx!') + call assert_equal(2, g:CallCount) + + let g:CallCount = 0 + call feedkeys("Sa\b\c\\0", 'tx!') + call assert_equal(3, g:CallCount) + + " Test 4: Simulate long running func that is stuck in complete_check() + let g:CallCount = 0 + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 1\\,\ 0]) + call feedkeys("Sa\\0", 'tx!') + call assert_equal(['abc'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + let g:CallCount = 0 + call feedkeys("Sab\\0", 'tx!') + call assert_equal(['abc'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + " Test 5: refresh:always stays in 'collection' mode + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 0\\,\ 1]) + let g:CallCount = 0 + call feedkeys("Sa\\0", 'tx!') + call assert_equal(['abc', 'ab', 'ac', 'ad'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + + let g:CallCount = 0 + call feedkeys("Sab\\0", 'tx!') + call assert_equal(['abc', 'abb', 'abd'], b:matches->mapnew('v:val.word')) + call assert_equal(2, g:CallCount) + + " Test 6: and navigate menu + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 0\\,\ 0]) + let g:CallCount = 0 + call feedkeys("Sab\\\\0", 'tx!') + call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word')) + call assert_equal(0, b:selected) + call assert_equal(1, g:CallCount) + call feedkeys("Sab\\\\\0", 'tx!') + call assert_equal(1, b:selected) + call feedkeys("Sab\\\\\0", 'tx!') + call assert_equal(-1, b:selected) + + " Test 7: Following 'cot' option values have no effect + set completeopt=menu,menuone,noselect,noinsert,longest,preinsert + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 0\\,\ 0]) + let g:CallCount = 0 + call feedkeys("Sab\\\\0", 'tx!') + call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word')) + call assert_equal(0, b:selected) + call assert_equal(1, g:CallCount) + call assert_equal('abc', getline(4)) + set completeopt& + + " Test 8: {func} completes after space, but not '.' + set complete=.,Ffunction('TestComplete'\\,\ [0\\,\ 0\\,\ 0]) + let g:CallCount = 0 + call feedkeys("S \\\0", 'tx!') + call assert_equal(['ab', 'ac', 'ad'], b:matches->mapnew('v:val.word')) + call assert_equal(1, g:CallCount) + set complete=. + call feedkeys("S \\\0", 'tx!') + call assert_equal([], b:matches->mapnew('v:val.word')) + + " Test 9: Matches nearest to the cursor are prioritized (by default) + %d + let g:CallCount = 0 + set complete=. + call setline(1, ["fo", "foo", "foobar", "foobarbaz"]) + call feedkeys("jof\\0", 'tx!') + call assert_equal(['foo', 'foobar', 'fo', 'foobarbaz'], b:matches->mapnew('v:val.word')) + + bw! + call test_override("char_avail", 0) + delfunc TestComplete + set autocomplete& complete& + unlet g:CallCount endfunc " vim: shiftwidth=2 sts=2 expandtab nofoldenable diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index 33dbc98b22..7e0a5100b0 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -13168,4 +13168,18 @@ func Test_class_selfref_gc() call v9.CheckSourceSuccess(lines) endfunc +" Test for defining an interface in a function +def Test_interface_defined_in_function() + var lines =<< trim END + vim9script + def Fn() + var x = 1 + interface Foo + endinterface + enddef + defcompile + END + v9.CheckScriptFailure(lines, 'E1436: Interface can only be used in a script', 2) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/testdir/test_vim9_enum.vim b/src/testdir/test_vim9_enum.vim index 4f0cf640ea..be4c8f6d5b 100644 --- a/src/testdir/test_vim9_enum.vim +++ b/src/testdir/test_vim9_enum.vim @@ -1664,4 +1664,19 @@ func Test_class_selfref_gc() call v9.CheckSourceSuccess(lines) endfunc +" Test for defining an enum in a function +def Test_enum_defined_in_function() + var lines =<< trim END + vim9script + def Fn() + var x = 1 + enum Foo + Red, + endenum + enddef + defcompile + END + v9.CheckScriptFailure(lines, 'E1435: Enum can only be used in a script', 2) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 0008f1e51d..8e968d6efb 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -5457,6 +5457,22 @@ def Test_if_cond_shortcircuit_skip_indexing() v9.CheckSourceSuccess(lines) enddef +" Test for defining a dict with multiple keys in a command-block +def Test_multikey_dict_in_block() + var lines =<< trim END + vim9script + command NewCommand { + g:TestDict = { + 'key': 'v1', + 'other_key': 'v2' } + } + NewCommand + END + v9.CheckSourceSuccess(lines) + assert_equal({key: 'v1', other_key: 'v2'}, g:TestDict) + unlet g:TestDict +enddef + " Keep this last, it messes up highlighting. def Test_substitute_cmd() new diff --git a/src/testdir/util/screendump.vim b/src/testdir/util/screendump.vim index be6af861aa..d9e9073798 100644 --- a/src/testdir/util/screendump.vim +++ b/src/testdir/util/screendump.vim @@ -29,11 +29,84 @@ def ReadAndFilter(fname: string, filter: string): list return contents enddef +" Accommodate rendering idiosyncrasies (see #16559). For details, refer to +" "VerifyScreenDump()" and the "options" dictionary passed to it: this is +" an implementation of its "FileComparisonPreAction" entry. (This function +" runs in couples with "g:ScreenDumpLookForFFFDChars()".) +def g:ScreenDumpDiscardFFFDChars( + state: dict, + testdump: list, + refdump: list) + if empty(state) || len(testdump) != len(refdump) + return + endif + for lstr: string in keys(state) + const lnum: number = str2nr(lstr) + const fst_fffd_idx: number = stridx(testdump[lnum], "\xef\xbf\xbd") + # Retroactively discard non-equal line suffixes. It is assumed that no + # runs of U+EFU+BFU+BD and no U+FFFDs are present in "refdump". + if fst_fffd_idx >= 0 + # Mask the "||" character cells and the cursor cell ">.". + const masked_part: string = substitute( + substitute( + strpart(testdump[lnum], 0, (fst_fffd_idx - 1)), + '[>|]|', '|.', 'g'), + '|\@', '|', 'g') + const prev_cell_idx: number = strridx(masked_part, '|') + # A series of repeated characters will be found recorded in shorthand; + # e.g. "|α@3" stands for a cell of four "α"s. Replacing any repeated + # multibyte character of a series with a U+FFFD character will split the + # series and its shorthand record will reflect this fact: "|α@2|�". + # Therefore, a common prefix to share for two corresponding lines can + # extend to either an ASCII character(s) cell before the leftmost U+FFFD + # character cell; or, a last-but-one arbitrary cell before the leftmost + # U+FFFD character cell; or, an empty string. + const prefix: number = (prev_cell_idx >= 0) + ? (char2nr(strpart(masked_part, (prev_cell_idx + 1), 1), true) < 128) + ? fst_fffd_idx - 1 + : (strridx(masked_part, '|', (prev_cell_idx - 1)) >= 0) + ? prev_cell_idx + : 0 + : 0 + refdump[lnum] = strpart(refdump[lnum], 0, prefix) + testdump[lnum] = strpart(testdump[lnum], 0, prefix) + endif + endfor +enddef + +" Accommodate rendering idiosyncrasies (see #16559). For details, refer to +" "VerifyScreenDump()" and the "options" dictionary passed to it: this is +" an implementation of its "NonEqualLineComparisonPostAction" entry. (This +" function runs in couples with "g:ScreenDumpDiscardFFFDChars()".) +def g:ScreenDumpLookForFFFDChars( + state: dict, + testdump: list, + lnum: number) + if stridx(testdump[lnum], "\xef\xbf\xbd") >= 0 + state[string(lnum)] = 1 + endif +enddef " Verify that Vim running in terminal buffer "buf" matches the screen dump. -" "options" is passed to term_dumpwrite(). -" Additionally, the "wait" entry can specify the maximum time to wait for the -" screen dump to match in msec (default 1000 msec). +" +" A copy of "options" is passed to "term_dumpwrite()". For convenience, this +" dictionary supports other optional entries: +" "wait", (default to 1000 msec at least) +" the maximum time to wait for the screen dump to match in msec. +" "FileComparisonPreAction", (default to a no-op action) +" some Funcref to call, passing the following three arguments, each time +" before the file contents of two screen dumps are compared: +" some dictionary with some state entries; +" the file contents of the newly generated screen dump; +" the file contents of the reference screen dump. +" "NonEqualLineComparisonPostAction", (default to a no-op action) +" some Funcref to call, passing the following three arguments, each time +" after a corresponding pair of lines is found not equal: +" some dictionary with some state entries; +" the file contents of the newly generated screen dump; +" the zero-based number of the line whose copies are not equal. +" (See an example in runtime/syntax/testdir/runtest.vim.) +" " The file name used is "dumps/{filename}.dump". " " To ignore part of the dump, provide a "dumps/{filename}.vim" file with @@ -46,14 +119,31 @@ enddef " Returns non-zero when verification fails. func VerifyScreenDump(buf, filename, options, ...) if has('gui_running') && exists("g:check_screendump_called") && g:check_screendump_called == v:false - echoerr "VerifyScreenDump() called from a test that lacks a CheckScreendump guard." - return 1 + echoerr "VerifyScreenDump() called from a test that lacks a CheckScreendump guard." + return 1 endif let reference = 'dumps/' . a:filename . '.dump' let filter = 'dumps/' . a:filename . '.vim' let testfile = 'failed/' . a:filename . '.dump' - let max_loops = get(a:options, 'wait', 1000) / 1 + let options_copy = copy(a:options) + if has_key(options_copy, 'wait') + let max_loops = max([0, remove(options_copy, 'wait')]) + else + let max_loops = 1000 + endif + if has_key(options_copy, 'FileComparisonPreAction') + let FileComparisonPreAction = remove(options_copy, 'FileComparisonPreAction') + let CopyStringList = {_refdump -> copy(_refdump)} + else + let FileComparisonPreAction = {_state, _testdump, _refdump -> 0} + let CopyStringList = {_refdump -> _refdump} + endif + if has_key(options_copy, 'NonEqualLineComparisonPostAction') + let NonEqualLineComparisonPostAction = remove(options_copy, 'NonEqualLineComparisonPostAction') + else + let NonEqualLineComparisonPostAction = {_state, _testdump, _lnum -> 0} + endif " Starting a terminal to make a screendump is always considered flaky. let g:test_is_flaky = 1 @@ -66,35 +156,35 @@ func VerifyScreenDump(buf, filename, options, ...) " text and attributes only from the internal buffer. redraw - if filereadable(reference) - let refdump = ReadAndFilter(reference, filter) - else - " Must be a new screendump, always fail - let refdump = [] - endif - let did_mkdir = 0 if !isdirectory('failed') let did_mkdir = 1 call mkdir('failed') endif + if !filereadable(reference) + " Leave a bit of time for updating the original window while we spin wait. + sleep 10m + call delete(testfile) + call term_dumpwrite(a:buf, testfile, options_copy) + call assert_report('See new dump file: call term_dumpload("testdir/' .. testfile .. '")') + " No point in retrying. + let g:run_nr = 10 + return 1 + endif + + let refdump_orig = ReadAndFilter(reference, filter) + let state = {} let i = 0 while 1 - " leave a bit of time for updating the original window while we spin wait. + " Leave a bit of time for updating the original window while we spin wait. sleep 1m call delete(testfile) - call term_dumpwrite(a:buf, testfile, a:options) - - if refdump->empty() - let msg = 'See new dump file: call term_dumpload("testdir/' .. testfile .. '")' - call assert_report(msg) - " no point in retrying - let g:run_nr = 10 - return 1 - endif - + call term_dumpwrite(a:buf, testfile, options_copy) + " Filtering done with "FileComparisonPreAction()" may change "refdump*". + let refdump = CopyStringList(refdump_orig) let testdump = ReadAndFilter(testfile, filter) + call FileComparisonPreAction(state, testdump, refdump) if refdump == testdump call delete(testfile) if did_mkdir @@ -120,6 +210,7 @@ func VerifyScreenDump(buf, filename, options, ...) endif if testdump[j] != refdump[j] let msg = msg . '; difference in line ' . (j + 1) . ': "' . testdump[j] . '"' + call NonEqualLineComparisonPostAction(state, testdump, j) endif endfor @@ -137,3 +228,5 @@ func VerifyScreenDump(buf, filename, options, ...) endwhile return 0 endfunc + +" vim:sw=2:ts=8:noet: diff --git a/src/version.c b/src/version.c index fd5aace5d4..e777473c9c 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,34 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1591, +/**/ + 1590, +/**/ + 1589, +/**/ + 1588, +/**/ + 1587, +/**/ + 1586, +/**/ + 1585, +/**/ + 1584, +/**/ + 1583, +/**/ + 1582, +/**/ + 1581, +/**/ + 1580, +/**/ + 1579, +/**/ + 1578, /**/ 1577, /**/ @@ -4147,13 +4175,19 @@ list_version(void) #endif #ifdef VMS - msg_puts(_("\nOpenVMS version")); + msg_puts(_("\nOpenVMS (build) arch, version")); # ifdef HAVE_PATHDEF if (*compiled_arch != NUL) { - msg_puts(" - "); + msg_puts(": "); msg_puts((char *)compiled_arch); + if (*compiled_vers != NUL) + { + msg_puts(", "); + msg_puts((char *)compiled_vers); + } } + # endif #endif diff --git a/src/vim.h b/src/vim.h index f0eebe9c7d..30693f9e61 100644 --- a/src/vim.h +++ b/src/vim.h @@ -24,7 +24,11 @@ // ============ the header file puzzle: order matters ========= #ifdef HAVE_CONFIG_H // GNU autoconf (or something else) was here -# include "auto/config.h" +# ifdef VMS +# include "config.h" /* Rely on /INCLUDE to find it. */ +# else +# include "auto/config.h" +# endif /* def VMS [else] */ # define HAVE_PATHDEF /* @@ -523,6 +527,7 @@ typedef long long vimlong_T; // for offsetof() #include +#include #if defined(HAVE_SYS_SELECT_H) && \ (!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME)) diff --git a/src/vim9compile.c b/src/vim9compile.c index 8b7064bd7b..f9998ceff2 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4750,6 +4750,14 @@ compile_def_function_body( emsg(_(e_class_can_only_be_used_in_script)); return FAIL; + case CMD_enum: + emsg(_(e_enum_can_only_be_used_in_script)); + return FAIL; + + case CMD_interface: + emsg(_(e_interface_can_only_be_used_in_script)); + return FAIL; + case CMD_type: emsg(_(e_type_can_only_be_used_in_script)); return FAIL; diff --git a/src/vim9generics.c b/src/vim9generics.c index 1452610a3f..9d01958760 100644 --- a/src/vim9generics.c +++ b/src/vim9generics.c @@ -306,7 +306,10 @@ parse_generic_func_type_args( // create space for the name and the new type if (ga_grow(&gfatab->gfat_args, 1) == FAIL) + { + vim_free(ret_free); return NULL; + } generic_arg = (generic_T *)gfatab->gfat_args.ga_data + gfatab->gfat_args.ga_len; gfatab->gfat_args.ga_len++; diff --git a/src/vim9type.c b/src/vim9type.c index 62e9344ef9..28997ab37b 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -1887,7 +1887,10 @@ parse_type_tuple( ret_type->tt_flags = flags; ret_type->tt_argcount = typecount; if (tuple_type_add_types(ret_type, typecount, type_gap) == FAIL) - return NULL; + { + ret_type = NULL; + goto on_err; + } mch_memmove(ret_type->tt_args, tuple_types_ga.ga_data, sizeof(type_T *) * typecount); diff --git a/src/wayland.c b/src/wayland.c index bf09443757..b09ec5f6b9 100644 --- a/src/wayland.c +++ b/src/wayland.c @@ -422,6 +422,10 @@ vwl_display_flush(vwl_display_T *display) if (select(display->fd + 1, NULL, &wfds, NULL, &tv) <= 0) #endif return FAIL; +#ifdef HAVE_SELECT + tv.tv_sec = 0; + tv.tv_usec = p_wtm * 1000; +#endif } // Return FAIL on error or timeout if ((errno != 0 && errno != EAGAIN) || ret == -1) diff --git a/src/xdiff/xinclude.h b/src/xdiff/xinclude.h index 6e9f50a2d0..1e0fbbaaa8 100644 --- a/src/xdiff/xinclude.h +++ b/src/xdiff/xinclude.h @@ -25,7 +25,7 @@ // defines HAVE_ATTRIBUTE_UNUSED #ifdef HAVE_CONFIG_H # ifdef VMS -# include "[.auto]config.h" +# include "config.h" # else # include "../auto/config.h" # endif diff --git a/src/xxd/Make_vms.mms b/src/xxd/Make_vms.mms index df6c1af248..41e261bf8b 100644 --- a/src/xxd/Make_vms.mms +++ b/src/xxd/Make_vms.mms @@ -1,7 +1,10 @@ # VMS MM[KS] makefile for XXD # tested with MMK and MMS as well. # -# Maintained by Zoltan Arpadffy +# Maintained by Zoltan Arpadffy +# 2025-05-24 Steven M. Schweda +# +###################################################################### # # Edit the lines in the Configuration section below to select. # @@ -16,12 +19,6 @@ ###################################################################### # Configuration section. ###################################################################### -# Compiler selection. -# Comment out if you use the VAXC compiler -###################################################################### -# DECC = YES - -##################################################################### # Uncomment if want a debug version. Resulting executable is DVIM.EXE ###################################################################### # DEBUG = YES @@ -32,41 +29,209 @@ # Please, do not change anything below without programming experience. ###################################################################### -CC = cc +# Define old MMK architecture macros when using MMS. +# +###################################################################### +# Architecture identification and product destination selection. +# Define old MMK architecture macros when using MMS. +# +.IFDEF MMS$ARCH_NAME # MMS$ARCH_NAME +ALPHA_X_ALPHA = 1 +IA64_X_IA64 = 1 +VAX_X_VAX = 1 +X86_64_X_X86_64 = 1 +.IFDEF ARCH # ARCH +ARCH_NAME = $(ARCH) +.ELSE # ARCH +ARCH_NAME = $(MMS$ARCH_NAME) +.ENDIF # ARCH +.IFDEF $(ARCH_NAME)_X_ALPHA # $(ARCH_NAME)_X_ALPHA +__ALPHA__ = 1 +.ENDIF # $(ARCH_NAME)_X_ALPHA +.IFDEF $(ARCH_NAME)_X_IA64 # $(ARCH_NAME)_X_IA64 +__IA64__ = 1 +.ENDIF # $(ARCH_NAME)_X_IA64 +.IFDEF $(ARCH_NAME)_X_VAX # $(ARCH_NAME)_X_VAX +__VAX__ = 1 +.ENDIF # $(ARCH_NAME)_X_VAX +.IFDEF $(ARCH_NAME)_X_X86_64 # $(ARCH_NAME)_X_X86_64 +__X86_64__ = 1 +.ENDIF # $(ARCH_NAME)_X_X86_64 +.ELSE # MMS$ARCH_NAME +.IFDEF __MMK__ # __MMK__ +.IFDEF ARCH # ARCH +.IFDEF __$(ARCH)__ # __$(ARCH)__ +.ELSE # __$(ARCH)__ +__$(ARCH)__ = 1 +.ENDIF # __$(ARCH)__ +.ENDIF # ARCH +.ENDIF # __MMK__ +.ENDIF # MMS$ARCH_NAME +# +# Combine command-line VAX C compiler macros. +# +.IFDEF VAXC # VAXC +VAXC_OR_FORCE_VAXC = 1 +.ELSE # VAXC +.IFDEF FORCE_VAXC # FORCE_VAXC +VAXC_OR_FORCE_VAXC = 1 +.ENDIF # FORCE_VAXC +.ENDIF # VAXC +# +# Analyze architecture-related and option macros. +# (Sense x86_64 before IA64 for old MMK and x86_64 cross tools.) +# +.IFDEF __X86_64__ # __X86_64__ +DECC = 1 +DESTM = X86_64 +.ELSE # __X86_64__ +.IFDEF __IA64__ # __IA64__ +DECC = 1 +DESTM = IA64 +.ELSE # __IA64__ +.IFDEF __ALPHA__ # __ALPHA__ +DECC = 1 +DESTM = ALPHA +.ELSE # __ALPHA__ +.IFDEF __VAX__ # __VAX__ +.IFDEF VAXC_OR_FORCE_VAXC # VAXC_OR_FORCE_VAXC +DESTM = VAXV +.ELSE # VAXC_OR_FORCE_VAXC +DECC = 1 +DESTM = VAX +.ENDIF # VAXC_OR_FORCE_VAXC +.ELSE # __VAX__ +DESTM = UNK +UNK_DEST = 1 +.ENDIF # __VAX__ +.ENDIF # __ALPHA__ +.ENDIF # __IA64__ +.ENDIF # __X86_64__ -.IFDEF DECC -CC_DEF = $(CC)/decc +.IFDEF PROD # PROD +DEST = $(PROD) +.ELSE # PROD +DEST = $(DESTM) +.ENDIF # PROD + +.FIRST +.IFDEF __MMK__ # __MMK__ + @ write sys$output "" +.ENDIF # __MMK__ +# +# Create destination directory. + @ write sys$output "Destination: [.$(DEST)]" + @ write sys$output "" + @ if (f$search( "$(DEST).DIR;1") .eqs. "") then - + create /directory [.$(DEST)] +# +# Compiler setup + +# Optimization. The .c.obj rule will override this for specific modules +# where the VAX C compilers hang. See VAX_NOOPTIM_LIST, below. +OPTIMIZE= /optim + +.IFDEF __VAX__ # __VAX__ + +# List of modules for which "Compaq C V6.4-005 on OpenVMS VAX V7.3" +# hangs. Add more as needed (plus-separated). +VAX_NOOPTIM_LIST = blowfish+regexp+sha256 + +# Compiler command. +# Default: CC /DECC. On non-VAX, or VAX with only DEC C installed, +# /DECC is harmless. If both DEC C and VAX C are installed, and VAX C +# was selected as the default, then /DECC must be specified explicitly. +# If both are installed, and DEC C is the default, but VAX C is desired, +# then define FORCE_VAXC to get VAX C (CC /VAXC). If only VAX C is +# installed, then define VAXC to get (plain) CC. + +.IFDEF DECC # DECC +CC_DEF = cc /decc +PREFIX = /prefix=all +.ELSE # DECC +.IFDEF FORCE_VAXC # FORCE_VAXC +CC_DEF = cc /vaxc +.ELSE # FORCE_VAXC +CC_DEF = cc +.ENDIF # FORCE_VAXC +.ENDIF # DECC +.ELSE # __VAX__ + +# Not VAX, therefore DEC C (/PREFIX). + +CC_DEF = cc /decc PREFIX = /prefix=all + +# These floating-point options are the defaults on IA64 and x86_64. +# This makes Alpha consistent. +FLOAT = /float = ieee_float /ieee_mode = denorm_results + +# Large-file support. Unavailable on VAX and very old Alpha. To +# disable, define NOLARGE. +.IFDEF NOLARGE .ELSE -CC_DEF = $(CC) -PREFIX = -.ENDIF +LARGE_DEF = , "_LARGEFILE" +.ENDIF # NOLARGE [ELSE] +.ENDIF # __VAX__ [ELSE] + +.IFDEF VAXC_OR_FORCE_VAXC # VAXC_OR_FORCE_VAXC +.ELSE # VAXC_OR_FORCE_VAXC +CCVER = YES # Unreliable with VAX C. +.ENDIF # VAXC_OR_FORCE_VAXC [ELSE] + +CDEFS = VMS $(LARGE_DEF) +DEFS = /define = ($(CDEFS)) + +.IFDEF LIST # LIST +LIST_OPT = /list=[.$(DEST)] /show=(all, nomessages) +.ENDIF # LIST + +.IFDEF DEBUG # DEBUG +TARGET = [.$(DEST)]dxxd.exe +CFLAGS = /debug/noopt$(PREFIX) $(LIST_OPT) /cross_reference/include=[] +LDFLAGS = /debug +.ELSE # DEBUG +TARGET = [.$(DEST)]xxd.exe +CFLAGS = $(OPTIMIZE) $(PREFIX) $(LIST_OPT) /include=[] + +LDFLAGS = +.ENDIF # DEBUG [ELSE] + +CC = $(CC_DEF) $(CFLAGS) LD_DEF = link -.IFDEF DEBUG -TARGET = dxxd.exe -CFLAGS = /debug/noopt$(PREFIX)/cross_reference/include=[] -LDFLAGS = /debug -.ELSE -TARGET = xxd.exe -CFLAGS = /opt$(PREFIX)/include=[] -LDFLAGS = -.ENDIF - .SUFFIXES : .obj .c SOURCES = xxd.c -OBJ = xxd.obj +OBJ_BASE = xxd.obj +OBJ = [.$(DEST)]$(OBJ_BASE) .c.obj : - $(CC_DEF) $(CFLAGS) $< + $(CC) $(DEFS) $< /object = $@ $(TARGET) : $(OBJ) - $(LD_DEF) $(LDFLAGS) /exe=$(TARGET) $+ + -@ def_dev_dir_orig = f$environment( "default") + -@ target_name_type = - + f$parse( "$(TARGET)", , , "NAME", "SYNTAX_ONLY")+ - + f$parse( "$(TARGET)", , , "TYPE", "SYNTAX_ONLY") + -@ set default [.$(DEST)] + $(LD_DEF) $(LDFLAGS) /exe = 'target_name_type' $(OBJ_BASE) + -@ set default 'def_dev_dir_orig' clean : - -@ if "''F$SEARCH("*.obj")'" .NES. "" then delete/noconfirm/nolog *.obj;* - -@ if "''F$SEARCH("*.exe")'" .NES. "" then delete/noconfirm/nolog *.exe;* + -@ if (f$search( "[.$(DEST)]*.*") .nes. "") then - + delete /noconfirm [.$(DEST)]*.*;* + -@ if (f$search( "$(DEST).DIR") .nes. "") then - + set protection = w:d $(DEST).DIR;* + -@ if (f$search( "$(DEST).DIR") .nes. "") then - + delete /noconfirm $(DEST).DIR;* -xxd.obj : xxd.c +help : + mcr sys$disk:$(TARGET) -h + +version : + mcr sys$disk:$(TARGET) -v + + +[.$(DEST)]xxd.obj : xxd.c