From fd9f4e10bf775303d19273feaf327b4f5c52a74a Mon Sep 17 00:00:00 2001 From: Alexis Roda Date: Wed, 7 Aug 2019 02:08:27 +0200 Subject: Fix regex for labels. SDCC also allows $ and dots in the labels. --- tests/test_z80count.py | 2 ++ z80count/z80count.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_z80count.py b/tests/test_z80count.py index c816359..85a9084 100644 --- a/tests/test_z80count.py +++ b/tests/test_z80count.py @@ -9,6 +9,8 @@ from z80count.z80count import z80count @pytest.mark.parametrize("line,expected", ( ("PLY_InterruptionOn: call PLY_Init", "PLY_InterruptionOn: call PLY_Init ; [17]\n"), + ("$PLY_Interruption.On: call PLY_Init", + "$PLY_Interruption.On: call PLY_Init ; [17]\n"), ("PLY_ReplayFrequency:\tld de,0", "PLY_ReplayFrequency:\tld de,0 ; [10]\n"), diff --git a/z80count/z80count.py b/z80count/z80count.py index 8356622..abfa48f 100644 --- a/z80count/z80count.py +++ b/z80count/z80count.py @@ -186,7 +186,7 @@ class Parser(object): """Simple parser based on a table of regexes.""" # [label:] OPERATOR [OPERANDS] [; comment] - _LINE_RE = re.compile(r"^([\w]+:)?\s*(?P\w+)(?P\s+.*)?$") + _LINE_RE = re.compile(r"^([$.\w]+:)?\s*(?P\w+)(?P\s+.*)?$") def __init__(self): self._table = self._load_table() -- cgit v1.2.3