FossilOrigin-Name: a8acba027eac65be97ac3bcd57fbdd71b177c922f1bc8c18deb9864de2a9da33
private
alpha 2 years ago
parent 556e5e796c
commit cd50d4283e

@ -18,6 +18,10 @@ module Lox
include Visitable include Visitable
end end
Logical = Struct.new(:left, :op, :right) do
include Visitable
end
Unary = Struct.new(:op, :right) do Unary = Struct.new(:op, :right) do
include Visitable include Visitable
end end

@ -62,6 +62,18 @@ module Lox
def visit_grouping(expr) = evaluate(expr.expr) def visit_grouping(expr) = evaluate(expr.expr)
def visit_literal(expr) = expr.value def visit_literal(expr) = expr.value
def visit_logical(expr)
left = evaluate(expr.left)
if expr.op.type == :OR
return left if truthy?(left)
else
return left unless truthy?(left)
end
evaluate(expr.right)
end
def visit_unary(expr) def visit_unary(expr)
right = evaluate(expr.right) right = evaluate(expr.right)

@ -77,7 +77,7 @@ module Lox
end end
def assignment def assignment
expr = equality expr = or_
if match?(:EQUAL) if match?(:EQUAL)
eq = prev eq = prev
@ -91,6 +91,30 @@ module Lox
expr expr
end end
def or_
expr = and_
while match?(:OR)
op = prev
right = and_
expr = Expr::Logical.new(expr, op, right)
end
expr
end
def and_
expr = equality
while match?(:AND)
op = prev
right = equality
expr = Expr::Logical.new(expr, op, right)
end
expr
end
def expression = assignment def expression = assignment
def equality def equality

@ -176,6 +176,16 @@ class TestInterpreter < Lox::Test
SRC SRC
end end
def test_logical
assert_interpreted <<~EXPECTED.chomp, <<~SRC
hi
yes
EXPECTED
print "hi" or 2; // "hi".
print nil or "yes"; // "yes".
SRC
end
private private
def assert_interpreted(expected, src) def assert_interpreted(expected, src)

Loading…
Cancel
Save