Support and, or, &&, ||

k-tsj · Jan 24, 2017 · ec8f043 · ec8f043
1 parent fc89d8e
commit ec8f043
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/power_assert/parser.rb b/lib/power_assert/parser.rb
@@ -54,6 +54,8 @@ def slice_expression(str)
     class Branch < Array
     end
 
+    AND_OR_OPS = %i(and or && ||)
+
     #
     # Returns idents as graph structure.
     #
@@ -81,7 +83,12 @@ def extract_idents(sexp)
       when :unary
         handle_columnless_ident([], sexp[1], extract_idents(sexp[2]))
       when :binary
-        handle_columnless_ident(extract_idents(sexp[1]), sexp[2], extract_idents(sexp[3]))
+        op = sexp[2]
+        if AND_OR_OPS.include?(op)
+          extract_idents(sexp[1]) + [Branch[extract_idents(sexp[3]), []]]
+        else
+          handle_columnless_ident(extract_idents(sexp[1]), op, extract_idents(sexp[3]))
+        end
       when :call
         with_safe_op = sexp[2] == :"&."
         if sexp[3] == :call

diff --git a/test/parser_test.rb b/test/parser_test.rb
@@ -149,6 +149,14 @@ class TestParser < Test::Unit::TestCase
       ['a ? 0 : 0',
         [[:method, "a", 0], [[], []]],
         [["a"]]],
+
+      ['a && b || c',
+        [[:method, "a", 0], [[[:method, "b", 5]], []], [[[:method, "c", 10]], []]],
+        [["a", "b", "c"], ["a", "c"], ["a", "b"], ["a"]]],
+
+      ['a and b or c',
+        [[:method, "a", 0], [[[:method, "b", 6]], []], [[[:method, "c", 11]], []]],
+        [["a", "b", "c"], ["a", "c"], ["a", "b"], ["a"]]],
     ].each_with_object({}) {|(source, expected_idents, expected_paths), h| h[source] = [expected_idents, expected_paths, source] }
   end
   def test_valid_syntax(*args)