Merge remote-tracking branch 'origin/develop'

runtimeverification · May 23, 2024 · 1fe98d8 · 1fe98d8
2 parents 3aefbbb + 5f974af
commit 1fe98d8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-4c6a57a37dad6658c9e04728bbd9a1aac87274ef
+e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6
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/4c6a57a37dad6658c9e04728bbd9a1aac87274ef";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6";
     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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4c6a57a37dad6658c9e04728bbd9a1aac87274ef
		e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6
+46 −6		booster/library/Booster/CLOptions.hs
+1 −1		booster/library/Booster/Definition/Ceil.hs
+14 −199		booster/library/Booster/JsonRpc.hs
+1 −1		booster/library/Booster/LLVM/Internal.hs
+27 −3		booster/library/Booster/Log/Context.hs
+22 −105		booster/library/Booster/Pattern/ApplyEquations.hs
+213 −88		booster/library/Booster/Pattern/Binary.hs
+11 −21		booster/library/Booster/Pattern/Rewrite.hs
+2 −8		booster/library/Booster/Util.hs
+0 −1		booster/test/rpc-integration/resources/log-simplify-json.kore
+4,671 −0		booster/test/rpc-integration/resources/log-simplify-json.kore
+7 −0		booster/test/rpc-integration/test-log-simplify-json/README.md
+80 −0		booster/test/rpc-integration/test-log-simplify-json/simplify-log.txt.golden
+1 −0		booster/test/rpc-integration/test-log-simplify-json/state.send
+39 −0		booster/test/rpc-integration/test-log-simplify-json/test.sh
+3 −11		booster/tools/booster/Proxy.hs
+9 −7		booster/tools/booster/Server.hs
+5 −5		booster/unit-tests/Test/Booster/Pattern/ApplyEquations.hs
+8 −6		dev-tools/booster-dev/Server.hs
+40 −27		dev-tools/kore-rpc-dev/Server.hs
+0 −6		kore-rpc-types/src/Kore/JsonRpc/Types.hs
+26 −76		kore/src/Kore/JsonRpc.hs
+3 −0		scripts/booster-integration-tests.sh