From 83e910720d0bbe94d235c215717f497fbe427509 Mon Sep 17 00:00:00 2001
From: LCD 47 <lcd047@gmail.com>
Date: Sun, 31 Jul 2016 19:11:17 +0300
Subject: [PATCH] Checker avr-gcc for C++: cleanup.

---
 doc/syntastic-checkers.txt     |  4 ++--
 plugin/syntastic.vim           |  2 +-
 syntax_checkers/c/avrgcc.vim   |  6 ++++--
 syntax_checkers/cpp/avrgcc.vim | 36 +++-------------------------------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/doc/syntastic-checkers.txt b/doc/syntastic-checkers.txt
index 7fcb62b1..19974054 100644
--- a/doc/syntastic-checkers.txt
+++ b/doc/syntastic-checkers.txt
@@ -526,7 +526,7 @@ accepts the standard options described at |syntastic-config-makeprg|.
 
 Additionally:
 
-                                              *g:syntastic_avrgcc_config_file*
+                                            *'g:syntastic_avrgcc_config_file'*
 Type: string
 Default: ".syntastic_avrgcc_config"
 File containing compilation flags (such as defines or include directories),
@@ -950,7 +950,7 @@ accepts the standard options described at |syntastic-config-makeprg|.
 
 Additionally:
 
-                                              *g:syntastic_avrgcc_config_file*
+                                            'g:syntastic_avrgcc_config_file'
 Type: string
 Default: ".syntastic_avrgcc_config"
 File containing compilation flags (such as defines or include directories),
diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
index 6cdf9224..82ee90e9 100644
--- 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.7.0-168'
+let g:_SYNTASTIC_VERSION = '3.7.0-174'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
diff --git a/syntax_checkers/c/avrgcc.vim b/syntax_checkers/c/avrgcc.vim
index 0fbb9840..a4124975 100644
--- a/syntax_checkers/c/avrgcc.vim
+++ b/syntax_checkers/c/avrgcc.vim
@@ -1,6 +1,6 @@
 "============================================================================
 "File:        avrgcc.vim
-"Description: Syntax checking plugin for syntastic.vim
+"Description: Syntax checking plugin for syntastic
 "Maintainer:  Karel <karelishere at gmail dot com>
 "License:     This program is free software. It comes without any warranty,
 "             to the extent permitted by applicable law. You can redistribute
@@ -22,10 +22,12 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+let s:opt_x = { 'c': 'c', 'cpp': 'c++' }
+
 function! SyntaxCheckers_c_avrgcc_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args_before': syntastic#c#ReadConfig(g:syntastic_avrgcc_config_file),
-        \ 'args_after': '-x c -fsyntax-only' })
+        \ 'args_after': '-x ' . get(s:opt_x, self.getFiletype(), '')  . ' -fsyntax-only' })
 
     let errorformat =
         \ '%-G%f:%s:,' .
diff --git a/syntax_checkers/cpp/avrgcc.vim b/syntax_checkers/cpp/avrgcc.vim
index 64c6ad1a..6e8fa7b1 100644
--- a/syntax_checkers/cpp/avrgcc.vim
+++ b/syntax_checkers/cpp/avrgcc.vim
@@ -1,6 +1,6 @@
 "============================================================================
 "File:        avrgcc.vim
-"Description: Syntax checking plugin for syntastic.vim
+"Description: Syntax checking plugin for syntastic
 "Maintainer:  Sławek Piotrowski <sentinel at atteo dot com>
 "License:     This program is free software. It comes without any warranty,
 "             to the extent permitted by applicable law. You can redistribute
@@ -15,41 +15,11 @@ if exists('g:loaded_syntastic_cpp_avrgcc_checker')
 endif
 let g:loaded_syntastic_cpp_avrgcc_checker = 1
 
-if !exists('g:syntastic_avrgcc_config_file')
-    let g:syntastic_avrgcc_config_file = '.syntastic_avrgcc_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_avrgcc_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': syntastic#c#ReadConfig(g:syntastic_avrgcc_config_file),
-        \ 'args_after': '-x c++ -fsyntax-only' })
-
-    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:%c: %trror: %m,' .
-        \ '%f:%l:%c: %tarning: %m,' .
-        \ '%f:%l:%c: %m,' .
-        \ '%f:%l: %trror: %m,' .
-        \ '%f:%l: %tarning: %m,'.
-        \ '%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'avrgcc',
-    \ 'exec': 'avr-g++'})
+    \ 'exec': 'avr-g++',
+    \ 'redirect': 'c/avrgcc'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo