BuboBubo/ziffers-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Subdivision in normal repeats

Browse Source
This commit is contained in:
Miika Alonen
2023-02-26 22:32:50 +02:00
parent da020cc3a2
commit 9e37bd366f
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_parser.py
View File

@ -91,6 +91,21 @@ def test_subdivisions(pattern: str, expected: list):
def test_repeats(pattern: str, expected: list): def test_repeats(pattern: str, expected: list):
assert collect(zparse(pattern),len(expected)*2,"note") == expected*2 assert collect(zparse(pattern),len(expected)*2,"note") == expected*2
@pytest.mark.parametrize(
"pattern,expected",
[
("[: 3 [2 4] :]", [0.25, 0.125, 0.125, 0.25, 0.125, 0.125]),
("[: 1 [2 [5 6]] 3 [2 4] :]", [0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125, 0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125]),
("(: 3 [2 4] :)", [0.25, 0.125, 0.125, 0.25, 0.125, 0.125]),
("(: 1 [2 [5 6]] 3 [2 4] :)", [0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125, 0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125]),
("(3 [2 4]):2", [0.25, 0.125, 0.125, 0.25, 0.125, 0.125]),
("(1 [2 [5 6]] 3 [2 4]):2", [0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125, 0.25, 0.125, 0.0625, 0.0625, 0.25, 0.125, 0.125]),
]
)
def test_repeat_durations(pattern: str, expected: list):
assert collect(zparse(pattern),len(expected)*2,"duration") == expected*2
@pytest.mark.parametrize( @pytest.mark.parametrize(
"pattern,expected", "pattern,expected",
[ [

3
ziffers/classes.py
View File

@ -1097,6 +1097,9 @@ class RepeatedSequence(Sequence):
yield from item.evaluate_tree(self.local_options, True) yield from item.evaluate_tree(self.local_options, True)
elif isinstance(item, RepeatedSequence): elif isinstance(item, RepeatedSequence):
yield item yield item
elif isinstance(item, Subdivision):
item.evaluate_values(options)
yield item
else: else:
yield from item yield from item
elif isinstance(item, Cyclic): elif isinstance(item, Cyclic):