Replace position regexp matching with named captures
This commit is contained in:
parent
2b6eba8ad3
commit
132d556eec
5 changed files with 14 additions and 19 deletions
|
@ -15,17 +15,12 @@ module Mutant
|
|||
|
||||
REGEXP = /
|
||||
\A
|
||||
(#{SCOPE_PATTERN})
|
||||
([.#])
|
||||
(#{METHOD_NAME_PATTERN})
|
||||
(?<scope_name>#{SCOPE_PATTERN})
|
||||
(?<scope_symbol>[.#])
|
||||
(?<method_name>#{METHOD_NAME_PATTERN})
|
||||
\z
|
||||
/x.freeze
|
||||
|
||||
# Positions of captured regexp groups
|
||||
SCOPE_NAME_POSITION = 1
|
||||
SCOPE_SYMBOL_POSITION = 2
|
||||
METHOD_NAME_POSITION = 3
|
||||
|
||||
private
|
||||
|
||||
# Return method matcher
|
||||
|
@ -59,7 +54,7 @@ module Mutant
|
|||
# @api private
|
||||
#
|
||||
def scope_name
|
||||
match[SCOPE_NAME_POSITION]
|
||||
match[__method__]
|
||||
end
|
||||
|
||||
# Return scope
|
||||
|
@ -79,7 +74,7 @@ module Mutant
|
|||
# @api private
|
||||
#
|
||||
def method_name
|
||||
match[METHOD_NAME_POSITION].to_sym
|
||||
match[__method__].to_sym
|
||||
end
|
||||
|
||||
# Return scope symbol
|
||||
|
@ -89,7 +84,7 @@ module Mutant
|
|||
# @api private
|
||||
#
|
||||
def scope_symbol
|
||||
match[SCOPE_SYMBOL_POSITION]
|
||||
match[__method__]
|
||||
end
|
||||
|
||||
# Return matcher class
|
||||
|
|
|
@ -26,12 +26,12 @@ module Mutant
|
|||
# @api private
|
||||
#
|
||||
def namespace
|
||||
Classifier.constant_lookup(match[1].to_s)
|
||||
Classifier.constant_lookup(match[__method__].to_s)
|
||||
end
|
||||
|
||||
# Recursive namespace classifier
|
||||
class Recursive < self
|
||||
REGEXP = /\A(#{SCOPE_PATTERN})\*\z/.freeze
|
||||
REGEXP = /\A(?<namespace>#{SCOPE_PATTERN})\*\z/.freeze
|
||||
MATCHER = Matcher::Namespace
|
||||
|
||||
register
|
||||
|
@ -39,7 +39,7 @@ module Mutant
|
|||
|
||||
# Recursive namespace classifier
|
||||
class Flat < self
|
||||
REGEXP = /\A(#{SCOPE_PATTERN})\z/.freeze
|
||||
REGEXP = /\A(?<namespace>#{SCOPE_PATTERN})\z/.freeze
|
||||
MATCHER = Matcher::Scope
|
||||
|
||||
register
|
||||
|
|
|
@ -7,7 +7,7 @@ module Mutant
|
|||
# Scope classifier
|
||||
class Scope < self
|
||||
|
||||
REGEXP = /\A(#{SCOPE_PATTERN})\z/.freeze
|
||||
REGEXP = /\A(?<scope>#{SCOPE_PATTERN})\z/.freeze
|
||||
|
||||
private
|
||||
|
||||
|
@ -28,7 +28,7 @@ module Mutant
|
|||
# @api private
|
||||
#
|
||||
def scope
|
||||
Classifier.constant_lookup(match[1].to_s)
|
||||
Classifier.constant_lookup(match[__method__].to_s)
|
||||
end
|
||||
|
||||
end # Scope
|
||||
|
|
|
@ -23,7 +23,7 @@ module Mutant
|
|||
mutation.code.eql?(code)
|
||||
end
|
||||
|
||||
PATTERN = /\Acode:([a-f0-9]{1,6})\z/.freeze
|
||||
PATTERN = /\Acode:(?<code>[a-f0-9]{1,6})\z/.freeze
|
||||
|
||||
# Test if class handles string
|
||||
#
|
||||
|
@ -40,7 +40,7 @@ module Mutant
|
|||
def self.handle(notation)
|
||||
match = PATTERN.match(notation)
|
||||
return unless match
|
||||
new(match[1])
|
||||
new(match[:code])
|
||||
end
|
||||
|
||||
end # Code
|
||||
|
|
|
@ -17,7 +17,7 @@ if ENV['COVERAGE'] == 'true'
|
|||
add_filter 'config'
|
||||
add_filter 'spec'
|
||||
add_filter 'test_app'
|
||||
minimum_coverage 89.56 # TODO: raise this to 100, then mutation test
|
||||
minimum_coverage 89.55 # TODO: raise this to 100, then mutation test
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue