Skip to content

Commit 91d84c9

Browse files
authored
Merge pull request #3 from haya14busa/ci-run-generate
CI: check diff between vimlparser.go and generated vimlparser.go
2 parents 3d91935 + 731a0e1 commit 91d84c9

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ install:
1010
- go get github.com/golang/lint/golint
1111
- go get honnef.co/go/unused/cmd/unused
1212

13+
before_script:
14+
- vim --cmd version --cmd quit
15+
1316
script:
1417
- go test -v -race ./...
1518
- goveralls -service=travis-ci
1619
- go vet ./...
1720
- golint -set_exit_status .
1821
- unused ./...
22+
- vim -u NONE -N --cmd "let &rtp .= ',' . getcwd()" -S go/generate.vim -c ":q"
23+
- (! git diff | grep '^') # check diff

go/generate.vim

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source ./go/gocompiler.vim
22
source ./go/typedefs.vim
33

4-
call extend(s:, g:ImportGoCompiler())
4+
call extend(s:, ImportGoCompiler())
55

66
function! s:generate()
77
let gofile = 'go/vimlparser.go'
@@ -16,7 +16,7 @@ function! s:generate()
1616

1717
try
1818
let ast = s:ast()
19-
let c = s:GoCompiler.new(g:ImportTypedefs())
19+
let c = s:GoCompiler.new(ImportTypedefs())
2020
let lines = c.compile(ast)
2121
call writefile(head + lines, gofile)
2222
catch
@@ -28,23 +28,13 @@ function! s:ast() abort
2828
let vimfile = 'autoload/vimlparser.vim'
2929
let astfile = 'go/vimlparser.ast.vim'
3030

31-
let cache = {}
32-
if filereadable(astfile)
33-
" sandbox return js_decode(readfile(astfile)[0])
34-
let cache = js_decode(readfile(astfile)[0])
35-
" return deepcopy(cache)
36-
" XXX: cache doesn't work.... why...
37-
endif
38-
3931
let lines = readfile(vimfile)
4032
unlet lines[0:index(lines, 'let s:FALSE = 0')]
4133
unlet lines[index(lines, 'let s:RegexpParser = {}'):-2]
4234
let r = s:StringReader.new(lines)
4335
let p = s:VimLParser.new()
4436
let ast = p.parse(r)
45-
echom '(ast == cache) == ' . (ast == cache)
4637
return ast
47-
" return cache
4838
endfunction
4939

5040
function! s:numtoname(num)

0 commit comments

Comments
 (0)