From 1473b7dcdb6d4b435b19a6269ebaf2f9979ca687 Mon Sep 17 00:00:00 2001
From: kongo2002 <kongo2002@googlemail.com>
Date: Tue, 19 Oct 2010 03:14:49 +0800
Subject: [PATCH] c syntax_checker: major performance improvements

---
 syntax_checkers/c.vim | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/syntax_checkers/c.vim b/syntax_checkers/c.vim
index b2eb3596..2fba821e 100644
--- a/syntax_checkers/c.vim
+++ b/syntax_checkers/c.vim
@@ -98,10 +98,10 @@ function! SyntaxCheckers_c_GetLocList()
                     \ g:syntastic_c_no_include_search != 1
             if exists('g:syntastic_c_auto_refresh_includes') &&
                         \ g:syntastic_c_auto_refresh_includes != 0
-                let makeprg .= s:SearchHeaders(s:handlers)
+                let makeprg .= s:SearchHeaders()
             else
                 if !exists('b:syntastic_c_includes')
-                    let b:syntastic_c_includes = s:SearchHeaders(s:handlers)
+                    let b:syntastic_c_includes = s:SearchHeaders()
                 endif
                 let makeprg .= b:syntastic_c_includes
             endif
@@ -115,20 +115,24 @@ endfunction
 
 " search the first 100 lines for include statements that are
 " given in the s:handlers dictionary
-function! s:SearchHeaders(handlers)
+function! s:SearchHeaders()
     let includes = ''
-    let l:handlers = copy(a:handlers)
     let files = []
+    let found = []
+    let lines = filter(getline(1, 100), 'v:val =~# "#\s*include"')
 
     " search current buffer
-    for i in range(100)
-        for handler in l:handlers
-            let line = getline(i)
-            if line =~# '^#include.*' . handler["regex"]
+    for line in lines
+        let file = matchstr(line, '"\zs\S\+\ze"')
+        if file != ''
+            call add(files, file)
+            continue
+        endif
+        for handler in s:handlers
+            if line =~# handler["regex"]
                 let includes .= call(handler["func"], handler["args"])
-                call remove(l:handlers, index(l:handlers, handler))
-            elseif line =~# '^#include\s\+"\S\+"'
-                call add(files, matchstr(line, '^#include\s\+"\zs\S\+\ze"'))
+                call add(found, handler["regex"])
+                break
             endif
         endfor
     endfor
@@ -143,11 +147,16 @@ function! s:SearchHeaders(handlers)
             catch /E484/
                 continue
             endtry
-            for line in lines
-                for handler in l:handlers
-                    if line =~# '^#include.*' . handler["regex"]
+            let lines = filter(lines, 'v:val =~# "#\s*include"')
+            for handler in s:handlers
+                if index(found, handler["regex"]) != -1
+                    continue
+                endif
+                for line in lines
+                    if line =~# handler["regex"]
                         let includes .= call(handler["func"], handler["args"])
-                        call remove(l:handlers, index(l:handlers, handler))
+                        call add(found, handler["regex"])
+                        break
                     endif
                 endfor
             endfor