Added some unit tests and fixed some linting errors for automatic makefile parsing in C #1167

This commit is contained in:
roel0
2018-03-20 11:56:46 +01:00
parent c47b5fd4b8
commit 3fb7efa2c6
6 changed files with 102 additions and 23 deletions

View File

@@ -3,7 +3,7 @@
call ale#Set('c_clang_executable', 'clang')
call ale#Set('c_clang_options', '-std=c11 -Wall')
call ale#Set('c_gcc_parse_makefile', 0)
call ale#Set('c_clang_parse_makefile', 0)
function! ale_linters#c#clang#GetExecutable(buffer) abort
return ale#Var(a:buffer, 'c_clang_executable')
@@ -11,11 +11,13 @@ endfunction
function! ale_linters#c#clang#GetCommand(buffer) abort
let l:cflags = []
if g:ale_c_parse_makefile
let l:cflags = join(ale#c#ParseMakefile(a:buffer), ' ')
if g:ale_c_clang_parse_makefile
let l:cflags = join(ale#c#ParseMakefile(a:buffer), ' ') . ' '
endif
if empty(l:cflags)
let l:cflags = ale#c#IncludeOptions(ale#c#FindLocalHeaderPaths(a:buffer))
else
let l:cflags .= ' '
endif
" -iquote with the directory the file is in makes #include work for
@@ -23,7 +25,7 @@ let l:cflags = []
return ale#Escape(ale_linters#c#clang#GetExecutable(a:buffer))
\ . ' -S -x c -fsyntax-only '
\ . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
\ . l:cflags . ' '
\ . l:cflags
\ . ale#Var(a:buffer, 'c_clang_options') . ' -'
endfunction

View File

@@ -3,7 +3,7 @@
call ale#Set('c_gcc_executable', 'gcc')
call ale#Set('c_gcc_options', '-std=c11 -Wall')
call ale#Set('c_parse_makefile', 0)
call ale#Set('c_gcc_parse_makefile', 0)
function! ale_linters#c#gcc#GetExecutable(buffer) abort
return ale#Var(a:buffer, 'c_gcc_executable')
@@ -11,11 +11,13 @@ endfunction
function! ale_linters#c#gcc#GetCommand(buffer) abort
let l:cflags = []
if g:ale_c_parse_makefile
if g:ale_c_gcc_parse_makefile
let l:cflags = join(ale#c#ParseMakefile(a:buffer), ' ')
endif
if empty(l:cflags)
let l:cflags = ale#c#IncludeOptions(ale#c#FindLocalHeaderPaths(a:buffer))
else
let l:cflags .= ' '
endif
" -iquote with the directory the file is in makes #include work for
@@ -23,7 +25,7 @@ function! ale_linters#c#gcc#GetCommand(buffer) abort
return ale#Escape(ale_linters#c#gcc#GetExecutable(a:buffer))
\ . ' -S -x c -fsyntax-only '
\ . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
\ . l:cflags . ' '
\ . l:cflags
\ . ale#Var(a:buffer, 'c_gcc_options') . ' -'
endfunction