update tests

Author: itchyny

test/node_position/test_position.ok

@@ -0,0 +1,10 @@
+function! F()
+  let x =
+\ 1
+
+  let x = "
+  \1
+	\2 <- tab
+  \3 マルチバイト
+  \4"
+endfunction

test/node_position/test_position.vim

@@ -0,0 +1,43 @@
+let s:vimlparser = vimlparser#import()
+
+function! s:run()
+  let src = [
+  \  '',
+  \  'function! F()',
+  \  '  let x =',
+  \  '\ 1',
+  \  '',
+  \  '  let x = "',
+  \  '  \1',
+  \  '	\2 <- tab',
+  \  '  \3 マルチバイト',
+  \  '  \4"',
+  \  'endfunction',
+  \  '',
+  \  '" END',
+  \]
+  let r = s:vimlparser.StringReader.new(src)
+  let p = s:vimlparser.VimLParser.new(0)
+  let c = s:vimlparser.Compiler.new()
+  let toplevel = p.parse(r)
+  let func = toplevel.body[0]
+  let body = s:extract_body(func, src)
+  call writefile(split(body, "\n"), 'test/node_position/test_position.out')
+  qall!
+endfunction
+
+function! s:extract_body(func, src)
+  let pos = a:func.pos
+
+  " FIXME calculating endpos is workaround. Ideally, it should have the end
+  " position of the node.
+
+  let endpos = a:func.endfunction.pos
+  let endfunc = a:func.endfunction.ea
+  let cmdlen = endfunc.argpos.offset - endfunc.cmdpos.offset
+  let endpos.offset += cmdlen
+
+  return join(a:src, "\n")[pos.offset : endpos.offset]
+endfunction
+
+call s:run()

test/run.bat

@@ -1,2 +1,5 @@
 @echo off
-vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S test/run.vim
+vim -Nu test/vimrc -S test/run.vim
+set EXIT=%ERRORLEVEL%
+if exist test.log type test.log
+exit /b %EXIT%

test/run.sh

@@ -1,2 +1,5 @@
 #!/bin/sh
-vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S test/run.vim
+vim -Nu test/vimrc -S test/run.vim
+EXIT=$?
+[ -e test.log ] && cat test.log
+exit $EXIT

test/run.vim

@@ -1,13 +1,15 @@
-
-
 let s:vimlparser = vimlparser#import()
 
 let s:sdir = expand('<sfile>:p:h')
 
 function! s:run()
+  enew
+  set buftype=nofile
+  let ng = 0
   for vimfile in glob(s:sdir . '/test*.vim', 0, 1)
     let okfile = fnamemodify(vimfile, ':r') . '.ok'
     let outfile = fnamemodify(vimfile, ':r') . '.out'
+    let skip = filereadable(fnamemodify(vimfile, ':r') . '.skip')
     let src = readfile(vimfile)
     let r = s:vimlparser.StringReader.new(src)
     if vimfile =~# 'test_neo'
@@ -23,13 +25,28 @@ function! s:run()
     catch
       call writefile([v:exception], outfile)
     endtry
-    if system(printf('diff %s %s', shellescape(okfile), shellescape(outfile))) == ""
+    let diff = system(printf('diff -u %s %s', shellescape(okfile), shellescape(outfile)))
+    if empty(diff)
       let line = printf('%s => ok', fnamemodify(vimfile, ':.'))
+      call append(line('$'), line)
     else
-      let line = printf('%s => ng', fnamemodify(vimfile, ':.'))
+      if !skip
+        let ng += 1
+      endif
+      let line = printf('%s => ' . (skip ? 'skip' : 'ng'), fnamemodify(vimfile, ':.'))
+      call append(line('$'), line)
+      for line in split(diff, '\n')
+        call append(line('$'), '    ' . line)
+      endfor
     endif
-    call append(line('$'), line)
   endfor
+  if $CI == 'true'
+    call writefile(getline(1, '$'), 'test.log')
+    if ng == 0
+      quit!
+    endif
+    cquit!
+  endif
   syntax enable
   match Error /^.* => ng$/
 endfunction

test/run_command.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+  echo "USAGE: ./test/run_command.sh <vimlparser command>"
+  echo "  Example: ./test/run_command.sh python3 py/vimlparser.py"
+  exit 1
+fi
+vimlparser=$@
+
+exit_status=0
+
+test_file() {
+  local vimfile=$1
+  local base=$(basename "$vimfile" ".vim")
+  local okfile="test/${base}.ok"
+  local outfile="test/${base}.out"
+
+  if [[ -f "test/${base}.skip" ]]; then
+    return
+  fi
+
+  local neovim=""
+  if [[ $vimfile =~ "test_neo" ]]; then
+    neovim="--neovim"
+  fi
+
+  rm -f ${outfile}
+
+  ${vimlparser} ${neovim} ${vimfile} &> ${outfile}
+
+  diffout=$(diff -u ${outfile} ${okfile})
+  if [ -n "$diffout" ]; then
+    exit_status=1
+    echo "${diffout}"
+  fi
+}
+
+for f in test/test*.vim; do
+  test_file ${f}
+done
+
+exit $exit_status

test/test1.ok

@@ -1,6 +1,10 @@
 ; test1
 (function (s:foo a b . ...)
   (return 0))
+(function (s:bar (a 1) (b 2) . ...)
+  (return 0))
+(function (s:baz a (b 2) . ...)
+  (return 0))
 (if 1
   (echo "if 1")
  elseif 2
@@ -14,6 +18,8 @@
   (echo a b c))
 (delfunction s:foo)
 (call (s:foo 1 2 3))
+(eval (filter odds 'v:val % 2'))
+(eval 42)
 (let = a (dict ("x" "y")))
 (let = (a b . c) (list 1 2 3))
 (let += (a b . c) (list 1 2 3))
@@ -46,3 +52,16 @@
 (echo (subscript x 0) (subscript x y))
 (echo (slice x 1 2) (slice x 1 nil) (slice x nil 2) (slice x nil nil))
 (echo (dot x y) (dot (dot x y) z))
+(let = a 1)
+(let += a 2)
+(let *= a 3)
+(let /= a 4)
+(let %= a 5)
+(let ..= a 'foo')
+(echo (concat (concat 'foo' 'bar') 'baz'))
+(echo (concat 'foo' (concat 'bar' 'baz')))
+(echo (concat (concat 'foo' 'bar') 'baz'))
+(let = a '🐥')
+(const = a 1)
+(const = (a b) (list 1 2))
+(const = (a b . c) (list 1 2 3))

test/test1.vim

@@ -2,6 +2,12 @@
 function s:foo(a, b, ...)
   return 0
 endfunction
+function s:bar(a = 1, b = 2, ...)
+  return 0
+endfunction
+function s:baz(a, b = 2, ...)
+  return 0
+endfunction
 if 1
   echo "if 1"
 elseif 2
@@ -18,6 +24,8 @@ for [a, b; c] in d
 endfor
 delfunction s:foo
 call s:foo(1, 2, 3)
+eval filter(odds, 'v:val % 2')
+eval 42
 let a = {"x": "y"}
 let [a, b; c] = [1, 2, 3]
 let [a, b; c] += [1, 2, 3]
@@ -51,3 +59,16 @@ 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
+let a = 1
+let a += 2
+let a *= 3
+let a /= 4
+let a %= 5
+let a ..= 'foo'
+echo ('foo' .. 'bar')..'baz'
+echo 'foo' .. ('bar'..'baz')
+echo 'foo' .. 'bar' .. 'baz'
+let a = '🐥'
+const a = 1
+const [a, b] = [1, 2]
+const [a, b; c] = [1, 2, 3]

test/test_blob.ok

@@ -0,0 +1,8 @@
+(echo 0z)
+(echo 0z11)
+(echo 0zdeadbeef)
+(echo 0Zdeadbeef)
+(echo 0zDEADBEEF)
+(echo 0ZDEADBEEF)
+(echo 0ZDEAD.BEEF)
+(echo (+ 0z00 0zFF))

test/test_blob.vim

@@ -0,0 +1,8 @@
+echo 0z
+echo 0z11
+echo 0zdeadbeef
+echo 0Zdeadbeef
+echo 0zDEADBEEF
+echo 0ZDEADBEEF
+echo 0ZDEAD.BEEF
+echo 0z00 + 0zFF