make global variables obvious

This commit is contained in:
2023-02-05 16:27:44 +01:00
parent 903d1a6639
commit 9a4e73c842
3 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
default_durs = { DEFAULT_DURS = {
"m": 8.0, # 15360/1920 "m": 8.0, # 15360/1920
"k": 10240 / 1920, # ~5.333 "k": 10240 / 1920, # ~5.333
"l": 4.0, # 7680/1920 "l": 4.0, # 7680/1920

View File

@ -1,7 +1,7 @@
from lark import Transformer from lark import Transformer
from .classes import * from .classes import *
from .common import flatten, sum_dict from .common import flatten, sum_dict
from .defaults import default_durs from .defaults import DEFAULT_DURS
import operator import operator
@ -66,7 +66,7 @@ class ZiffersTransformer(Transformer):
chars = "" chars = ""
durs = 0.0 durs = 0.0
for (dchar, dots) in s: for (dchar, dots) in s:
val = default_durs[dchar] val = DEFAULT_DURS[dchar]
if dots > 0: if dots > 0:
val = val * (2.0 - (1.0 / (2 * dots))) val = val * (2.0 - (1.0 / (2 * dots)))
chars = chars + (dchar + "." * dots) chars = chars + (dchar + "." * dots)
@ -98,7 +98,7 @@ class ZiffersTransformer(Transformer):
def dotted_dur(self, s): def dotted_dur(self, s):
key = s[0] key = s[0]
val = default_durs[key] val = DEFAULT_DURS[key]
dots = len(s) - 1 dots = len(s) - 1
if dots > 0: if dots > 0:
val = val * (2.0 - (1.0 / (2 * dots))) val = val * (2.0 - (1.0 / (2 * dots)))

View File

@ -15,5 +15,6 @@ ziffers_parser = Lark.open(
) )
def parse_expression(expr): def parse_expression(expr: str):
"""Parse an expression using the Ziffers parser"""
return ziffers_parser.parse(expr) return ziffers_parser.parse(expr)