diff --git a/deps/k_release b/deps/k_release index 66af7ef4c..0b2b6b7dd 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.0.97 +7.0.103 diff --git a/flake.lock b/flake.lock index d99d865b9..bd9c3e16e 100644 --- a/flake.lock +++ b/flake.lock @@ -82,17 +82,17 @@ "z3": "z3" }, "locked": { - "lastModified": 1716472952, - "narHash": "sha256-po4boMu90ofZW7sEpjltscPAIqMKok8teKjic/nd7Wk=", + "lastModified": 1717048155, + "narHash": "sha256-HHrXt2UoG1RbKmAGmOroQJjUbyiE+6c1dJxqoIfp3H0=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "6e195d1cdd2e3f56389521a23d28125edc607c6e", + "rev": "b6ab7a9054ae900c97c48e61027fd602dbd2acb8", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "6e195d1cdd2e3f56389521a23d28125edc607c6e", + "rev": "b6ab7a9054ae900c97c48e61027fd602dbd2acb8", "type": "github" } }, @@ -126,16 +126,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1716842546, - "narHash": "sha256-Nq/uP5bilDhDd29dQsVfnWama4ir+AD2j5YNO6I7YpM=", + "lastModified": 1717095746, + "narHash": "sha256-5RBtEa/zw+6aBKeNhaZQ5/nH/851L8HCbimK8jDVAeE=", "owner": "runtimeverification", "repo": "k", - "rev": "791b8fa2dc96437e96a8110203bc60f514b9f43c", + "rev": "49d9d0a01428fca998cef4cefefc3146aa787f94", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.97", + "ref": "v7.0.103", "repo": "k", "type": "github" } @@ -314,17 +314,17 @@ }, "locked": { "dir": "pyk", - "lastModified": 1716842546, - "narHash": "sha256-Nq/uP5bilDhDd29dQsVfnWama4ir+AD2j5YNO6I7YpM=", + "lastModified": 1717095746, + "narHash": "sha256-5RBtEa/zw+6aBKeNhaZQ5/nH/851L8HCbimK8jDVAeE=", "owner": "runtimeverification", "repo": "k", - "rev": "791b8fa2dc96437e96a8110203bc60f514b9f43c", + "rev": "49d9d0a01428fca998cef4cefefc3146aa787f94", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.97", + "ref": "v7.0.103", "repo": "k", "type": "github" } diff --git a/flake.nix b/flake.nix index 6562101c3..6c83d4eac 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = " A flake for KMIR Semantics"; inputs = { - k-framework.url = "github:runtimeverification/k/v7.0.97"; + k-framework.url = "github:runtimeverification/k/v7.0.103"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.follows = "k-framework/rv-utils"; - pyk.url = "github:runtimeverification/k/v7.0.97?dir=pyk"; + pyk.url = "github:runtimeverification/k/v7.0.103?dir=pyk"; nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; }; diff --git a/kmir/poetry.lock b/kmir/poetry.lock index c1ce9040a..3f08914c0 100644 --- a/kmir/poetry.lock +++ b/kmir/poetry.lock @@ -649,7 +649,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "7.0.97" +version = "7.0.103" description = "" category = "main" optional = false @@ -671,8 +671,8 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/k.git" -reference = "v7.0.97" -resolved_reference = "791b8fa2dc96437e96a8110203bc60f514b9f43c" +reference = "v7.0.103" +resolved_reference = "49d9d0a01428fca998cef4cefefc3146aa787f94" subdirectory = "pyk" [[package]] name = "pyperclip" @@ -912,4 +912,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "1e57f08ef495b8947a7d1c51c057f3a6c580ceefa4ca92842923a8b9289001a3" +content-hash = "f583d1886cbc08497b9a3bf0bb8c51f1328dec780495961309020c1ba952d953" diff --git a/kmir/pyproject.toml b/kmir/pyproject.toml index 5b969738e..8ce9ebc35 100644 --- a/kmir/pyproject.toml +++ b/kmir/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kmir" -version = "0.2.56" +version = "0.2.57" description = "" authors = [ "Runtime Verification, Inc. ", @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" filelock = "3.9.0" -pyk = { git = "https://github.com/runtimeverification/k.git", tag = "v7.0.97", subdirectory = "pyk" } +pyk = { git = "https://github.com/runtimeverification/k.git", tag = "v7.0.103", subdirectory = "pyk" } pytest-timeout = "2.1.0" [tool.poetry.group.dev.dependencies] diff --git a/kmir/src/kmir/__init__.py b/kmir/src/kmir/__init__.py index 6ad6d9007..09420010b 100644 --- a/kmir/src/kmir/__init__.py +++ b/kmir/src/kmir/__init__.py @@ -2,4 +2,4 @@ from .kmir import KMIR -VERSION: Final = '0.2.56' +VERSION: Final = '0.2.57' diff --git a/kmir/src/kmir/semantics.py b/kmir/src/kmir/semantics.py index b22946eac..3c5b88a6d 100644 --- a/kmir/src/kmir/semantics.py +++ b/kmir/src/kmir/semantics.py @@ -5,6 +5,7 @@ from pyk.kast.inner import KApply, KInner, KSequence, KVariable # from pyk.kcfg import KCFGExplore # kcfg.__init__, import Semantics +from pyk.kcfg.kcfg import KCFGExtendResult from pyk.kcfg.semantics import KCFGSemantics from pyk.prelude.k import K @@ -46,6 +47,9 @@ def extract_branches(self, cterm: CTerm) -> list[KInner]: def same_loop(self, cterm1: CTerm, cterm2: CTerm) -> bool: return False + def custom_step(self, c: CTerm) -> KCFGExtendResult | None: + return None + def abstract_node(self, cterm: CTerm) -> CTerm: return cterm diff --git a/package/version b/package/version index df8332cdc..94b83d8e0 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.2.56 +0.2.57