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

Adding rest and subdivision to new repeat syntax

Browse Source
This commit is contained in:
Miika Alonen
2023-02-24 16:51:10 +02:00
parent 0d285a63eb
commit 864b110931
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ziffers/classes.py
View File

@ -345,6 +345,8 @@ class Sequence(Meta):
yield from _normal_repeat(item.evaluated_values, repeats, options) yield from _normal_repeat(item.evaluated_values, repeats, options)
elif isinstance(item, RepeatedListSequence): elif isinstance(item, RepeatedListSequence):
repeats = item.repeats.get_value(options) repeats = item.repeats.get_value(options)
while isinstance(repeats, Cyclic):
repeats = item.repeats.get_value(options)
if isinstance(repeats, Pitch): if isinstance(repeats, Pitch):
repeats = repeats.get_value(options) repeats = repeats.get_value(options)
yield from _generative_repeat(item, repeats, options) yield from _generative_repeat(item, repeats, options)

2
ziffers/spec/ziffers.lark
View File

@ -42,7 +42,7 @@
// Repeats // Repeats
repeat: "[:" sequence ":" [number] "]" repeat: "[:" sequence ":" [number] "]"
repeat_item: (pitch_class | list | random_integer | cycle) ":" number repeat_item: (pitch_class | list | random_integer | cycle | rest | subdivision) ":" number
// List // List
list: prefix* "(" sequence ")" list: prefix* "(" sequence ")"