lib/mutant/cli.rb in mutant-0.5.17 vs lib/mutant/cli.rb in mutant-0.5.18

@@ -247,12 +247,15 @@
     #
     # @api private
     #
     def parse_matchers(patterns)
       patterns.each do |pattern|
-        matcher = Classifier.run(@cache, pattern)
-        @builder.add_matcher(matcher)
+        expression = Expression.parse(pattern)
+        unless expression
+          raise Error, "Invalid mutant expression: #{pattern.inspect}"
+        end
+        @builder.add_matcher(expression.matcher(@cache))
       end
     end
 
     # Add environmental options
     #
@@ -319,10 +322,10 @@
     #
     # @api private
     #
     def add_filter_options(opts)
       opts.on('--ignore-subject PATTERN', 'Ignore subjects that match PATTERN') do |pattern|
-        @builder.add_subject_ignore(Classifier.run(@cache, pattern))
+        @builder.add_subject_ignore(Expression.parse(pattern).matcher(@cache))
       end
       opts.on('--code CODE', 'Scope execution to subjects with CODE') do |code|
         @builder.add_subject_selector(Morpher.compile(s(:eql, s(:attribute, :code), s(:static, code))))
       end
     end