Merge branch 'master' of git://github.com/scrooloose/syntastic

syntax_checkers/c.vim

@@ -84,9 +84,9 @@ endfunction
 function! SyntaxCheckers_c_GetLocList()
     let makeprg = 'gcc -fsyntax-only '.shellescape(expand('%')).' -I. -I..'
     let errorformat = '%-G%f:%s:,%-G%f:%l: %#error: %#(Each undeclared '.
-                \ 'identifier is reported only%.%#,%-G%f:%l: %#error: %#for '.
-                \ 'each function it appears%.%#,%-GIn file included%.%#,'.
-                \ '%-G %#from %f:%l\,,%f:%l: %trror: %m,%f:%l: %m'
+               \ 'identifier is reported only%.%#,%-G%f:%l: %#error: %#for '.
+               \ 'each function it appears%.%#,%-GIn file included%.%#,'.
+               \ '%-G %#from %f:%l\,,%f:%l:%c: %m,%f:%l: %trror: %m,%f:%l: %m'
 
     if expand('%') =~? '.h$'
         if exists('g:syntastic_c_check_header')

syntax_checkers/cuda.vim

@@ -0,0 +1,40 @@
+"============================================================================
+"File:        cuda.vim
+"Description: Syntax checking plugin for syntastic.vim
+"
+"Author:      Hannes Schulz <schulz at ais dot uni-bonn dot de>
+"
+"============================================================================
+
+" in order to also check header files add this to your .vimrc:
+" (this creates an empty .syntastic_dummy.cu file in your source directory)
+"
+"   let g:syntastic_cuda_check_header = 1
+
+if exists('loaded_cuda_syntax_checker')
+    finish
+endif
+let loaded_cuda_syntax_checker = 1
+
+if !exists('g:syntastic_nvcc_binary')
+	let g:syntastic_nvcc_binary = '/usr/local/cuda/bin/nvcc'
+endif
+if !executable('/usr/local/cuda/bin/nvcc')
+    finish
+endif
+
+function! SyntaxCheckers_cuda_GetLocList()
+    let makeprg = g:syntastic_nvcc_binary.' --cuda -O0 -I . -Xcompiler -fsyntax-only '.shellescape(expand('%')).' -o /dev/null'
+    "let errorformat =  '%-G%f:%s:,%f:%l:%c: %m,%f:%l: %m'
+    let errorformat =  '%*[^"]"%f"%*\D%l: %m,"%f"%*\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,"%f"\, line %l%*\D%c%*[^ ] %m,%D%*\a[%*\d]: Entering directory `%f'',%X%*\a[%*\d]: Leaving directory `%f'',%D%*\a: Entering directory `%f'',%X%*\a: Leaving directory `%f'',%DMaking %*\a in %f,%f|%l| %m'
+
+    if expand('%') =~? '\%(.h\|.hpp\|.cuh\)$'
+        if exists('g:syntastic_cuda_check_header')
+            let makeprg = 'echo > .syntastic_dummy.cu ; '.g:syntastic_nvcc_binary.' --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include '.shellescape(expand('%')).' -o /dev/null'
+        else
+            return []
+        endif
+    endif
+
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction

syntax_checkers/sass.vim

@@ -19,13 +19,16 @@ if !executable("sass")
     finish
 endif
 
-"use compass imports if available
-let g:syntastic_sass_imports = ""
-if executable("compass")
-    let g:syntastic_sass_imports = system("compass imports")
-endif
+let g:syntastic_sass_imports = 0
 
 function! SyntaxCheckers_sass_GetLocList()
+    "use compass imports if available
+    if g:syntastic_sass_imports == 0 && executable("compass")
+        let g:syntastic_sass_imports = system("compass imports")
+    else
+        let g:syntastic_sass_imports = ""
+    endif
+
     let makeprg='sass '.g:syntastic_sass_imports.' --check '.shellescape(expand('%'))
     let errorformat = '%ESyntax %trror:%m,%C        on line %l of %f,%Z%m'
     let errorformat .= ',%Wwarning on line %l:,%Z%m,Syntax %trror on line %l: %m'