From 9a4e73c842e0fdaa8759c3b56d1169b3301a981a Mon Sep 17 00:00:00 2001 From: Raphael Forment Date: Sun, 5 Feb 2023 16:27:44 +0100 Subject: [PATCH] make global variables obvious --- ziffers/defaults.py | 2 +- ziffers/mapper.py | 6 +++--- ziffers/parser.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ziffers/defaults.py b/ziffers/defaults.py index 5450226..fb0e24d 100644 --- a/ziffers/defaults.py +++ b/ziffers/defaults.py @@ -1,4 +1,4 @@ -default_durs = { +DEFAULT_DURS = { "m": 8.0, # 15360/1920 "k": 10240 / 1920, # ~5.333 "l": 4.0, # 7680/1920 diff --git a/ziffers/mapper.py b/ziffers/mapper.py index 0f7ddb8..74e5d95 100644 --- a/ziffers/mapper.py +++ b/ziffers/mapper.py @@ -1,7 +1,7 @@ from lark import Transformer from .classes import * from .common import flatten, sum_dict -from .defaults import default_durs +from .defaults import DEFAULT_DURS import operator @@ -66,7 +66,7 @@ class ZiffersTransformer(Transformer): chars = "" durs = 0.0 for (dchar, dots) in s: - val = default_durs[dchar] + val = DEFAULT_DURS[dchar] if dots > 0: val = val * (2.0 - (1.0 / (2 * dots))) chars = chars + (dchar + "." * dots) @@ -98,7 +98,7 @@ class ZiffersTransformer(Transformer): def dotted_dur(self, s): key = s[0] - val = default_durs[key] + val = DEFAULT_DURS[key] dots = len(s) - 1 if dots > 0: val = val * (2.0 - (1.0 / (2 * dots))) diff --git a/ziffers/parser.py b/ziffers/parser.py index eea3060..e3dfe50 100644 --- a/ziffers/parser.py +++ b/ziffers/parser.py @@ -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)