diff options
Diffstat (limited to 'syntax/perl.vim')
-rw-r--r-- | syntax/perl.vim | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/syntax/perl.vim b/syntax/perl.vim index 75c4d5e6..73d647ae 100644 --- a/syntax/perl.vim +++ b/syntax/perl.vim @@ -39,11 +39,6 @@ endif let s:cpo_save = &cpo set cpo&vim -if exists('®expengine') - let s:regexpengine=®expengine - set regexpengine=1 -endif - " POD starts with ^=<word> and ends with ^=cut if !exists("perl_include_pod") || perl_include_pod == 1 @@ -360,15 +355,11 @@ syn keyword perlStatementPackage package contained " sub [name] [(prototype)] { " syn match perlSubError "[^[:space:];{#]" contained -if v:version == 701 && !has('patch221') " XXX I hope that's the right one - syn match perlSubAttributes ":" contained -else - syn match perlSubAttributesCont "\h\w*\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained - syn region perlSubAttributesCont matchgroup=perlSubAttributesCont start="\h\w*(" end=")\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained contains=@perlInterpSQ,perlParensSQ - syn cluster perlSubAttrMaybe contains=perlSubAttributesCont,perlSubError,perlFakeGroup - syn match perlSubAttributes "" contained nextgroup=perlSubError - syn match perlSubAttributes ":\_s*" contained nextgroup=@perlSubAttrMaybe -endif +syn match perlSubAttributesCont "\h\w*\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained +syn region perlSubAttributesCont matchgroup=perlSubAttributesCont start="\h\w*(" end=")\_s*\%(:\_s*\)\=" nextgroup=@perlSubAttrMaybe contained contains=@perlInterpSQ,perlParensSQ +syn cluster perlSubAttrMaybe contains=perlSubAttributesCont,perlSubError,perlFakeGroup +syn match perlSubAttributes "" contained nextgroup=perlSubError +syn match perlSubAttributes ":\_s*" contained nextgroup=@perlSubAttrMaybe if !exists("perl_no_subprototype_error") " Set 1 if using signatures feature in perl5.19.9 syn match perlSubPrototypeError "(\%(\_s*\%(\%(\\\%([$@%&*]\|\[[$@%&*]\+\]\)\|[$&*]\|[@%]\%(\_s*)\)\@=\|;\%(\_s*[)$@%&*\\]\)\@=\|_\%(\_s*[);]\)\@=\)\_s*\)*\)\@>\zs\_[^)]\+" contained syn match perlSubPrototype +(\_[^)]*)\_s*+ nextgroup=perlSubAttributes,perlComment contained contains=perlSubPrototypeError @@ -583,11 +574,6 @@ syn sync match perlSyncPOD grouphere NONE "^=cut" let b:current_syntax = "perl" -if exists('®expengine') - let ®expengine=s:regexpengine - unlet s:regexpengine -endif - let &cpo = s:cpo_save unlet s:cpo_save |