From d7647ea8423917e72e1e0a78ed72142ad79b643b Mon Sep 17 00:00:00 2001 From: Jah Date: Sun, 13 Oct 2024 19:12:01 +0800 Subject: [PATCH 1/2] fix wrong type annotations for KCFG.NDBranch --- pyk/src/pyk/kcfg/kcfg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyk/src/pyk/kcfg/kcfg.py b/pyk/src/pyk/kcfg/kcfg.py index 8d4c5a39c8..d84f6ccd0a 100644 --- a/pyk/src/pyk/kcfg/kcfg.py +++ b/pyk/src/pyk/kcfg/kcfg.py @@ -436,7 +436,7 @@ def replace_target(self, node: KCFG.Node) -> KCFG.NDBranch: _merged_edges: dict[int, MergedEdge] _covers: dict[int, Cover] _splits: dict[int, Split] - _ndbranches: dict[int, NDBranch] + _ndbranches: dict[int, KCFG.NDBranch] _aliases: dict[str, int] _lock: RLock @@ -1063,7 +1063,7 @@ def create_split_by_nodes(self, source_id: NodeIdLike, target_ids: Iterable[Node return None return self.create_split(source.id, zip(target_ids, csubsts, strict=True)) - def ndbranches(self, *, source_id: NodeIdLike | None = None, target_id: NodeIdLike | None = None) -> list[NDBranch]: + def ndbranches(self, *, source_id: NodeIdLike | None = None, target_id: NodeIdLike | None = None) -> list[KCFG.NDBranch]: source_id = self._resolve(source_id) if source_id is not None else None target_id = self._resolve(target_id) if target_id is not None else None return [ @@ -1072,7 +1072,7 @@ def ndbranches(self, *, source_id: NodeIdLike | None = None, target_id: NodeIdLi if (source_id is None or source_id == b.source.id) and (target_id is None or target_id in b.target_ids) ] - def contains_ndbranch(self, ndbranch: NDBranch) -> bool: + def contains_ndbranch(self, ndbranch: KCFG.NDBranch) -> bool: return ndbranch in self._ndbranches def create_ndbranch( From 7314358b1c6c4e89736477497e8647f3e43ea722 Mon Sep 17 00:00:00 2001 From: Jah Date: Wed, 16 Oct 2024 01:49:30 +0800 Subject: [PATCH 2/2] format --- pyk/src/pyk/kcfg/kcfg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyk/src/pyk/kcfg/kcfg.py b/pyk/src/pyk/kcfg/kcfg.py index d84f6ccd0a..949234df93 100644 --- a/pyk/src/pyk/kcfg/kcfg.py +++ b/pyk/src/pyk/kcfg/kcfg.py @@ -1063,7 +1063,9 @@ def create_split_by_nodes(self, source_id: NodeIdLike, target_ids: Iterable[Node return None return self.create_split(source.id, zip(target_ids, csubsts, strict=True)) - def ndbranches(self, *, source_id: NodeIdLike | None = None, target_id: NodeIdLike | None = None) -> list[KCFG.NDBranch]: + def ndbranches( + self, *, source_id: NodeIdLike | None = None, target_id: NodeIdLike | None = None + ) -> list[KCFG.NDBranch]: source_id = self._resolve(source_id) if source_id is not None else None target_id = self._resolve(target_id) if target_id is not None else None return [