[101993] contrib/mpvim/syntax/portfile.vim
larryv at macports.org
larryv at macports.org
Wed Jan 23 18:26:24 PST 2013
Revision: 101993
https://trac.macports.org/changeset/101993
Author: larryv at macports.org
Date: 2013-01-23 18:26:24 -0800 (Wed, 23 Jan 2013)
Log Message:
-----------
mpvim syntax: Use non-capturing groups throughout; simplify "{build,destroot}.{pre,post}_args" matches.
Modified Paths:
--------------
contrib/mpvim/syntax/portfile.vim
Modified: contrib/mpvim/syntax/portfile.vim
===================================================================
--- contrib/mpvim/syntax/portfile.vim 2013-01-24 02:13:09 UTC (rev 101992)
+++ contrib/mpvim/syntax/portfile.vim 2013-01-24 02:26:24 UTC (rev 101993)
@@ -27,12 +27,12 @@
setlocal iskeyword+=-
syn match PortfileGroup "{.\+}" contained
-syn match PortfileYesNo "\(yes\|no\)" contained
+syn match PortfileYesNo "\%(yes\|no\)" contained
syn keyword PortfileRequired PortSystem name version maintainers
syn keyword PortfileRequired homepage master_sites platforms
syn match PortfileRequired "^categories\%(-append\|-delete\)\?"
-syn match PortfileRequired "^\(long_\)\?description" nextgroup=PortfileDescription skipwhite
+syn match PortfileRequired "^\%(long_\)\?description" nextgroup=PortfileDescription skipwhite
syn region PortfileDescription matchgroup=Normal start="" skip="\\$" end="$" contained
syn keyword PortfileOptional PortGroup epoch revision worksrcdir distname
@@ -40,56 +40,56 @@
syn match PortfileOptional "distfiles\%(-append\|-delete\)\?"
syn keyword PortfileOptional replaced_by supported_archs
-syn match PortfileOptional "checksums\(-append\|-delete\)\?" nextgroup=PortfileChecksums skipwhite
+syn match PortfileOptional "checksums\%(-append\|-delete\)\?" nextgroup=PortfileChecksums skipwhite
syn region PortfileChecksums matchgroup=Normal start="" skip="\\$" end="$" contained contains=PortfileChecksumsType
syn keyword PortfileChecksumsType md5 sha1 rmd160 sha256 contained
-syn match PortfilePhases "\(pre-\|post-\)\?\(fetch\|checksum\|extract\|patch\|configure\|build\|test\|destroot\|archive\|install\|activate\)\s" contains=PortfilePrePost
+syn match PortfilePhases "\%(pre-\|post-\)\?\%(fetch\|checksum\|extract\|patch\|configure\|build\|test\|destroot\|archive\|install\|activate\)\s" contains=PortfilePrePost
" Fetch phase options
-syn match PortfilePhasesFetch "fetch\.\(type\|user\|password\|use_epsv\|ignore_sslcert\)"
-syn match PortfilePhasesFetch "cvs\.\(root\|password\|tag\|date\|module\)"
-syn match PortfilePhasesFetch "svn\.\(url\|revision\)"
-syn match PortfilePhasesFetch "git\.\(url\|branch\)"
-syn match PortfilePhasesFetch "hg\.\(url\|tag\)"
+syn match PortfilePhasesFetch "fetch\.\%(type\|user\|password\|use_epsv\|ignore_sslcert\)"
+syn match PortfilePhasesFetch "cvs\.\%(root\|password\|tag\|date\|module\)"
+syn match PortfilePhasesFetch "svn\.\%(url\|revision\)"
+syn match PortfilePhasesFetch "git\.\%(url\|branch\)"
+syn match PortfilePhasesFetch "hg\.\%(url\|tag\)"
" Extract phase options
-syn match PortfilePhasesExtract "extract\.\(suffix\|mkdir\|cmd\|only\(-append\|-delete\)\?\)"
-syn match PortfilePhasesExtract "use_\(7z\|bzip2\|lzma\|zip\|xz\)" nextgroup=PortfileYesNo skipwhite
+syn match PortfilePhasesExtract "extract\.\%(suffix\|mkdir\|cmd\|only\%(-append\|-delete\)\?\)"
+syn match PortfilePhasesExtract "use_\%(7z\|bzip2\|lzma\|zip\|xz\)" nextgroup=PortfileYesNo skipwhite
" Patch phase options
-syn match PortfilePhasesPatch "patch\.\(dir\|cmd\|args\(-append\|-delete\)\?\)"
-syn match PortfilePhasesPatch "patchfiles\(-append\|-delete\)\?"
+syn match PortfilePhasesPatch "patch\.\%(dir\|cmd\|args\%(-append\|-delete\)\?\)"
+syn match PortfilePhasesPatch "patchfiles\%(-append\|-delete\)\?"
" Configure phase options
syn keyword PortfilePhasesConf use_configure nextgroup=PortfileYesNo skipwhite
-syn match PortfilePhasesConf "configure\.\(env\|\(c\|ld\|cpp\|cxx\|objc\|f\|fc\|f90\)flags\)\(-append\|-delete\)\?"
-syn match PortfilePhasesConf "configure\.\(pre_\|post_\)\?args\(-append\|-delete\)\?" nextgroup=PortfileConfEntries skipwhite
+syn match PortfilePhasesConf "configure\.\%(env\|\%(c\|ld\|cpp\|cxx\|objc\|f\|fc\|f90\)flags\)\%(-append\|-delete\)\?"
+syn match PortfilePhasesConf "configure\.\%(pre_\|post_\)\?args\%(-append\|-delete\)\?" nextgroup=PortfileConfEntries skipwhite
syn region PortfileConfEntries matchgroup=Normal start="" skip="\\$" end="$" contained
-syn match PortfilePhasesConf "configure\.\(cc\|cpp\|cxx\|objc\|fc\|f77\|f90\|javac\|compiler\)"
-syn match PortfilePhasesConf "configure\.\(perl\|python\|ruby\|install\|awk\|bison\)"
-syn match PortfilePhasesConf "configure\.\(pkg_config\(_path\)\?\)"
-syn match PortfilePhasesConf "configure.universal_\(args\|\(c\|cpp\|cxx\|ld\)flags\)"
-syn match PortfilePhasesConf "compiler\.\(blacklist\|whitelist\|fallback\)"
+syn match PortfilePhasesConf "configure\.\%(cc\|cpp\|cxx\|objc\|fc\|f77\|f90\|javac\|compiler\)"
+syn match PortfilePhasesConf "configure\.\%(perl\|python\|ruby\|install\|awk\|bison\)"
+syn match PortfilePhasesConf "configure\.\%(pkg_config\%(_path\)\?\)"
+syn match PortfilePhasesConf "configure.universal_\%(args\|\%(c\|cpp\|cxx\|ld\)flags\)"
+syn match PortfilePhasesConf "compiler\.\%(blacklist\|whitelist\|fallback\)"
" Automake and Autoconf
-syn match PortfilePhasesAA "use_auto\(make\|\(re\)\?conf\)" nextgroup=PortfileYesNo skipwhite
-syn match PortfilePhasesAA "auto\(make\|\(re\)\?conf\).\(env\|args\|dir\)"
+syn match PortfilePhasesAA "use_auto\%(make\|\%(re\)\?conf\)" nextgroup=PortfileYesNo skipwhite
+syn match PortfilePhasesAA "auto\%(make\|\%(re\)\?conf\).\%(env\|args\|dir\)"
" Build phase options
-syn match PortfilePhasesBuild "build\.\(cmd\|type\|dir\)"
-syn match PortfilePhasesBuild "build\.\(\(pre\|post\)_\)\?args"
-syn match PortfilePhasesBuild "build\.\(target\|env\)\(-append\|-delete\)\?"
+syn match PortfilePhasesBuild "build\.\%(cmd\|type\|dir\)"
+syn match PortfilePhasesBuild "build\.\%(pre_\|post_\)\?args"
+syn match PortfilePhasesBuild "build\.\%(target\|env\)\%(-append\|-delete\)\?"
syn keyword PortfilePhasesBuild use_parallel_build nextgroup=PortfileYesNo skipwhite
" Test phase options
-syn match PortfilePhasesTest "test\.\(run\|cmd\|target\)"
-syn match PortfilePhasesTest "test\.env\(-append\|-delete\)\?"
+syn match PortfilePhasesTest "test\.\%(run\|cmd\|target\)"
+syn match PortfilePhasesTest "test\.env\%(-append\|-delete\)\?"
" Test destroot options
-syn match PortfilePhasesDest "destroot\.\(cmd\|type\|dir\|destdir\|umask\|keepdirs\|violate_mtree\)"
-syn match PortfilePhasesDest "destroot\.\(\(pre\|post\)_\)\?args"
-syn match PortfilePhasesDest "destroot\.target\(-append\|-delete\)\?"
+syn match PortfilePhasesDest "destroot\.\%(cmd\|type\|dir\|destdir\|umask\|keepdirs\|violate_mtree\)"
+syn match PortfilePhasesDest "destroot\.\%(pre_\|post_\)\?args"
+syn match PortfilePhasesDest "destroot\.target\%(-append\|-delete\)\?"
" Variants
syn region PortfileVariant matchgroup=Keyword start="^variant" skip="\\$" end="$" contains=PortfileVariantName,PortfileVariantRequires,PortfileVariantDescription,PortfileVariantConflicts skipwhite
@@ -98,8 +98,8 @@
syn keyword PortfileVariantDescription description nextgroup=PortfileGroup contained skipwhite
syn match PortfileVariantName "[a-zA-Z0-9_]\+" contained
syn keyword PortfileOptional universal_variant nextgroup=PortfileYesNo skipwhite
-syn match PortfileOptional "default_variants\(-append\|-delete\)\?" nextgroup=PortfileDefaultVariants skipwhite
-syn match PortfileDefaultVariants "\([+\-][a-zA-Z0-9_]\+\s*\)\+" contained
+syn match PortfileOptional "default_variants\%(-append\|-delete\)\?" nextgroup=PortfileDefaultVariants skipwhite
+syn match PortfileDefaultVariants "\%([+\-][a-zA-Z0-9_]\+\s*\)\+" contained
" Platform
syn match PortfilePlatform "platform" nextgroup=PortfilePlatformName skipwhite
@@ -108,18 +108,18 @@
syn match PortfilePlatformArch "[a-z][a-zA-Z0-9_]\+" contained
" Dependencies
-syn match PortfileDepends "depends_\(\(lib\|build\|run\|fetch\|extract\)\(-append\|-delete\)\?\)" nextgroup=PortfileDependsEntries skipwhite
+syn match PortfileDepends "depends_\%(\%(lib\|build\|run\|fetch\|extract\)\%(-append\|-delete\)\?\)" nextgroup=PortfileDependsEntries skipwhite
syn region PortfileDependsEntries matchgroup=Normal start="" skip="\\$" end="$" contains=PortfileDependsEntry contained
-syn match PortfileDependsEntry "\(port\|bin\|path\|lib\):" contained
+syn match PortfileDependsEntry "\%(port\|bin\|path\|lib\):" contained
" StartupItems
-syn match PortfileStartupPid "\(none\|auto\|clean\|manual\)" contained
-syn match PortfileOptional "startupitem\.\(start\|stop\|restart\|init\|executable\|logfile\)"
-syn match PortfileOptional "startupitem\.\(create\|logevents\|netchange\)" nextgroup=PortfileYesNo skipwhite
+syn match PortfileStartupPid "\%(none\|auto\|clean\|manual\)" contained
+syn match PortfileOptional "startupitem\.\%(start\|stop\|restart\|init\|executable\|logfile\)"
+syn match PortfileOptional "startupitem\.\%(create\|logevents\|netchange\)" nextgroup=PortfileYesNo skipwhite
syn match PortfileOptional "startupitem\.pidfile" nextgroup=PortfileStartupPid skipwhite
" Livecheck / Distcheck
-syn match PortfileOptional "livecheck\.\(type\|name\|distname\|version\|url\|regex\|md5\)"
+syn match PortfileOptional "livecheck\.\%(type\|name\|distname\|version\|url\|regex\|md5\)"
syn keyword PortfileOptional distcheck.check
" Notes
@@ -128,7 +128,7 @@
" Port Groups
" App
-syn match PortfileGroups "app\.\(create\|name\|executable\|icon\|short_version_string\|version\|identifier\)"
+syn match PortfileGroups "app\.\%(create\|name\|executable\|icon\|short_version_string\|version\|identifier\)"
" Archcheck
syn match PortfileGroups "archcheck\.files"
@@ -137,35 +137,35 @@
" has no keywords
" crossbinutils
-syn match PortfileGroups "crossbinutils\.\(target\|setup\)"
+syn match PortfileGroups "crossbinutils\.\%(target\|setup\)"
" crossgcc
-syn match PortfileGroups "crossgcc\.\(target\|setup\|setup_libc\)"
+syn match PortfileGroups "crossgcc\.\%(target\|setup\|setup_libc\)"
" github
-syn match PortfileGroups "github\.\(author\|project\|version\|tag_prefix\|homepage\|raw\|master_sites\|tarball_from\|setup\)"
+syn match PortfileGroups "github\.\%(author\|project\|version\|tag_prefix\|homepage\|raw\|master_sites\|tarball_from\|setup\)"
" Gnustep
-syn match PortfileGroups "gnustep\.\(post_flags\|cc\)"
+syn match PortfileGroups "gnustep\.\%(post_flags\|cc\)"
syn keyword PortfileGroups variant_with_docs gnustep_layout
-syn match PortfileGroups "set_\(gnustep_\(make\|env\)\|\(system\|local\)_library\)"
+syn match PortfileGroups "set_\%(gnustep_\%(make\|env\)\|\%(system\|local\)_library\)"
" Haskell
syn keyword PortfileGroups haskell.setup
" hocbinding
-syn match PortfileGroups "hocbinding\.\(framework\|deps\|setup\)"
+syn match PortfileGroups "hocbinding\.\%(framework\|deps\|setup\)"
" hunspelldict
-syn match PortfileGroups "hunspelldict\.\(locale\|setup\)"
+syn match PortfileGroups "hunspelldict\.\%(locale\|setup\)"
" KDE 4, versions 1.0 and 1.1
" have no keywords
" muniversal
-syn match PortfileGroups "merger_configure_\(env\|args\|compiler\|cppflags\|cflags\|cxxflags\|objcflags\|ldflags\)"
-syn match PortfileGroups "merger_build_\(env\|args\)"
-syn match PortfileGroups "merger_\(host\|arch_\(flag\|compiler\)\|destroot_env\|dont_diff\|must_run_binaries\|no_3_archs\)"
+syn match PortfileGroups "merger_configure_\%(env\|args\|compiler\|cppflags\|cflags\|cxxflags\|objcflags\|ldflags\)"
+syn match PortfileGroups "merger_build_\%(env\|args\)"
+syn match PortfileGroups "merger_\%(host\|arch_\%(flag\|compiler\)\|destroot_env\|dont_diff\|must_run_binaries\|no_3_archs\)"
syn match PortfileGroups "universal_archs_supported"
" obsolete
@@ -176,61 +176,61 @@
" has no keywords
" octave
-syn match PortfileGroups "octave\.\(module\|setup\)"
+syn match PortfileGroups "octave\.\%(module\|setup\)"
" PEAR
-syn match PortfileGroups "pear\.\(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-pear\|cmd-phar\|cmd-php\|channel\|packagexml\|package\|packagefile\|setup\)"
+syn match PortfileGroups "pear\.\%(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-pear\|cmd-phar\|cmd-php\|channel\|packagexml\|package\|packagefile\|setup\)"
" Perl5
-syn match PortfileGroups "perl5\.\(setup\|branches\|default_branch\|version\|major\|arch\|bin\|lib\|bindir\|archlib\)"
+syn match PortfileGroups "perl5\.\%(setup\|branches\|default_branch\|version\|major\|arch\|bin\|lib\|bindir\|archlib\)"
" PHP 1.0
-syn match PortfileGroups "php\.\(branch\(es\)\?\|build_dirs\|default_branch\|extension_ini\|extensions\|rootname\|type\|setup\)"
-syn match PortfileGroups "php\.\(config\|extension_dir\|ini\(_dir\)\?\|ize\|suffix\)"
+syn match PortfileGroups "php\.\%(branch\%(es\)\?\|build_dirs\|default_branch\|extension_ini\|extensions\|rootname\|type\|setup\)"
+syn match PortfileGroups "php\.\%(config\|extension_dir\|ini\%(_dir\)\?\|ize\|suffix\)"
" PHP 1.1 (only adding those not already present in 1.0)
-syn match PortfileGroups "php\.\(rootname\|create_subports\|extensions\.zend\|build_dirs\|add_port_code\)"
-syn match PortfileGroups "php\.\(pecl\(_livecheck_stable\)\?\|pecl\.\(name\|prerelease\)\)"
+syn match PortfileGroups "php\.\%(rootname\|create_subports\|extensions\.zend\|build_dirs\|add_port_code\)"
+syn match PortfileGroups "php\.\%(pecl\%(_livecheck_stable\)\?\|pecl\.\%(name\|prerelease\)\)"
" PHP5 extension
-syn match PortfileGroups "php5extension\.\(setup\|build_dirs\|extensions\|extension_dir\|ini\|inidir\|php_ini\|phpize\|type\|source\)"
+syn match PortfileGroups "php5extension\.\%(setup\|build_dirs\|extensions\|extension_dir\|ini\|inidir\|php_ini\|phpize\|type\|source\)"
" PHP5 PEAR
-syn match PortfileGroups "php5pear\.\(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-\(pear\|phar\|php\)\|channel\|packagexml\|package\|packagefile\|setup\)"
+syn match PortfileGroups "php5pear\.\%(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-\%(pear\|phar\|php\)\|channel\|packagexml\|package\|packagefile\|setup\)"
" Pure
syn match PortfileGroups "pure\.setup"
" Python
-syn match PortfileGroups "python\.\(versions\|version\|default_version\|branch\|prefix\|bin\|lib\|libdir\|include\|pkgd\|add_archflags\|set_compiler\|link_binaries\(_suffix\)\?\)"
+syn match PortfileGroups "python\.\%(versions\|version\|default_version\|branch\|prefix\|bin\|lib\|libdir\|include\|pkgd\|add_archflags\|set_compiler\|link_binaries\%(_suffix\)\?\)"
" I'm not documenting the Python{24,25,26,27,31,32} groups. Don't use them.
" Qt4
-syn match PortfileGroups "qt_\(name\|dir\|qmake_spec\|cmake_defines\|arch_types\)"
-syn match PortfileGroups "qt_\(qmake\|moc\|uic\|lrelease\)_cmd"
-syn match PortfileGroups "qt_\(docs\|plugins\|mkspecs\|imports\|includes\|libs\|frameworks\|bins\|apps\|data\|translations\|sysconf\|examples\|demos\|cmake_module\)_dir"
+syn match PortfileGroups "qt_\%(name\|dir\|qmake_spec\|cmake_defines\|arch_types\)"
+syn match PortfileGroups "qt_\%(qmake\|moc\|uic\|lrelease\)_cmd"
+syn match PortfileGroups "qt_\%(docs\|plugins\|mkspecs\|imports\|includes\|libs\|frameworks\|bins\|apps\|data\|translations\|sysconf\|examples\|demos\|cmake_module\)_dir"
" Ruby
-syn match PortfileGroups "ruby\.\(version\|bin\|rdoc\|gem\|lib\|arch\|archlib\|setup\)"
+syn match PortfileGroups "ruby\.\%(version\|bin\|rdoc\|gem\|lib\|arch\|archlib\|setup\)"
" Select
-syn match PortfileGroups "select\.\(group\|file\)"
+syn match PortfileGroups "select\.\%(group\|file\)"
" TeX Live
-syn match PortfileGroups "texlive\.\(exclude\|binaries\|formats\|languages\|maps\|forceupdatecnf\|use_mktexlsr\(_on_deactivate\)\?\|texmfport\)"
+syn match PortfileGroups "texlive\.\%(exclude\|binaries\|formats\|languages\|maps\|forceupdatecnf\|use_mktexlsr\%(_on_deactivate\)\?\|texmfport\)"
" X11 Font
syn match PortfileGroups "x11font\.setup"
" Xcode
-syn match PortfileGroups "xcode\.\(project\|configuration\|target\|build\.settings\)"
-syn match PortfileGroups "xcode\.destroot\.\(type\|path\|settings\)"
-syn match PortfileGroups "xcode\.universal\.\(sdk\|settings\)"
+syn match PortfileGroups "xcode\.\%(project\|configuration\|target\|build\.settings\)"
+syn match PortfileGroups "xcode\.destroot\.\%(type\|path\|settings\)"
+syn match PortfileGroups "xcode\.universal\.\%(sdk\|settings\)"
" Xcode version
syn match PortfileGroups "minimum_xcodeversions"
" Zope
-syn match PortfileGroups "zope\.\(need_subdir\|setup\)"
+syn match PortfileGroups "zope\.\%(need_subdir\|setup\)"
" End of PortGroups
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130123/327afc53/attachment-0001.html>
More information about the macports-changes
mailing list