Fix mypy issus

Author: Theomat

synth/pbe/solvers/pbe_solver.py

@@ -72,7 +72,7 @@ def _close_task_solving_(
 
     def solve(
         self, task: Task[PBE], enumerator: ProgramEnumerator[None], timeout: float = 60
-    ) -> Generator[Program, bool, None]:
+    ) -> Generator[Program, None, bool]:
         """
         Solve the given task by enumerating programs with the given enumerator.
         When the timeout is reached, this function returns.
@@ -101,6 +101,7 @@ def solve(
             except StopIteration as e:
                 self._close_task_solving_(task, enumerator, time, False, program)
                 raise e
+        return False
 
     def _test_(self, task: Task[PBE], program: Program) -> bool:
         """

synth/pbe/solvers/restart_pbe_solver.py

@@ -61,7 +61,7 @@ def _close_task_solving_(
 
     def solve(
         self, task: Task[PBE], enumerator: ProgramEnumerator[None], timeout: float = 60
-    ) -> Generator[Program, bool, None]:
+    ) -> Generator[Program, None, bool]:
         with chrono.clock(f"solve.{self.name()}.{self.subsolver.name()}") as c:  # type: ignore
             self._enumerator = enumerator
             self._init_task_solving_(task, self._enumerator, timeout)
@@ -73,15 +73,15 @@ def solve(
                     self._close_task_solving_(
                         task, self._enumerator, time, False, program
                     )
-                    return
+                    return False
                 self._programs += 1
                 if self._test_(task, program):
                     should_stop = yield program
                     if should_stop:
                         self._close_task_solving_(
                             task, self._enumerator, time, True, program
                         )
-                        return
+                        return True
                 self._score = self.subsolver._score
                 # Saves data
                 if self._score > 0:
@@ -92,6 +92,7 @@ def solve(
                     self._enumerator = self._restart_(self._enumerator)
                     gen = self._enumerator.generator()
                 program = next(gen)
+        return False
 
     def _should_restart_(self) -> bool:
         return self.restart_criterion(self)