소스 검색

scripts: Use character classes instead of single character alternations

Fixes RegularExpressions::ProhibitSingleCharAlternation.

Warned-by: perlcritic
Guillem Jover 12 년 전
부모
커밋
600a530a90
3개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      scripts/Dpkg/Changelog/Debian.pm
  2. 1 1
      scripts/Dpkg/Deps.pm
  3. 1 0
      test/critic.t

+ 3 - 3
scripts/Dpkg/Changelog/Debian.pm

@@ -112,10 +112,10 @@ sub parse {
 	    next; # skip comments, even that's not supported
 	} elsif (m{^/\*.*\*/}o) {
 	    next; # more comments
-	} elsif (m/^(\w+\s+\w+\s+\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}\s+[\w\s]*\d{4})\s+(.*)\s+(<|\()(.*)(\)|>)/o
-		 || m/^(\w+\s+\w+\s+\d{1,2},?\s*\d{4})\s+(.*)\s+(<|\()(.*)(\)|>)/o
+	} elsif (m/^(\w+\s+\w+\s+\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}\s+[\w\s]*\d{4})\s+(.*)\s+[<\(](.*)[\)>]/o
+		 || m/^(\w+\s+\w+\s+\d{1,2},?\s*\d{4})\s+(.*)\s+[<\(](.*)[\)>]/o
 		 || m/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)\;?/io
-		 || m/^([\w.+-]+)(-| )(\S+) Debian (\S+)/io
+		 || m/^([\w.+-]+)[- ](\S+) Debian (\S+)/io
 		 || m/^Changes from version (.*) to (.*):/io
 		 || m/^Changes for [\w.+-]+-[\w.+-]+:?\s*$/io
 		 || m/^Old Changelog:\s*$/io

+ 1 - 1
scripts/Dpkg/Deps.pm

@@ -557,7 +557,7 @@ sub parse_string {
               )?                            # end of optional part
               (?:                           # start of optional part
                 \s* \(                      # open parenthesis for version part
-                \s* (<<|<=|=|>=|>>|<|>)     # relation part
+                \s* (<<|<=|=|>=|>>|[<>])    # relation part
                 \s* (.*?)                   # do not attempt to parse version
                 \s* \)                      # closing parenthesis
               )?                            # end of optional part

+ 1 - 0
test/critic.t

@@ -79,6 +79,7 @@ my @policies = qw(
     Modules::RequireFilenameMatchesPackage
     NamingConventions::Capitalization
     Objects::ProhibitIndirectSyntax
+    RegularExpressions::ProhibitSingleCharAlternation
     RegularExpressions::ProhibitUnusualDelimiters
     RegularExpressions::RequireBracesForMultiline
     Subroutines::ProhibitExplicitReturnUndef