Fix macro cells

test/test_turing.py

@@ -20,7 +20,7 @@
 from tm.parse import tcompile
 from tm.show import show_comp
 from tm.tree import Program
-from tm.macro import opt_block
+from tm.macro import opt_block, MacroProg
 from tm.reason import (
     cant_halt,
     cant_blank,
@@ -611,10 +611,10 @@ def assert_spinout(self) -> None:
             self.machine.spnout)
 
     def assert_macro_cells(self, cells: int):
-        assert not isinstance(macro := self.machine.program, dict)
+        assert isinstance(macro := self.machine.program, MacroProg)
 
         self.assertEqual(
-            macro.cells,  # type: ignore[attr-defined]
+            macro.cells,
             cells)
 
     def assert_mult_rules(self) -> None:
@@ -770,9 +770,10 @@ def _test_prover_est(self, prog_data: ProverEst):
                 self.assert_mult_rules()
 
             if is_macro := (
-                    not isinstance(
-                        macro := self.machine.program, dict)):
-                result *= macro.cells  # type: ignore[attr-defined]
+                    isinstance(
+                        macro := self.machine.program,
+                        MacroProg)):
+                result *= macro.cells
 
             if isinstance(marks, int):
                 self.assertEqual(result, marks)

tm/macro.py

@@ -156,8 +156,7 @@ def __str__(self) -> str:
             str(comp)
         )
 
-        # pylint: disable = line-too-long
-        return f'{comp_str} ({self.logic.cells}-cell {self.logic.name} macro)'
+        return f'{comp_str} ({self.cells}-cell {self.logic.name} macro)'
 
     @property
     def macro_states(self) -> int:
@@ -167,6 +166,10 @@ def macro_states(self) -> int:
     def macro_colors(self) -> int:
         return self.logic.macro_colors
 
+    @property
+    def cells(self) -> int:
+        return self.logic.cells
+
     def __getitem__(self, slot: Slot) -> Instr:
         try:
             instr = self.instrs[slot]