Cleanup the glsl/cgc checker.

lcd047 · lcd047 · commit c73855dff5fa · 2014-01-03T09:54:10.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -28,7 +28,7 @@ execute their script to find them.
 At the time of this writing, syntax checking plugins exist for ActionScript,
 Ada, AppleScript, AsciiDoc, Bourne shell, C, C++, C#, Chef, CoffeeScript,
 Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir, Erlang, eRuby,
-Fortran, Gentoo metadata, Go, Haml, Haskell, Haxe, Handlebars, HSS, HTML,
+Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe, Handlebars, HSS, HTML,
 Java, JavaScript, JSON, LESS, Lex, Limbo, LISP, LLVM intermediate language,
 Lua, MATLAB, NASM, Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP,
 gettext Portable Object, Puppet, Python, Racket, reStructuredText, Ruby, Rust,
diff --git a/syntax_checkers/glsl/cgc.vim b/syntax_checkers/glsl/cgc.vim
@@ -2,13 +2,6 @@
 "File:        glsl.vim
 "Description: Syntax checker for OpenGL Shading Language
 "Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
-"Notes:       Add the special comment line "// profile: " somewhere in the file
-"             Followed by what profile to use for the cgc compiler when
-"             checking the file. The defalt behavior is to pick the profile
-"             based on the entries of dictionary g:syntastic_glsl_extensions
-"             or a default dictionary if that variable does not exist
-"             Use the variable g:syntastic_glsl_extra_args to specify extra
-"             arguments to pass to the cgc compiler
 "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
@@ -17,62 +10,28 @@
 "
 "============================================================================
 
-
 if exists("g:loaded_syntastic_glsl_cgc_checker")
     finish
 endif
 
-let g:loaded_syntastic_glsl_cgc_checker=1
-
-function! SyntaxCheckers_glsl_cgc_checker_IsAvailable() dict
-    return executable(self.getExec());
-endfunction
-
-function! SyntaxCheckers_glsl_cgc_checker_GetProfile()
-    let magic = '^// profile: '
-    let line = search( magic, 'n' )
-
-    if line
-        let profile = substitute( getline(line), magic, '', '' ) 
-        return profile
-    endif
-
-    if exists('g:syntastic_glsl_extensions')
-        let profiles = g:syntastic_glsl_cgc_profiles
-    else
-        let profiles = {
-            \ 'glslf': 'gpu_fp',
-            \ 'glslv': 'gpu_vp',
-            \ 'frag':  'gpu_fp',
-            \ 'vert':  'gpu_vp',
-            \ 'fp':    'gpu_fp',
-            \ 'vp':    'gpu_vp' }
-    endif
-
+let g:loaded_syntastic_glsl_cgc_checker = 1
 
-    let ext = expand('%:e')
-
-    if has_key(profiles, ext)
-        return profiles[ext]
-    else
-        return 'gpu_vert'
-    endif
-endfunction!
+let s:glsl_extensions = {
+        \ 'glslf': 'gpu_fp',
+        \ 'glslv': 'gpu_vp',
+        \ 'frag':  'gpu_fp',
+        \ 'vert':  'gpu_vp',
+        \ 'fp':    'gpu_fp',
+        \ 'vp':    'gpu_vp'
+    \ }
 
-function! SyntaxCheckers_glsl_cgc_GetExtraArgs()
-    if exists('g:syntastic_glsl_extra_args')
-        return g:syntastic_glsl_extra_args
-    else
-        return ''
-    endif
-endfunction
+let s:save_cpo = &cpo
+set cpo&vim
 
 function! SyntaxCheckers_glsl_cgc_GetLocList() dict
-    let profile = SyntaxCheckers_glsl_cgc_checker_GetProfile()
-
-    let args = printf("-oglsl -profile %s %s", profile,SyntaxCheckers_glsl_cgc_GetExtraArgs())
     let makeprg = self.makeprgBuild({
-        \'args': args })
+        \ 'args': '-oglsl -profile ' . s:GetProfile() .
+        \       (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
 
     let errorformat =
         \ "%E%f(%l) : error %m," .
@@ -83,6 +42,27 @@ function! SyntaxCheckers_glsl_cgc_GetLocList() dict
         \ 'errorformat': errorformat })
 endfunction
 
+function! s:GetProfile()
+    let save_cursor = getpos('.')
+    let magic = '\m\C^// profile:\s*'
+    let line = search(magic, 'c')
+    call setpos('.', save_cursor)
+
+    if line
+        let profile = matchstr(getline(line), magic . '\zs.*')
+    else
+        let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
+        let profile = get(extensions, tolower(expand('%:e')), 'gpu_vert')
+    endif
+
+    return profile
+endfunction!
+
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \'filetype': 'glsl',
     \'name': 'cgc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
