packages: vim-syntax-spec/spec.vim - added cluster specLimitedVisibility - ...

sparky sparky at pld-linux.org
Sun Feb 7 19:08:27 CET 2010


Author: sparky                       Date: Sun Feb  7 18:08:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added cluster specLimitedVisibility - list of identifiers which must never
  be matched by ALL(BUT)

---- Files affected:
packages/vim-syntax-spec:
   spec.vim (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: packages/vim-syntax-spec/spec.vim
diff -u packages/vim-syntax-spec/spec.vim:1.102 packages/vim-syntax-spec/spec.vim:1.103
--- packages/vim-syntax-spec/spec.vim:1.102	Sun Feb  7 18:44:57 2010
+++ packages/vim-syntax-spec/spec.vim	Sun Feb  7 19:08:22 2010
@@ -19,6 +19,8 @@
 
 syn sync minlines=1000
 
+syn cluster specLimitedVisibility contains=specConfOpts,specConfOptsBcond,specConfOptsName,specDescriptionLimit
+
 syn match specSpecialChar contained '[][!$()\\|>^;:]'
 syn match specColon       contained ':'
 syn match specPercent     contained '%'
@@ -36,8 +38,8 @@
 syn match specConfOpts contained '{\@<=__without' nextgroup=specConfOptsBcond
 syn match specConfOpts contained '{\@<=__enable\(_disable\)\?' nextgroup=specConfOptsBcond
 syn match specConfOpts contained '{\@<=__disable' nextgroup=specConfOptsBcond
-syn match specConfOptsBcond '\s\+[a-zA-Z0-9_]\+' nextgroup=specConfOptsName
-syn match specConfOptsName '\s\+[a-zA-Z0-9_-]\+'
+syn match specConfOptsBcond contained '\s\+[a-zA-Z0-9_]\+' nextgroup=specConfOptsName
+syn match specConfOptsName contained '\s\+[a-zA-Z0-9_-]\+'
 
 syn match specSpecialVariables contained '\$[0-9]\|\${[0-9]}'
 syn match specCommandOpts      contained '\(\s\|:\)\@<=\(-\w\+\|--\w[a-zA-Z0-9_-]\+\)'
@@ -144,7 +146,7 @@
 " tip: remember do include new items on specScriptArea's skip section
 syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(\(un\)\?define\|dump\|trace\|patch\d*\|setup\|configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\|cmake\|scons\|waf\|bcond_with\(out\)\?\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier,specSectionMacroBcondArea
 syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\|cmake\|scons\|waf\)}' end='$' contains=specCommandOpts,specMacroIdentifier
-syn region specSectionMacroBcondArea oneline matchgroup=specBlock start='%{!\??\(with\(out\)\?_[a-zA-Z0-9_]\+\|debug\):' skip='\\}' end='}' contains=ALL
+syn region specSectionMacroBcondArea oneline matchgroup=specBlock start='%{!\??\(with\(out\)\?_[a-zA-Z0-9_]\+\|debug\):' skip='\\}' end='}' contains=ALLBUT, at specLimitedVisibility
 
 " %% Files Section %%
 " TODO %config valid parameters: missingok\|noreplace
@@ -170,7 +172,7 @@
 syn match specPreAmbleCharset         contained '([a-z_A-Z]\+\(\.UTF-8\)\?):'
 
 " limit description width to 70 columns
-syn match specDescriptionLimit '\%>70v.\+'
+syn match specDescriptionLimit contained '\%>70v.\+'
 
 " %% PreAmble Section %%
 " Copyright and Serial were deprecated by License and Epoch
@@ -220,14 +222,13 @@
 syn region shQuote2 contained matchgroup=shQuoteDelim start=+"+ skip=+\\"+ end=+"+ contains=specVariables,specMacroIdentifier,specSectionMacroBcondArea
 
 syn match shOperator contained '[><|!&;]\|[!=]='
-syn region shDo transparent matchgroup=specBlock start="\(^\|\s\)do\(\s\|$\)" end="\(^\|\s\)done\(\s\|$\)" contains=ALLBUT,shDoError,shCase,specPreAmble, at specListedFiles
-syn region shIf transparent matchgroup=specBlock start="\(^\|\s\)if\(\s\|$\)" end="\(^\|\s\)fi\(\s\|$\)" contains=ALLBUT,shIfError,shCase, at specListedFiles
-
-syn region shFor  matchgroup=specBlock start="\(^\|\s\)for\(\s\|$\)" end="\(^\|\s\)in\(\s\|$\)" contains=ALLBUT,shInError,shCase, at specListedFiles
-
-syn region shCaseEsac transparent matchgroup=specBlock start="\(^\|\s\)case\(\s\|$\)" matchgroup=NONE end="\(^\|\s\)in\(\s\|$\)"me=s-1 contains=ALLBUT, at specListedFiles nextgroup=shCaseEsac
-syn region shCaseEsac matchgroup=specBlock start="\(^\|\s\)in\(\s\|$\)" end="\(^\|\s\)esac\(\s\|$\)" contains=ALLBUT, at specListedFilesBin
-syn region shCase matchgroup=specBlock contained start=")"  end=";;" contains=ALLBUT,shCase, at specListedFiles
+syn region shDo transparent matchgroup=specBlock start="\(^\|\s\)do\(\s\|$\)" end="\(^\|\s\)done\(\s\|$\)" contains=ALLBUT,shDoError,shCase,specPreAmble, at specListedFiles, at specLimitedVisibility
+syn region shIf transparent matchgroup=specBlock start="\(^\|\s\)if\(\s\|$\)" end="\(^\|\s\)fi\(\s\|$\)" contains=ALLBUT,shIfError,shCase, at specListedFiles, at specLimitedVisibility
+syn region shFor  matchgroup=specBlock start="\(^\|\s\)for\(\s\|$\)" end="\(^\|\s\)in\(\s\|$\)" contains=ALLBUT,shInError,shCase, at specListedFiles, at specLimitedVisibility
+
+syn region shCaseEsac transparent matchgroup=specBlock start="\(^\|\s\)case\(\s\|$\)" matchgroup=NONE end="\(^\|\s\)in\(\s\|$\)"me=s-1 contains=ALLBUT, at specListedFiles, at specLimitedVisibility nextgroup=shCaseEsac
+syn region shCaseEsac matchgroup=specBlock start="\(^\|\s\)in\(\s\|$\)" end="\(^\|\s\)esac\(\s\|$\)" contains=ALLBUT, at specListedFilesBin, at specLimitedVisibility
+syn region shCase matchgroup=specBlock contained start=")"  end=";;" contains=ALLBUT,shCase, at specListedFiles, at specLimitedVisibility
 
 syn sync match shDoSync       grouphere  shDo       "\<do\>"
 syn sync match shDoSync       groupthere shDo       "\<done\>"
@@ -238,7 +239,7 @@
 syn sync match shCaseEsacSync grouphere  shCaseEsac "\<case\>"
 syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
 
-syn region specIf  matchgroup=specBlock start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|ifdef\|ifndef\|%if\|%else"  end='%endif' contains=ALLBUT, specOutSkip, specOut2
+syn region specIf  matchgroup=specBlock start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|ifdef\|ifndef\|%if\|%else"  end='%endif' contains=ALLBUT,specOutSkip,specOut2, at specLimitedVisibility
 
 " %if 0 handing
 if exists("spec_if0")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim-syntax-spec/spec.vim?r1=1.102&r2=1.103&f=u



More information about the pld-cvs-commit mailing list