Add tests

.gitignore

@@ -1 +1,2 @@
 test/*.out
+test/*.vimout

test/run.vim

@@ -9,35 +9,60 @@ function! s:run()
   for vimfile in glob(s:sdir . '/test*.vim', 0, 1)
     let okfile = fnamemodify(vimfile, ':r') . '.ok'
     let outfile = fnamemodify(vimfile, ':r') . '.out'
+    let vimokfile = fnamemodify(vimfile, ':r') . '.vimok'
+    let vimoutfile = fnamemodify(vimfile, ':r') . '.vimout'
     let skip = filereadable(fnamemodify(vimfile, ':r') . '.skip')
     let src = readfile(vimfile)
-    let r = s:vimlparser.StringReader.new(src)
     if vimfile =~# 'test_neo'
         let l:neovim = 1
     else
         let l:neovim = 0
     endif
     let p = s:vimlparser.VimLParser.new(l:neovim)
     let c = s:vimlparser.Compiler.new()
+    let pr = s:vimlparser.Printer.new()
     try
+      let r = s:vimlparser.StringReader.new(src)
       let out = c.compile(p.parse(r))
       call writefile(out, outfile)
     catch
       call writefile([v:exception], outfile)
     endtry
     if system(printf('diff %s %s', shellescape(okfile), shellescape(outfile))) == ""
-      let line = printf('%s => ok', fnamemodify(vimfile, ':.'))
+      let line = printf('%s(compiler) => ok', fnamemodify(vimfile, ':.'))
       call append(line('$'), line)
     else
       if !skip
         let ng += 1
       endif
-      let line = printf('%s => ' . (skip ? 'skip' : 'ng'), fnamemodify(vimfile, ':.'))
+      let line = printf('%s(compiler) => ' . (skip ? 'skip' : 'ng'), fnamemodify(vimfile, ':.'))
       call append(line('$'), line)
       for line in readfile(outfile)
         call append(line('$'), '    ' . line)
       endfor
     endif
+    if vimfile !~# 'err\|neo'
+      try
+        let r = s:vimlparser.StringReader.new(src)
+        let vimout = pr.print(p.parse(r))
+        call writefile(vimout, vimoutfile)
+      catch
+        call writefile([v:exception], vimoutfile)
+      endtry
+      if system(printf('diff %s %s', shellescape(filereadable(vimokfile) ? vimokfile : vimfile), shellescape(vimoutfile))) == ""
+        let line = printf('%s(printer) => ok', fnamemodify(vimfile, ':.'))
+        call append(line('$'), line)
+      else
+        if !skip
+          let ng += 1
+        endif
+        let line = printf('%s(printer) => ' . (skip ? 'skip' : 'ng'), fnamemodify(vimfile, ':.'))
+        call append(line('$'), line)
+        for line in readfile(vimoutfile)
+          call append(line('$'), '    ' . line)
+        endfor
+      endif
+    endif
   endfor
   if $CI == 'true'
     call writefile(getline(1, '$'), 'test.log')

test/test1.vimok

@@ -0,0 +1,53 @@
+" test1
+function s:foo(a, b, ...)
+  return 0
+endfunction
+if 1
+  echo "if 1"
+elseif 2
+  echo "elseif 2"
+else
+  echo "else"
+endif
+while 1
+  continue
+  break
+endwhile
+for [a, b; c] in d
+  echo a b c
+endfor
+delfunction s:foo
+call s:foo(1, 2, 3)
+let a = {"x" : "y"}
+let [a, b; c] = [1, 2, 3]
+let [a, b; c] += [1, 2, 3]
+let [a, b; c] -= [1, 2, 3]
+let [a, b; c] .= [1, 2, 3]
+let foo.bar.baz = 123
+let foo[bar()][baz()] = 456
+let foo[bar()].baz = 789
+let foo[1:2] = [3, 4]
+unlet a b c
+lockvar a b c
+lockvar 1 a b c
+unlockvar a b c
+unlockvar 1 a b c
+try
+  throw "err"
+catch /err/
+  echo "catch /err/"
+catch
+  echo "catch"
+finally
+  echo "finally"
+endtry
+echohl Error
+echon "echon"
+echomsg "echomsg"
+echoerr "echoerr"
+execute "normal ihello"
+echo [] [1, 2, 3] [1, 2, 3]
+echo {} {"x" : "y"} {"x" : "y", "z" : "w"}
+echo x[0] x[y]
+echo x[1:2] x[1:] x[:2] x[:]
+echo x.y x.y.z

test/test_bar.vimok

@@ -0,0 +1,3 @@
+if 1
+  set nocp
+endif

test/test_curly.vimok

@@ -0,0 +1,9 @@
+" test_curly
+echo xy{z}
+echo x{y}z
+echo {x}yz
+echo {x}{y}{z}
+echo {x{y{z}}}
+echo x{("y" . "w")}z
+echo {x}
+echo x#{y}#z

test/test_dict.vimok

@@ -0,0 +1,11 @@
+" test_dict
+echo {}
+echo {'1' : 1}
+echo {1 : 1}
+echo {x : 1}
+echo {"\<cr>" : 1}
+echo {"vim" : 1}
+echo {(1 + 1) : 2}
+" XXX: echo {x:1}
+echo {'x' : {}}
+echo [{}]

test/test_dot.vimok

@@ -0,0 +1,9 @@
+echo foo.bar
+echo foo.bar.baz
+echo ("foo" . "bar")
+echo (foo . "bar")
+echo ("foo" . bar)
+echo foo.bar()
+echo (foo . s:bar)
+echo foo.123
+echo foo.123abc

test/test_emptylc.vimok

@@ -0,0 +1,2 @@
+" test_emptylc
+echo 1

test/test_funcattr.vimok

@@ -0,0 +1,4 @@
+function! F() abort
+endfunction
+function! F() abort closure dict range
+endfunction

test/test_lambda.vimok

@@ -0,0 +1,5 @@
+" test_lambda
+echo { -> (1 + 1)}
+echo {i, v -> (v >= s:x)}
+echo {... -> a:000}
+echo {x -> (x * 2)}(14)

test/test_modifier_commands.vimok

@@ -0,0 +1,4 @@
+aboveleft belowright botright browse confirm hide keepalt keepjumps keepmarks keeppatterns lockmarks noswapfile silent tab topleft verbose vertical 
+call Func()
+aboveleft belowright botright browse confirm hide keepalt keepjumps keepmarks keeppatterns lockmarks noswapfile silent tab topleft verbose vertical 
+call Func()

test/test_op.vimok

@@ -0,0 +1,40 @@
+echo (a is b)
+echo (a is? b)
+echo (a is# b)
+echo (a isnot b)
+echo (a isnot? b)
+echo (a isnot# b)
+echo (a || b)
+echo (a && b)
+echo (a == b)
+echo (a ==? b)
+echo (a ==# b)
+echo (a != b)
+echo (a !=? b)
+echo (a !=# b)
+echo (a >= b)
+echo (a >=? b)
+echo (a >=# b)
+echo (a <= b)
+echo (a <=? b)
+echo (a <=# b)
+echo (a =~ b)
+echo (a =~? b)
+echo (a =~# b)
+echo (a !~ b)
+echo (a !~? b)
+echo (a !~# b)
+echo (a > b)
+echo (a >? b)
+echo (a ># b)
+echo (a < b)
+echo (a <? b)
+echo (a <# b)
+echo (a + b)
+echo (a - b)
+echo (a . b)
+echo (a * b)
+echo (a / b)
+echo (a % b)
+echo (!(a))
+echo (a ? b : c)

test/test_syncmd.vimok

@@ -0,0 +1,9 @@
+if 1
+  syntax on 
+endif
+syntax
+syntax enable
+syntax list GroupName
+syn match pythonError "[&|]\{2,}" display
+syntax match qfFileName /^\zs\S[^|]\+\/\ze[^|\/]\+\/[^|\/]\+|/ conceal cchar=+
+syntax region jsString start=+"+ skip=+\\\("\|$\)+ end=+"\|$+ contains=jsSpecial,@Spell extend

test/test_wincmd.vimok

@@ -0,0 +1,3 @@
+if 1
+  wincmd p
+endif

test/test_xxx_call_last_comma.vimok

@@ -0,0 +1,2 @@
+call foo(a, b)
+call bar(c, d)

test/test_xxx_funcarg_last_comma.vimok

@@ -0,0 +1,4 @@
+function F(a)
+endfunction
+function G(a)
+endfunction

test/test_xxx_lambdaarg_last_comma.vimok

@@ -0,0 +1,2 @@
+echo {a -> 0}
+echo {a -> 0}