Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Update dependency: deps/k_release #634

Merged
merged 10 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/k_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.69
6.0.87
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.436
0.1.437
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pyk"
version = "0.1.436"
version = "0.1.437"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion src/pyk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
from typing import Final


K_VERSION: Final = '6.0.69'
K_VERSION: Final = '6.0.87'
6 changes: 5 additions & 1 deletion src/pyk/cterm.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ def _is_bottom(kast: KInner) -> bool:
flat = flatten_label('#And', kast)
if len(flat) == 1:
return is_bottom(single(flat))
return all(CTerm._is_bottom(term) for term in flat)
return any(CTerm._is_bottom(term) for term in flat)

@property
def is_bottom(self) -> bool:
return CTerm._is_bottom(self.config) or any(CTerm._is_bottom(cterm) for cterm in self.constraints)

@staticmethod
def _constraint_sort_key(term: KInner) -> tuple[int, str]:
Expand Down
1 change: 1 addition & 0 deletions src/pyk/kcfg/explore.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def cterm_execute(
next_state = CTerm.from_kast(self.kprint.kore_to_kast(er.state.kore))
_next_states = er.next_states if er.next_states is not None else []
next_states = [CTerm.from_kast(self.kprint.kore_to_kast(ns.kore)) for ns in _next_states]
next_states = [cterm for cterm in next_states if not cterm.is_bottom]
Copy link
Collaborator

@tothtamas28 tothtamas28 Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine for a hotfix. @PetarMax, please open an issue for dropping it (or perhaps replacing it for an assertion) once runtimeverification/haskell-backend#3650 makes it's way through the pipeline.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if len(next_states) == 1 and len(next_states) < len(_next_states):
return depth + 1, next_states[0], [], er.logs
elif len(next_states) == 1:
Expand Down