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

@@ -24,42 +24,42 @@ endfunction
function! ale#c#ParseCFlags(project_root, stdout_make) abort
let l:cflags_list = []
let l:cflags = split(a:stdout_make, " ")
let l:cflags = split(a:stdout_make)
let l:shell_option = 0
let l:macro_option = 0
let l:previous_option = ''
for l:option in l:cflags
" Check if cflag contained spaces
if l:shell_option || stridx(l:option, "=`") >= 0
if l:shell_option || stridx(l:option, '=`') >= 0
" Cflag contained shell command with spaces (ex. -D='date +%s')
let l:shell_option = 1
let l:previous_option .= l:option . ' '
if l:option[-1: -1] != "`"
if l:option[-1: -1] isnot? '`'
continue
endif
let l:shell_option = 0
elseif l:macro_option || stridx(l:option, "$((") > 0
elseif l:macro_option || stridx(l:option, '$((') > 0
" Cflag contained macro with spaces (ex -Da=$(( 4 * 20 )))
let l:macro_option = 1
let l:previous_option .= l:option . ' '
if stridx(l:option, "))") < 0
if stridx(l:option, '))') < 0
continue
endif
let l:macro_option = 0
endif
if l:previous_option != ''
if l:previous_option isnot? ''
let l:option = l:previous_option
let l:previous_option = ''
endif
" Fix relative paths if needed
if stridx(l:option, "-I") >= 0
if stridx(l:option, "-I/") < 0
if stridx(l:option, '-I') >= 0
if stridx(l:option, '-I' . s:sep) < 0
let l:option = '-I' . a:project_root . s:sep . l:option[2:]
endif
endif
" Parse the cflag
if stridx(l:option, "-I") >= 0 ||
\ stridx(l:option, "-D") >= 0
if stridx(l:option, '-I') >= 0 ||
\ stridx(l:option, '-D') >= 0
if index(l:cflags_list, l:option) < 0
call add(l:cflags_list, l:option)
endif
@@ -74,12 +74,12 @@ function! ale#c#ParseMakefile(buffer) abort
if !empty(l:project_root)
if !empty(globpath(l:project_root, 'Makefile', 0))
let stdout_make = system('cd '. l:project_root . ' && make -n')
for l:object in split(l:stdout_make, '\n')
if stridx(l:object, expand("%t"))
return ale#c#ParseCFlags(l:project_root, l:object)
endif
endfor
let l:stdout_make = system('cd '. l:project_root . ' && make -n')
for l:object in split(l:stdout_make, '\n')
if stridx(l:object, expand('#' . a:buffer . '...'))
return ale#c#ParseCFlags(l:project_root, l:object)
endif
endfor
endif
endif
return []