cucumber-tag-expressions 7.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef87856d34112746f4eb55b79609465df3d58c6dd2653bd834b6a649b4521ea
-  data.tar.gz: e7dcc602274caaae9b5aa198a31d035cb375b6d5af07913cc52bc9ec371feabf
+  metadata.gz: ca8718895c5d5686b66697971803b693b584e38c34cd5b02433adc38e99562d5
+  data.tar.gz: e798b0ef686e5df942edb6289e681d615f734f21848897f9b82549be376cf6bf
 SHA512:
-  metadata.gz: de8838af38969ce92dda4f8e01ca7dacb100db30cf5b2207b51a2aba744e8dddc23b1801a92e2829b863ad968b62e13d7eae0e1d5a19840ed042cf2d7fde9528
-  data.tar.gz: 1e535cde232ca5762212c70306b7d70e94fef9ce683dd1aab01fdc8dd9353a9727d6cfaeb105f8750d017f2e121efb85b4a75d2f828ddc895e9eaab97d479cb7
+  metadata.gz: '0951dd38d6ae796ce4d0eba06c91f4bb760b7b3f4f5f8d212123fd9db486fef7780212ac72ede15342e7528b3f866f531b64a4e484514f798d606c7f9c623980'
+  data.tar.gz: a26645be0fbe7176f9da6e25ddcba1ab9837bf3d79bf110490b4909cbe359c86402410263aefc322c0d2da5ce5538c596f8a85d1a8d7621da832deb9eb2d3a5b

data/lib/cucumber/tag_expressions/expressions.rb

@@ -79,7 +79,7 @@ module Cucumber
       end
 
       def to_s
-        'true'
+        ''
       end
     end
   end

data/lib/cucumber/tag_expressions/parser.rb

@@ -18,21 +18,16 @@ module Cucumber
         tokens.each { |token| expected_token_type = handle_sequential_tokens(token, infix_expression, expected_token_type) }
         while @operators.any?
           raise "Tag expression \"#{infix_expression}\" could not be parsed because of syntax error: Unmatched (." if @operators.last == '('
-
-          push_expression(pop(@operators))
+          push_expression(infix_expression, @operators.pop)
         end
-        pop(@expressions)
+        @expressions.pop
       end
 
       private
 
-      def assoc_correct?(token, value)
-        operator_types.dig(token, :assoc) == value
-      end
-
       def lower_precedence?(operation)
-        (assoc_correct?(operation, :left) && precedence(operation) <= precedence(@operators.last)) ||
-          (assoc_correct?(operation, :right) && precedence(operation) < precedence(@operators.last))
+        (operator_types.dig(operation, :assoc) == :left && precedence(operation) <= precedence(@operators.last)) ||
+          (operator_types.dig(operation, :assoc) == :right && precedence(operation) < precedence(@operators.last))
       end
 
       def operator?(token)
@@ -71,11 +66,11 @@ module Cucumber
         tokens
       end
 
-      def push_expression(token)
+      def push_expression(infix_expression, token)
         case token
-        when 'and' then @expressions.push(And.new(*pop(@expressions, 2)))
-        when 'or'  then @expressions.push(Or.new(*pop(@expressions, 2)))
-        when 'not' then @expressions.push(Not.new(pop(@expressions)))
+        when 'and' then @expressions.push(And.new(*popOperand(infix_expression, @expressions, 2)))
+        when 'or'  then @expressions.push(Or.new(*popOperand(infix_expression, @expressions, 2)))
+        when 'not' then @expressions.push(Not.new(popOperand(infix_expression, @expressions)))
         else            @expressions.push(Literal.new(token))
         end
       end
@@ -96,7 +91,7 @@ module Cucumber
 
       def handle_binary_operator(infix_expression, token, expected_token_type)
         check(infix_expression, expected_token_type, :operator)
-        push_expression(pop(@operators)) while @operators.any? && operator?(@operators.last) && lower_precedence?(token)
+        push_expression(infix_expression, @operators.pop) while @operators.any? && operator?(@operators.last) && lower_precedence?(token)
         @operators.push(token)
         :operand
       end
@@ -109,16 +104,16 @@ module Cucumber
 
       def handle_close_paren(infix_expression, _token, expected_token_type)
         check(infix_expression, expected_token_type, :operator)
-        push_expression(pop(@operators)) while @operators.any? && @operators.last != '('
+        push_expression(infix_expression, @operators.pop) while @operators.any? && @operators.last != '('
         raise "Tag expression \"#{infix_expression}\" could not be parsed because of syntax error: Unmatched )." if @operators.empty?
 
-        pop(@operators) if @operators.last == '('
+        @operators.pop if @operators.last == '('
         :operator
       end
 
       def handle_literal(infix_expression, token, expected_token_type)
         check(infix_expression, expected_token_type, :operand)
-        push_expression(token)
+        push_expression(infix_expression, token)
         :operator
       end
 
@@ -128,9 +123,9 @@ module Cucumber
         raise "Tag expression \"#{infix_expression}\" could not be parsed because of syntax error: Expected #{expected_token_type}."
       end
 
-      def pop(array, amount = 1)
+      def popOperand(infix_expression, array, amount = 1)
         result = array.pop(amount)
-        raise('Empty stack') if result.length != amount
+        raise "Tag expression \"#{infix_expression}\" could not be parsed because of syntax error: Expected operand." if result.length != amount
 
         amount == 1 ? result.first : result
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-tag-expressions
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Andrea Nodari
@@ -131,5 +131,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: cucumber-tag-expressions-7.0.0
+summary: cucumber-tag-expressions-8.1.0
 test_files: []