remove unreachable code

Author: mzuenni

bin/contest.py

@@ -1,7 +1,7 @@
 import config
 
 from pathlib import Path
-from typing import cast, Any, Optional, TYPE_CHECKING
+from typing import cast, Any, Optional, Literal, TYPE_CHECKING
 
 from util import eprint, error, fatal, log, read_yaml, read_yaml_settings, verbose
 
@@ -25,7 +25,7 @@ def contest_yaml() -> dict[str, Any]:
     return _contest_yaml
 
 
-_problems_yaml = None
+_problems_yaml: Literal[False] | Optional[list[dict[str, Any]]] = None
 
 
 def problems_yaml() -> Optional[list[dict[str, Any]]]:
@@ -45,7 +45,7 @@ def problems_yaml() -> Optional[list[dict[str, Any]]]:
         return None
     if not isinstance(_problems_yaml, list):
         fatal("problems.yaml must contain a list of problems")
-    return cast(list[dict[str, Any]], _problems_yaml)
+    return _problems_yaml
 
 
 def get_api() -> str:

bin/generate.py

@@ -806,11 +806,6 @@ def generate(
         if t.generator and t.generator.program is None:
             bar.done(False, "Generator didn't build. Skipping.")
             return
-        if t.hash is None:
-            # Input can only be missing when the `copy:` does not have a corresponding `.in` file.
-            # (When `generate:` or `in:` is used, the input is always present.)
-            bar.done(False, f"{t.copy} does not exist. Skipping.")
-            return
 
         target_dir = problem.path / "data" / t.path.parent
         target_infile = target_dir / (t.name + ".in")

bin/interactive.py

@@ -183,7 +183,9 @@ def get_validator_command() -> Sequence[str | Path]:
             if not validator_err:
                 validator_err = bytes()
 
-            if not verdict and not run._continue_with_tle(verdict, max_duration >= timeout):
+            if verdict != Verdict.ACCEPTED and not run._continue_with_tle(
+                verdict, max_duration >= timeout
+            ):
                 break
 
             if not run._prepare_nextpass(nextpass):
@@ -488,7 +490,7 @@ def close_io(stream: Optional[IO[bytes]]) -> None:
                 else:
                     tle_result.timeout_expired |= aborted
 
-            if not verdict and not run._continue_with_tle(verdict, aborted):
+            if not verdict != Verdict.ACCEPTED and not run._continue_with_tle(verdict, aborted):
                 break
 
             if not run._prepare_nextpass(nextpass):

bin/problem.py

@@ -36,6 +36,7 @@
     is_relative_to,
     is_uuid,
     log,
+    normalize_yaml_value,
     parse_yaml,
     PrintBar,
     ProgressBar,
@@ -67,14 +68,9 @@ def check_unknown_keys(yaml_data: dict[str, Any], sub_key: Optional[str] = None)
 
 def parse_optional_setting(yaml_data: dict[str, Any], key: str, t: type[T]) -> Optional[T]:
     if key in yaml_data:
-        value = yaml_data.pop(key)
-        if isinstance(value, int) and t is float:
-            value = float(value)
+        value = normalize_yaml_value(yaml_data.pop(key), t)
         if isinstance(value, t):
             return value
-        if value == "" and (t is list or t is dict):
-            # handle empty yaml keys
-            return t()
         warn(f"incompatible value for key '{key}' in problem.yaml. SKIPPED.")
     return None
 
@@ -221,7 +217,7 @@ def source_from_dict(source_dict: dict[str, str]) -> ProblemSource:
             self.append(source_from_dict(source))
             return
         if isinstance(yaml_data["source"], list):
-            sources = parse_setting(yaml_data, "source", list[dict[str, str]]())
+            sources = parse_setting(yaml_data, "source", list[Any]())
             for i, source in enumerate(sources):
                 if isinstance(source, str):
                     self.append(ProblemSource(source))

bin/run.py

@@ -197,7 +197,7 @@ def run(
             ):
                 self.out_path.unlink()
 
-        if result.verdict and (self.feedbackdir / "nextpass.in").is_file():
+        if result.verdict != Verdict.ACCEPTED and (self.feedbackdir / "nextpass.in").is_file():
             assert not self.problem.multi_pass
             bar.warn("Validator created nextpass.in for non multi-pass problem. Ignored.")
 

bin/util.py

@@ -267,9 +267,7 @@ def total_width(self) -> int:
             cols -= 1
         return cols
 
-    def bar_width(self) -> Optional[int]:
-        if self.item_width is None:
-            return None
+    def bar_width(self) -> int:
         return self.total_width() - len(self.prefix) - 2 - self.item_width
 
     def update(self, count: int, max_len: int) -> None:

bin/verdicts.py

@@ -498,7 +498,7 @@ def _print_tree(
             printed_text = ["\n\033[2K" * new_lines]
             printed_lengths += [0] * new_lines
 
-            max_depth = None
+            max_depth = config.args.depth
             show_root = False
 
             stack = [(".", "", "", True)]