Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pyleri/choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def _most_greedy_result(self, root, tree, rule, s, node):
if is_valid and pos > mg_pos:
node.children = children
mg_is_valid, mg_pos = is_valid, pos
if pos == root._len_string:
break

if mg_is_valid:
root._append_tree(tree, node, mg_pos)
Expand Down
16 changes: 16 additions & 0 deletions test/test_choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
from pyleri import (
KeywordError,
create_grammar,
Repeat,
Sequence,
Choice,
Keyword,
Regex,
Token,
) # nopep8


Expand All @@ -28,6 +30,20 @@ def test_choice_most_greedy(self):
self.assertTrue(grammar.parse(' hi iris ').is_valid)
self.assertFalse(grammar.parse(' hi sasha ').is_valid)

def test_choice_most_greedy_selects_full_match(self):
short = Token('a')
long = Token('aa')
grammar = create_grammar(Repeat(Choice(short, long)))

result = grammar.parse('aa')
repeat_node = result.tree.children[0]
choice_node = repeat_node.children[0]

self.assertTrue(result.is_valid)
self.assertEqual(len(repeat_node.children), 1)
self.assertEqual(choice_node.children[0].element, long)
self.assertEqual(choice_node.children[0].string, 'aa')

def test_choice_first_match(self):
k_hi = Keyword('hi')
k_iris = Keyword('iris')
Expand Down