Change Parser#expression to build the parsed expression

This commit is contained in:
Peter Zhu
2020-11-11 14:19:31 -05:00
parent ed0aebcbc9
commit 933a1f1e7e
11 changed files with 183 additions and 99 deletions

View File

@@ -47,32 +47,35 @@ class ParserUnitTest < Minitest::Test
def test_expressions
p = Parser.new("hi.there hi?[5].there? hi.there.bob")
assert_equal('hi.there', p.expression)
assert_equal('hi?[5].there?', p.expression)
assert_equal('hi.there.bob', p.expression)
assert_equal(VariableLookup.new('hi', ['there'], 0), p.expression)
assert_equal(VariableLookup.new('hi?', [5, 'there?'], 0), p.expression)
assert_equal(VariableLookup.new('hi', ['there', 'bob'], 0), p.expression)
p = Parser.new("nil true false")
assert_nil(p.expression)
assert_equal(true, p.expression)
assert_equal(false, p.expression)
p = Parser.new("567 6.0 'lol' \"wut\"")
assert_equal('567', p.expression)
assert_equal('6.0', p.expression)
assert_equal("'lol'", p.expression)
assert_equal('"wut"', p.expression)
assert_equal(567, p.expression)
assert_equal(6.0, p.expression)
assert_equal('lol', p.expression)
assert_equal('wut', p.expression)
end
def test_ranges
p = Parser.new("(5..7) (1.5..9.6) (young..old) (hi[5].wat..old)")
assert_equal('(5..7)', p.expression)
assert_equal('(1.5..9.6)', p.expression)
assert_equal('(young..old)', p.expression)
assert_equal('(hi[5].wat..old)', p.expression)
assert_equal(5..7, p.expression)
assert_equal(1..9, p.expression)
assert_equal(RangeLookup.new(VariableLookup.new('young', [], 0), VariableLookup.new('old', [], 0)), p.expression)
assert_equal(RangeLookup.new(VariableLookup.new('hi', [5, "wat"], 0), VariableLookup.new('old', [], 0)), p.expression)
end
def test_arguments
p = Parser.new("filter: hi.there[5], keyarg: 7")
assert_equal('filter', p.consume(:id))
assert_equal(':', p.consume(:colon))
assert_equal('hi.there[5]', p.argument)
assert_equal(',', p.consume(:comma))
assert_equal('keyarg: 7', p.argument)
assert_equal([[VariableLookup.new("hi", ["there", 5], 0)], { "keyarg" => 7 }], p.arguments)
end
def test_invalid_expression