Add more typing

Little improvement (measured) in var unification

Author: boriel

src/arch/zx48k/peephole/pattern.py

@@ -80,12 +80,11 @@ def match(self, line: str, vars_: Dict[str, str]) -> bool:
         if match is None:
             return False
 
-        vars__ = {'_' + k[1:]: v for k, v in (vars_ or {}).items()}
         mdict = match.groupdict()
-        if any(mdict.get(k, v) != v for k, v in vars__.items()):
+        if any(mdict.get(k, v) != v for k, v in vars_.items()):
             return False
 
-        vars_.update({'$' + k[1:]: v for k, v in match.groupdict().items()})
+        vars_.update(mdict)
         return True
 
     def __repr__(self):
@@ -128,7 +127,7 @@ def match(self, instructions: List[str], start: int = 0) -> Optional[Dict[str, s
             if not patt.match(line, vars_=univars):
                 return None
 
-        return univars
+        return {'$' + k[1:]: v for k, v in univars.items()}
 
     def __repr__(self):
         return str([repr(x) for x in self.patterns])

src/arch/zx48k/peephole/template.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from typing import List
+
 from .pattern import BasicLinePattern
 
 
@@ -13,7 +15,7 @@ class LineTemplate(BasicLinePattern):
     with their values. '$$' is replaced by '$'. If any variable is unbound,
     an assertion is raised.
     """
-    def filter(self, vars_=None):
+    def filter(self, vars_=None) -> str:
         """ Applies a list of vars to the given pattern and returns the line
         """
         vars_ = vars_ or {}
@@ -33,14 +35,14 @@ def __repr__(self):
         return self.line
 
 
-class BlockTemplate(object):
+class BlockTemplate:
     """ Extends a Line template to a block of them
     """
     def __init__(self, lines):
         lines = [x.strip() for x in lines]
         self.templates = [LineTemplate(x) for x in lines if x]
 
-    def filter(self, vars_=None):
+    def filter(self, vars_=None) -> List[str]:
         return [y for y in [x.filter(vars_) for x in self.templates] if y]
 
     def __repr__(self):

tests/arch/zx48k/peephole/test_pattern.py

@@ -46,27 +46,27 @@ def setUp(self) -> None:
     def test_matches_parsed(self):
         patt = pattern.LinePattern('push $1')
         self.assertTrue(patt.match('push af', self.vars))
-        self.assertEqual({'$1': 'af'}, self.vars)
+        self.assertEqual({'_1': 'af'}, self.vars)
 
     def test_no_match(self):
-        patt = pattern.LinePattern('push $1')
+        patt = pattern.LinePattern('push _1')
         self.assertFalse(patt.match('pop af', self.vars))
         self.assertEqual({}, self.vars)
 
     def test_double_match(self):
         patt = pattern.LinePattern('push $1   $1')  # three spaces
         self.assertTrue(patt.match('push af  af', self.vars))  # only two spaces
-        self.assertEqual({'$1': 'af'}, self.vars)
+        self.assertEqual({'_1': 'af'}, self.vars)
 
     def test_match_two_patterns(self):
         patt = pattern.LinePattern('$2 $1')
         self.assertTrue(patt.match('push af', self.vars))
-        self.assertEqual({'$1': 'af', '$2': 'push'}, self.vars)
+        self.assertEqual({'_1': 'af', '_2': 'push'}, self.vars)
 
     def test_match_two_patterns_twice(self):
         patt = pattern.LinePattern('$2 $1 $2 $1')
         self.assertTrue(patt.match('push af push af', self.vars))
-        self.assertEqual({'$1': 'af', '$2': 'push'}, self.vars)
+        self.assertEqual({'_1': 'af', '_2': 'push'}, self.vars)
 
     def test_matches_empty_novars(self):
         patt = pattern.LinePattern('push af')