Merge branch 'develop' into refactor-proof-from-modules

runtimeverification · Jun 20, 2024 · 3abe98a · 3abe98a
2 parents ea96ae7 + 6126739
commit 3abe98a
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 423 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-v0.1.10
+v0.1.14
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "K Framework";
   inputs = {
-    haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.10";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/v0.1.14";
     nixpkgs.follows = "llvm-backend/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
     llvm-backend = {

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/pyk/docs/generate.sh b/pyk/docs/generate.sh
@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-SPHINX_VERSION=7.2.6
+SPHINX_VERSION=7.3.7
 
 DOCS_DIR=$(realpath $(dirname $0))
 API_DIR=$DOCS_DIR/api

diff --git a/pyk/flake.lock b/pyk/flake.lock
diff --git a/pyk/flake.nix b/pyk/flake.nix
@@ -2,8 +2,7 @@
   description = "Application packaged using poetry2nix";
 
   inputs = {
-    rv-utils.url = "github:runtimeverification/rv-nix-tools";
-    nixpkgs.follows = "rv-utils/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs";
     poetry2nix = {
       url =
         "github:nix-community/poetry2nix/626111646fe236cb1ddc8191a48c75e072a82b7c";
@@ -12,7 +11,7 @@
     flake-utils.follows = "poetry2nix/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, rv-utils, poetry2nix }:
+  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
     {
       # Nixpkgs overlay providing the application
       overlay = final: prev:

diff --git a/pyk/poetry.lock b/pyk/poetry.lock
diff --git a/pyk/src/pyk/proof/parallel.py b/pyk/src/pyk/proof/parallel.py
diff --git a/pyk/src/tests/integration/kore/test_kore_client.py b/pyk/src/tests/integration/kore/test_kore_client.py
@@ -112,16 +112,20 @@ def state(n: int) -> State:
                     term=term(3),
                     rule_id='ae0c978867ef4cc5cbfbadf7be2ff55e30e59465697ceaffa1d9fd5343a21fc6',
                     rule_substitution={
-                        EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar("Var'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL),
-                        EVar('K', SORT_K): EVar("Var'Unds'DotVar1", SORT_K),
+                        EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar(
+                            "RuleVar'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL
+                        ),
+                        EVar('K', SORT_K): EVar("RuleVar'Unds'DotVar1", SORT_K),
                     },
                 ),
                 State(
                     term=term(4),
                     rule_id='37a544ff4b6da9b4fb839f86d2ad51b770bcaf3dd578b716c38cf0da33458374',
                     rule_substitution={
-                        EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar("Var'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL),
-                        EVar('K', SORT_K): EVar("Var'Unds'DotVar1", SORT_K),
+                        EVar('GCC', SORT_GENERATED_COUNTER_CELL): EVar(
+                            "RuleVar'Unds'DotVar0", SORT_GENERATED_COUNTER_CELL
+                        ),
+                        EVar('K', SORT_K): EVar("RuleVar'Unds'DotVar1", SORT_K),
                     },
                 ),
             ),
+1 −1		.github/workflows/test.yml
+2 −2		booster/library/Booster/CLOptions.hs
+3 −10		booster/library/Booster/Syntax/Json/Internalise.hs
+1 −1		booster/package.yaml
+10,966 −2		booster/test/rpc-integration/test-3934-smt/response-008.json
+4 −4		booster/test/rpc-integration/test-a-to-f/response-branching.json
+4 −4		booster/test/rpc-integration/test-a-to-f/response-branching.kore-rpc-dev
+173 −138		booster/test/rpc-integration/test-issue3764-vacuous-branch/response-branch-after-one.json
+173 −138		booster/test/rpc-integration/test-issue3764-vacuous-branch/response-branch-in-zero.json
+1 −1		dev-tools/package.yaml
+1 −1		kore-rpc-types/kore-rpc-types.cabal
+1 −1		kore/kore.cabal
+10 −2		kore/src/Kore/JsonRpc.hs
+19 −9		kore/src/Kore/Rewrite/RewriteStep.hs
+1 −1		kore/src/Kore/Rewrite/RewritingVariable.hs
+1 −1		package/version
+1 −1		test/rpc-server/execute/branching-prune-unsat-remainder/response.golden
+6 −6		test/rpc-server/execute/branching/definition.kore
+1 −1		test/rpc-server/execute/branching/response.golden
+1 −1		test/rpc-server/execute/branching/state.json