Refactored duration changes

Fixes cyclic duration changes
2023-02-05 14:12:22 +02:00
parent 26d3825ffb
commit 1710d2f67b
2 changed files with 23 additions and 3 deletions
--- a/ziffers/ziffers.lark
+++ b/ziffers/ziffers.lark
@ -52,7 +52,9 @@
    // Control characters modifying future events
    oct_mod: octave WS
    oct_change: escaped_octave WS
-    dur_change: (duration_chars | decimal) WS
+    dur_change: (decimal | char_change)
+    char_change: dchar_not_prefix+
+    dchar_not_prefix: /([mklpdcwyhnqaefsxtgujzo](\.)*)(?!\d)/

    // Generative rules
    random_integer: /\(-?[0-9]+,-?[0-9]+\)/