diff options
| author | Alexis Roda <alexis.roda.villalonga@gmail.com> | 2019-08-07 02:08:27 +0200 |
|---|---|---|
| committer | Alexis Roda <alexis.roda.villalonga@gmail.com> | 2019-08-07 02:08:27 +0200 |
| commit | fd9f4e10bf775303d19273feaf327b4f5c52a74a (patch) | |
| tree | 033d7fb7013ac616afb4c5c22ea67e7c8a5b597e | |
| parent | 7ed68a50b1379a8d8265ff76292ed0620d2a45e5 (diff) | |
| download | z80count-fd9f4e10bf775303d19273feaf327b4f5c52a74a.tar.gz z80count-fd9f4e10bf775303d19273feaf327b4f5c52a74a.zip | |
Fix regex for labels.
SDCC also allows $ and dots in the labels.
| -rw-r--r-- | tests/test_z80count.py | 2 | ||||
| -rw-r--r-- | z80count/z80count.py | 2 |
2 files changed, 3 insertions, 1 deletions
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<operator>\w+)(?P<rest>\s+.*)?$") + _LINE_RE = re.compile(r"^([$.\w]+:)?\s*(?P<operator>\w+)(?P<rest>\s+.*)?$") def __init__(self): self._table = self._load_table() |