PC-Lint: cleanup.

lcd047 · lcd047 · commit d751d17ef137 · 2014-09-18T08:35:43.000+03:00
diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:syntastic_start
 endif
 
-let g:syntastic_version = '3.5.0-17'
+let g:syntastic_version = '3.5.0-21'
 lockvar g:syntastic_version
 
 " Sanity checks {{{1
diff --git a/syntax_checkers/c/pc_lint.vim b/syntax_checkers/c/pc_lint.vim
@@ -9,10 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-"" To use a lint option file, rename it to options.lnt and put it in
-"" the same directory as the file you're linting, or any parent directory
-"" of that file. Syntastic will use the first options.lnt file it finds.
 
 if exists("g:loaded_syntastic_c_pc_lint_checker")
     finish
@@ -26,40 +22,30 @@ if !exists('g:syntastic_pc_lint_config_file')
     let g:syntastic_pc_lint_config_file = 'options.lnt'
 endif
 
-" stolen from c.vim in syntastic
-function! s:getOptionFile(file)
-    " search in the current file's directory upwards
-    let config = findfile(a:file, '.;')
-    if config == '' || !filereadable(config)
-        return ''
-    endif
-    " convert filename into absolute path filename
-    return fnamemodify(config, ':p')
-endfunction
-
 function! SyntaxCheckers_c_pc_lint_GetLocList() dict
+    let config = findfile(g:syntastic_pc_lint_config_file, '.;')
 
-    " -hF1 always shows the filename, tries to make message 1 line
-    " -width(0,0) makes sure there's no line breaks
+    " -hF1          - show filename, try to make message 1 line
+    " -width(0,0)   - make sure there are no line breaks
     let makeprg = self.makeprgBuild({
-                \   "args": syntastic#util#shescape(
-                \   s:getOptionFile(g:syntastic_pc_lint_config_file)) . ' -hF1 ' .
-                \   syntastic#util#shescape('-width(0,0)')})
+        \ 'args': (filereadable(config) ? syntastic#util#shescape(fnamemodify(config, ':p')) : ''),
+        \ 'args_after': ['-hF1', '-width(0,0)'] })
 
     let errorformat =
-                \   '%f  %l  %trror %n: %m,' .
-                \   '%f  %l  %tarning %n: %m,' .
-                \   '%W%f  %l  Info %n: %m'
+        \ '%E%f  %l  Error %n: %m,' .
+        \ '%W%f  %l  Warning %n: %m,' .
+        \ '%W%f  %l  Info %n: %m,' .
+        \ '%-G%.%#'
 
     return SyntasticMake({
-                \   'makeprg': makeprg,
-                \   'errorformat': errorformat })
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
-            \   'filetype': 'c',
-            \   'name': 'pc_lint',
-            \   'exec': 'lint-nt'})
+    \ 'filetype': 'c',
+    \ 'name': 'pc_lint',
+    \ 'exec': 'lint-nt'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/syntax_checkers/cpp/pc_lint.vim b/syntax_checkers/cpp/pc_lint.vim
@@ -0,0 +1,26 @@
+"============================================================================
+"File:        pc_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Bragg <steve at empresseffects dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_cpp_pc_lint_checker")
+    finish
+endif
+let g:loaded_syntastic_cpp_pc_lint_checker = 1
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'pc_lint',
+    \ 'exec': 'lint-nt',
+    \ 'redirect': 'c/pc_lint'})
+
+" vim: set et sts=4 sw=4:
