Changeset 101993 for contrib/mpvim


Ignore:
Timestamp:
Jan 24, 2013, 2:26:24 AM (11 years ago)
Author:
larryv@…
Message:

mpvim syntax: Use non-capturing groups throughout; simplify "{build,destroot}.{pre,post}_args" matches.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/mpvim/syntax/portfile.vim

    r101992 r101993  
    2828
    2929syn match PortfileGroup         "{.\+}" contained
    30 syn match PortfileYesNo         "\(yes\|no\)" contained
     30syn match PortfileYesNo         "\%(yes\|no\)" contained
    3131
    3232syn keyword PortfileRequired    PortSystem name version maintainers
    3333syn keyword PortfileRequired    homepage master_sites platforms
    3434syn match PortfileRequired      "^categories\%(-append\|-delete\)\?"
    35 syn match PortfileRequired      "^\(long_\)\?description" nextgroup=PortfileDescription skipwhite
     35syn match PortfileRequired      "^\%(long_\)\?description" nextgroup=PortfileDescription skipwhite
    3636syn region PortfileDescription  matchgroup=Normal start="" skip="\\$" end="$" contained
    3737
    … …  
    4141syn keyword PortfileOptional    replaced_by supported_archs
    4242
    43 syn match  PortfileOptional     "checksums\(-append\|-delete\)\?" nextgroup=PortfileChecksums skipwhite
     43syn match  PortfileOptional     "checksums\%(-append\|-delete\)\?" nextgroup=PortfileChecksums skipwhite
    4444syn region PortfileChecksums    matchgroup=Normal start="" skip="\\$" end="$" contained contains=PortfileChecksumsType
    4545syn keyword PortfileChecksumsType md5 sha1 rmd160 sha256 contained
    4646
    47 syn match PortfilePhases        "\(pre-\|post-\)\?\(fetch\|checksum\|extract\|patch\|configure\|build\|test\|destroot\|archive\|install\|activate\)\s" contains=PortfilePrePost
     47syn match PortfilePhases        "\%(pre-\|post-\)\?\%(fetch\|checksum\|extract\|patch\|configure\|build\|test\|destroot\|archive\|install\|activate\)\s" contains=PortfilePrePost
    4848
    4949" Fetch phase options
    50 syn match PortfilePhasesFetch   "fetch\.\(type\|user\|password\|use_epsv\|ignore_sslcert\)"
    51 syn match PortfilePhasesFetch   "cvs\.\(root\|password\|tag\|date\|module\)"
    52 syn match PortfilePhasesFetch   "svn\.\(url\|revision\)"
    53 syn match PortfilePhasesFetch   "git\.\(url\|branch\)"
    54 syn match PortfilePhasesFetch   "hg\.\(url\|tag\)"
     50syn match PortfilePhasesFetch   "fetch\.\%(type\|user\|password\|use_epsv\|ignore_sslcert\)"
     51syn match PortfilePhasesFetch   "cvs\.\%(root\|password\|tag\|date\|module\)"
     52syn match PortfilePhasesFetch   "svn\.\%(url\|revision\)"
     53syn match PortfilePhasesFetch   "git\.\%(url\|branch\)"
     54syn match PortfilePhasesFetch   "hg\.\%(url\|tag\)"
    5555
    5656" Extract phase options
    57 syn match PortfilePhasesExtract "extract\.\(suffix\|mkdir\|cmd\|only\(-append\|-delete\)\?\)"
    58 syn match PortfilePhasesExtract "use_\(7z\|bzip2\|lzma\|zip\|xz\)" nextgroup=PortfileYesNo skipwhite
     57syn match PortfilePhasesExtract "extract\.\%(suffix\|mkdir\|cmd\|only\%(-append\|-delete\)\?\)"
     58syn match PortfilePhasesExtract "use_\%(7z\|bzip2\|lzma\|zip\|xz\)" nextgroup=PortfileYesNo skipwhite
    5959
    6060" Patch phase options
    61 syn match PortfilePhasesPatch   "patch\.\(dir\|cmd\|args\(-append\|-delete\)\?\)"
    62 syn match PortfilePhasesPatch   "patchfiles\(-append\|-delete\)\?"
     61syn match PortfilePhasesPatch   "patch\.\%(dir\|cmd\|args\%(-append\|-delete\)\?\)"
     62syn match PortfilePhasesPatch   "patchfiles\%(-append\|-delete\)\?"
    6363
    6464" Configure phase options
    6565syn keyword PortfilePhasesConf  use_configure nextgroup=PortfileYesNo skipwhite
    66 syn match PortfilePhasesConf    "configure\.\(env\|\(c\|ld\|cpp\|cxx\|objc\|f\|fc\|f90\)flags\)\(-append\|-delete\)\?"
    67 syn match PortfilePhasesConf    "configure\.\(pre_\|post_\)\?args\(-append\|-delete\)\?" nextgroup=PortfileConfEntries skipwhite
     66syn match PortfilePhasesConf    "configure\.\%(env\|\%(c\|ld\|cpp\|cxx\|objc\|f\|fc\|f90\)flags\)\%(-append\|-delete\)\?"
     67syn match PortfilePhasesConf    "configure\.\%(pre_\|post_\)\?args\%(-append\|-delete\)\?" nextgroup=PortfileConfEntries skipwhite
    6868syn region PortfileConfEntries  matchgroup=Normal start="" skip="\\$" end="$" contained
    69 syn match PortfilePhasesConf    "configure\.\(cc\|cpp\|cxx\|objc\|fc\|f77\|f90\|javac\|compiler\)"
    70 syn match PortfilePhasesConf    "configure\.\(perl\|python\|ruby\|install\|awk\|bison\)"
    71 syn match PortfilePhasesConf    "configure\.\(pkg_config\(_path\)\?\)"
    72 syn match PortfilePhasesConf    "configure.universal_\(args\|\(c\|cpp\|cxx\|ld\)flags\)"
    73 syn match PortfilePhasesConf    "compiler\.\(blacklist\|whitelist\|fallback\)"
     69syn match PortfilePhasesConf    "configure\.\%(cc\|cpp\|cxx\|objc\|fc\|f77\|f90\|javac\|compiler\)"
     70syn match PortfilePhasesConf    "configure\.\%(perl\|python\|ruby\|install\|awk\|bison\)"
     71syn match PortfilePhasesConf    "configure\.\%(pkg_config\%(_path\)\?\)"
     72syn match PortfilePhasesConf    "configure.universal_\%(args\|\%(c\|cpp\|cxx\|ld\)flags\)"
     73syn match PortfilePhasesConf    "compiler\.\%(blacklist\|whitelist\|fallback\)"
    7474
    7575" Automake and Autoconf
    76 syn match PortfilePhasesAA      "use_auto\(make\|\(re\)\?conf\)" nextgroup=PortfileYesNo skipwhite
    77 syn match PortfilePhasesAA      "auto\(make\|\(re\)\?conf\).\(env\|args\|dir\)"
     76syn match PortfilePhasesAA      "use_auto\%(make\|\%(re\)\?conf\)" nextgroup=PortfileYesNo skipwhite
     77syn match PortfilePhasesAA      "auto\%(make\|\%(re\)\?conf\).\%(env\|args\|dir\)"
    7878
    7979" Build phase options
    80 syn match PortfilePhasesBuild   "build\.\(cmd\|type\|dir\)"
    81 syn match PortfilePhasesBuild   "build\.\(\(pre\|post\)_\)\?args"
    82 syn match PortfilePhasesBuild   "build\.\(target\|env\)\(-append\|-delete\)\?"
     80syn match PortfilePhasesBuild   "build\.\%(cmd\|type\|dir\)"
     81syn match PortfilePhasesBuild   "build\.\%(pre_\|post_\)\?args"
     82syn match PortfilePhasesBuild   "build\.\%(target\|env\)\%(-append\|-delete\)\?"
    8383syn keyword PortfilePhasesBuild use_parallel_build nextgroup=PortfileYesNo skipwhite
    8484
    8585" Test phase options
    86 syn match PortfilePhasesTest    "test\.\(run\|cmd\|target\)"
    87 syn match PortfilePhasesTest    "test\.env\(-append\|-delete\)\?"
     86syn match PortfilePhasesTest    "test\.\%(run\|cmd\|target\)"
     87syn match PortfilePhasesTest    "test\.env\%(-append\|-delete\)\?"
    8888
    8989" Test destroot options
    90 syn match PortfilePhasesDest    "destroot\.\(cmd\|type\|dir\|destdir\|umask\|keepdirs\|violate_mtree\)"
    91 syn match PortfilePhasesDest    "destroot\.\(\(pre\|post\)_\)\?args"
    92 syn match PortfilePhasesDest    "destroot\.target\(-append\|-delete\)\?"
     90syn match PortfilePhasesDest    "destroot\.\%(cmd\|type\|dir\|destdir\|umask\|keepdirs\|violate_mtree\)"
     91syn match PortfilePhasesDest    "destroot\.\%(pre_\|post_\)\?args"
     92syn match PortfilePhasesDest    "destroot\.target\%(-append\|-delete\)\?"
    9393
    9494" Variants
    … …  
    9999syn match PortfileVariantName           "[a-zA-Z0-9_]\+" contained
    100100syn keyword PortfileOptional            universal_variant nextgroup=PortfileYesNo skipwhite
    101 syn match PortfileOptional              "default_variants\(-append\|-delete\)\?" nextgroup=PortfileDefaultVariants skipwhite
    102 syn match PortfileDefaultVariants       "\([+\-][a-zA-Z0-9_]\+\s*\)\+" contained
     101syn match PortfileOptional              "default_variants\%(-append\|-delete\)\?" nextgroup=PortfileDefaultVariants skipwhite
     102syn match PortfileDefaultVariants       "\%([+\-][a-zA-Z0-9_]\+\s*\)\+" contained
    103103
    104104" Platform
    … …  
    109109
    110110" Dependencies
    111 syn match PortfileDepends           "depends_\(\(lib\|build\|run\|fetch\|extract\)\(-append\|-delete\)\?\)" nextgroup=PortfileDependsEntries skipwhite
     111syn match PortfileDepends           "depends_\%(\%(lib\|build\|run\|fetch\|extract\)\%(-append\|-delete\)\?\)" nextgroup=PortfileDependsEntries skipwhite
    112112syn region PortfileDependsEntries   matchgroup=Normal start="" skip="\\$" end="$" contains=PortfileDependsEntry contained
    113 syn match PortfileDependsEntry      "\(port\|bin\|path\|lib\):" contained
     113syn match PortfileDependsEntry      "\%(port\|bin\|path\|lib\):" contained
    114114
    115115" StartupItems
    116 syn match PortfileStartupPid    "\(none\|auto\|clean\|manual\)" contained
    117 syn match PortfileOptional      "startupitem\.\(start\|stop\|restart\|init\|executable\|logfile\)"
    118 syn match PortfileOptional      "startupitem\.\(create\|logevents\|netchange\)" nextgroup=PortfileYesNo skipwhite
     116syn match PortfileStartupPid    "\%(none\|auto\|clean\|manual\)" contained
     117syn match PortfileOptional      "startupitem\.\%(start\|stop\|restart\|init\|executable\|logfile\)"
     118syn match PortfileOptional      "startupitem\.\%(create\|logevents\|netchange\)" nextgroup=PortfileYesNo skipwhite
    119119syn match PortfileOptional      "startupitem\.pidfile" nextgroup=PortfileStartupPid skipwhite
    120120
    121121" Livecheck / Distcheck
    122 syn match PortfileOptional      "livecheck\.\(type\|name\|distname\|version\|url\|regex\|md5\)"
     122syn match PortfileOptional      "livecheck\.\%(type\|name\|distname\|version\|url\|regex\|md5\)"
    123123syn keyword PortfileOptional    distcheck.check
    124124
    … …  
    129129
    130130" App
    131 syn match PortfileGroups    "app\.\(create\|name\|executable\|icon\|short_version_string\|version\|identifier\)"
     131syn match PortfileGroups    "app\.\%(create\|name\|executable\|icon\|short_version_string\|version\|identifier\)"
    132132
    133133" Archcheck
    … …  
    138138
    139139" crossbinutils
    140 syn match PortfileGroups    "crossbinutils\.\(target\|setup\)"
     140syn match PortfileGroups    "crossbinutils\.\%(target\|setup\)"
    141141
    142142" crossgcc
    143 syn match PortfileGroups    "crossgcc\.\(target\|setup\|setup_libc\)"
     143syn match PortfileGroups    "crossgcc\.\%(target\|setup\|setup_libc\)"
    144144
    145145" github
    146 syn match PortfileGroups    "github\.\(author\|project\|version\|tag_prefix\|homepage\|raw\|master_sites\|tarball_from\|setup\)"
     146syn match PortfileGroups    "github\.\%(author\|project\|version\|tag_prefix\|homepage\|raw\|master_sites\|tarball_from\|setup\)"
    147147
    148148" Gnustep
    149 syn match PortfileGroups    "gnustep\.\(post_flags\|cc\)"
     149syn match PortfileGroups    "gnustep\.\%(post_flags\|cc\)"
    150150syn keyword PortfileGroups  variant_with_docs gnustep_layout
    151 syn match PortfileGroups    "set_\(gnustep_\(make\|env\)\|\(system\|local\)_library\)"
     151syn match PortfileGroups    "set_\%(gnustep_\%(make\|env\)\|\%(system\|local\)_library\)"
    152152
    153153" Haskell
    … …  
    155155
    156156" hocbinding
    157 syn match PortfileGroups    "hocbinding\.\(framework\|deps\|setup\)"
     157syn match PortfileGroups    "hocbinding\.\%(framework\|deps\|setup\)"
    158158
    159159" hunspelldict
    160 syn match PortfileGroups    "hunspelldict\.\(locale\|setup\)"
     160syn match PortfileGroups    "hunspelldict\.\%(locale\|setup\)"
    161161
    162162" KDE 4, versions 1.0 and 1.1
    … …  
    164164
    165165" muniversal
    166 syn match PortfileGroups    "merger_configure_\(env\|args\|compiler\|cppflags\|cflags\|cxxflags\|objcflags\|ldflags\)"
    167 syn match PortfileGroups    "merger_build_\(env\|args\)"
    168 syn match PortfileGroups    "merger_\(host\|arch_\(flag\|compiler\)\|destroot_env\|dont_diff\|must_run_binaries\|no_3_archs\)"
     166syn match PortfileGroups    "merger_configure_\%(env\|args\|compiler\|cppflags\|cflags\|cxxflags\|objcflags\|ldflags\)"
     167syn match PortfileGroups    "merger_build_\%(env\|args\)"
     168syn match PortfileGroups    "merger_\%(host\|arch_\%(flag\|compiler\)\|destroot_env\|dont_diff\|must_run_binaries\|no_3_archs\)"
    169169syn match PortfileGroups    "universal_archs_supported"
    170170
    … …  
    177177
    178178" octave
    179 syn match PortfileGroups    "octave\.\(module\|setup\)"
     179syn match PortfileGroups    "octave\.\%(module\|setup\)"
    180180
    181181" PEAR
    182 syn match PortfileGroups    "pear\.\(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-pear\|cmd-phar\|cmd-php\|channel\|packagexml\|package\|packagefile\|setup\)"
     182syn match PortfileGroups    "pear\.\%(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-pear\|cmd-phar\|cmd-php\|channel\|packagexml\|package\|packagefile\|setup\)"
    183183
    184184" Perl5
    185 syn match PortfileGroups    "perl5\.\(setup\|branches\|default_branch\|version\|major\|arch\|bin\|lib\|bindir\|archlib\)"
     185syn match PortfileGroups    "perl5\.\%(setup\|branches\|default_branch\|version\|major\|arch\|bin\|lib\|bindir\|archlib\)"
    186186
    187187" PHP 1.0
    188 syn match PortfileGroups    "php\.\(branch\(es\)\?\|build_dirs\|default_branch\|extension_ini\|extensions\|rootname\|type\|setup\)"
    189 syn match PortfileGroups    "php\.\(config\|extension_dir\|ini\(_dir\)\?\|ize\|suffix\)"
     188syn match PortfileGroups    "php\.\%(branch\%(es\)\?\|build_dirs\|default_branch\|extension_ini\|extensions\|rootname\|type\|setup\)"
     189syn match PortfileGroups    "php\.\%(config\|extension_dir\|ini\%(_dir\)\?\|ize\|suffix\)"
    190190" PHP 1.1 (only adding those not already present in 1.0)
    191 syn match PortfileGroups    "php\.\(rootname\|create_subports\|extensions\.zend\|build_dirs\|add_port_code\)"
    192 syn match PortfileGroups    "php\.\(pecl\(_livecheck_stable\)\?\|pecl\.\(name\|prerelease\)\)"
     191syn match PortfileGroups    "php\.\%(rootname\|create_subports\|extensions\.zend\|build_dirs\|add_port_code\)"
     192syn match PortfileGroups    "php\.\%(pecl\%(_livecheck_stable\)\?\|pecl\.\%(name\|prerelease\)\)"
    193193
    194194" PHP5 extension
    195 syn match PortfileGroups    "php5extension\.\(setup\|build_dirs\|extensions\|extension_dir\|ini\|inidir\|php_ini\|phpize\|type\|source\)"
     195syn match PortfileGroups    "php5extension\.\%(setup\|build_dirs\|extensions\|extension_dir\|ini\|inidir\|php_ini\|phpize\|type\|source\)"
    196196
    197197" PHP5 PEAR
    198 syn match PortfileGroups    "php5pear\.\(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-\(pear\|phar\|php\)\|channel\|packagexml\|package\|packagefile\|setup\)"
     198syn match PortfileGroups    "php5pear\.\%(env\|configure\.pre_args\|destroot\|installer\|sourceroot\|instpath\|pearpath\|cmd-\%(pear\|phar\|php\)\|channel\|packagexml\|package\|packagefile\|setup\)"
    199199
    200200" Pure
    … …  
    202202
    203203" Python
    204 syn match PortfileGroups    "python\.\(versions\|version\|default_version\|branch\|prefix\|bin\|lib\|libdir\|include\|pkgd\|add_archflags\|set_compiler\|link_binaries\(_suffix\)\?\)"
     204syn match PortfileGroups    "python\.\%(versions\|version\|default_version\|branch\|prefix\|bin\|lib\|libdir\|include\|pkgd\|add_archflags\|set_compiler\|link_binaries\%(_suffix\)\?\)"
    205205" I'm not documenting the Python{24,25,26,27,31,32} groups. Don't use them.
    206206
    207207" Qt4
    208 syn match PortfileGroups    "qt_\(name\|dir\|qmake_spec\|cmake_defines\|arch_types\)"
    209 syn match PortfileGroups    "qt_\(qmake\|moc\|uic\|lrelease\)_cmd"
    210 syn match PortfileGroups    "qt_\(docs\|plugins\|mkspecs\|imports\|includes\|libs\|frameworks\|bins\|apps\|data\|translations\|sysconf\|examples\|demos\|cmake_module\)_dir"
     208syn match PortfileGroups    "qt_\%(name\|dir\|qmake_spec\|cmake_defines\|arch_types\)"
     209syn match PortfileGroups    "qt_\%(qmake\|moc\|uic\|lrelease\)_cmd"
     210syn match PortfileGroups    "qt_\%(docs\|plugins\|mkspecs\|imports\|includes\|libs\|frameworks\|bins\|apps\|data\|translations\|sysconf\|examples\|demos\|cmake_module\)_dir"
    211211
    212212" Ruby
    213 syn match PortfileGroups    "ruby\.\(version\|bin\|rdoc\|gem\|lib\|arch\|archlib\|setup\)"
     213syn match PortfileGroups    "ruby\.\%(version\|bin\|rdoc\|gem\|lib\|arch\|archlib\|setup\)"
    214214
    215215" Select
    216 syn match PortfileGroups    "select\.\(group\|file\)"
     216syn match PortfileGroups    "select\.\%(group\|file\)"
    217217
    218218" TeX Live
    219 syn match PortfileGroups    "texlive\.\(exclude\|binaries\|formats\|languages\|maps\|forceupdatecnf\|use_mktexlsr\(_on_deactivate\)\?\|texmfport\)"
     219syn match PortfileGroups    "texlive\.\%(exclude\|binaries\|formats\|languages\|maps\|forceupdatecnf\|use_mktexlsr\%(_on_deactivate\)\?\|texmfport\)"
    220220
    221221" X11 Font
    … …  
    223223
    224224" Xcode
    225 syn match PortfileGroups    "xcode\.\(project\|configuration\|target\|build\.settings\)"
    226 syn match PortfileGroups    "xcode\.destroot\.\(type\|path\|settings\)"
    227 syn match PortfileGroups    "xcode\.universal\.\(sdk\|settings\)"
     225syn match PortfileGroups    "xcode\.\%(project\|configuration\|target\|build\.settings\)"
     226syn match PortfileGroups    "xcode\.destroot\.\%(type\|path\|settings\)"
     227syn match PortfileGroups    "xcode\.universal\.\%(sdk\|settings\)"
    228228
    229229" Xcode version
    … …  
    231231
    232232" Zope
    233 syn match PortfileGroups    "zope\.\(need_subdir\|setup\)"
     233syn match PortfileGroups    "zope\.\%(need_subdir\|setup\)"
    234234
    235235" End of PortGroups
Note: See TracChangeset for help on using the changeset viewer.