Merge remote-tracking branch 'origin/develop'

runtimeverification · Dec 7, 2023 · 1f0c905 · 1f0c905
2 parents 50775ee + 23412b2
commit 1f0c905
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release
@@ -1 +1 @@
-5294940d0f5a58a685b0f30934ed8fdb5dd3fa14
+7fa64107dbe26453024e5210d441b7999ef31f0b
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "K Framework";
   inputs = {
-    haskell-backend.url = "github:runtimeverification/haskell-backend/0be07d293a1167615ef9342bb1820350f794e893";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/a5847301404583e16d55cd4d051b8e605d704fbc";
     booster-backend = {
-      url = "github:runtimeverification/hs-backend-booster/5294940d0f5a58a685b0f30934ed8fdb5dd3fa14";
+      url = "github:runtimeverification/hs-backend-booster/7fa64107dbe26453024e5210d441b7999ef31f0b";
       inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
       inputs.haskell-backend.follows = "haskell-backend";
       inputs.stacklock2nix.follows = "haskell-backend/stacklock2nix";

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5294940d0f5a58a685b0f30934ed8fdb5dd3fa14
		7fa64107dbe26453024e5210d441b7999ef31f0b
+1 −1		test/issue-3508/definition.kore
+1 −1		test/regression-c/test-smoke-definition.kore
+12 −30		README.md
+2 −2		cabal.project
+1 −1		deps/haskell-backend_release
+68 −25		dev-tools/kore-rpc-dev/Server.hs
+13 −0		dev-tools/package.yaml
+42 −0		dev-tools/pretty/Pretty.hs
+4 −4		flake.lock
+8 −3		flake.nix
+51 −7		library/Booster/CLOptions.hs
+7 −3		library/Booster/JsonRpc.hs
+19 −11		library/Booster/Pattern/ApplyEquations.hs
+14 −5		library/Booster/Pattern/Rewrite.hs
+12 −4		library/Booster/SMT/Base.hs
+37 −11		library/Booster/SMT/Interface.hs
+4 −4		library/Booster/SMT/LowLevelCodec.hs
+21 −5		library/Booster/SMT/Runner.hs
+27 −6		library/Booster/SMT/Translate.hs
+1 −1		scripts/integration-tests.sh
+1 −1		scripts/performance-tests-kevm.sh
+1 −1		scripts/performance-tests-kontrol.sh
+1 −1		stack.yaml
+4 −4		stack.yaml.lock
+26 −0		test/rpc-integration/resources/equalK-conditions.k
+2,128 −0		test/rpc-integration/resources/equalK-conditions.kore
+5 −356		test/rpc-integration/test-diamond/response-infeasible-branching.booster-dev
+6 −25		test/rpc-integration/test-equalK-conditions/response-a.json
+81 −0		test/rpc-integration/test-equalK-conditions/response-c.json
+1 −0		test/rpc-integration/test-equalK-conditions/state-a.execute
+71 −0		test/rpc-integration/test-equalK-conditions/state-a.json
+1 −0		test/rpc-integration/test-equalK-conditions/state-c.execute
+71 −0		test/rpc-integration/test-equalK-conditions/state-c.json
+168 −0		test/rpc-integration/test-substitutions/response-concrete-substitution.booster-dev
+1 −1		test/rpc-integration/test-substitutions/response-concrete-substitution.json
+168 −0		test/rpc-integration/test-substitutions/response-symbolic-substitution.booster-dev
+1 −1		test/rpc-integration/test-substitutions/response-symbolic-substitution.json
+58 −115		test/rpc-integration/test-vacuous/response-vacuous-at-branch.json
+138 −144		test/rpc-integration/test-vacuous/response-vacuous-but-rewritten.json
+83 −162		test/rpc-integration/test-vacuous/response-vacuous-var-at-branch.json
+138 −144		test/rpc-integration/test-vacuous/response-vacuous-without-rewrite.json
+80 −73		tools/booster/Proxy.hs
+60 −28		tools/booster/Server.hs
+8 −5		unit-tests/Test/Booster/Pattern/ApplyEquations.hs
+14 −14		unit-tests/Test/Booster/SMT/LowLevel.hs