Merge remote-tracking branch 'origin/develop'

runtimeverification · Jun 4, 2024 · b58bb14 · b58bb14
2 parents d0123de + a8c5363
commit b58bb14
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-b6ab7a9054ae900c97c48e61027fd602dbd2acb8
+abceb59fcbc47d1bc537ff797f806c8bb8649626
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/b6ab7a9054ae900c97c48e61027fd602dbd2acb8";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/abceb59fcbc47d1bc537ff797f806c8bb8649626";
     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 @@
		b6ab7a9054ae900c97c48e61027fd602dbd2acb8
		abceb59fcbc47d1bc537ff797f806c8bb8649626
+3 −3		.github/workflows/release.yml
+10 −0		booster/library/Booster/CLOptions.hs
+1 −4		booster/library/Booster/Definition/Ceil.hs
+46 −80		booster/library/Booster/JsonRpc.hs
+17 −5		booster/library/Booster/Log.hs
+204 −309		booster/library/Booster/Pattern/ApplyEquations.hs
+2 −2		booster/library/Booster/Pattern/Match.hs
+21 −73		booster/library/Booster/Pattern/Rewrite.hs
+276 −179		booster/library/Booster/SMT/Interface.hs
+82 −31		booster/library/Booster/SMT/Runner.hs
+10 −2		booster/library/Booster/Util.hs
+17 −0		booster/test/rpc-integration/resources/non-linear-int-requires.k
+3 −0		booster/test/rpc-integration/resources/non-linear-int-requires.kompile
+16 −18		booster/test/rpc-integration/test-log-simplify-json/simplify-log.txt.golden
+1 −1		booster/test/rpc-integration/test-log-simplify-json/test.sh
+1 −0		booster/test/rpc-integration/test-non-linear-int-requires/README.md
+117 −0		booster/test/rpc-integration/test-non-linear-int-requires/response-init.json
+90 −0		booster/test/rpc-integration/test-non-linear-int-requires/state-init.execute
+107 −60		booster/tools/booster/Proxy.hs
+188 −194		booster/tools/booster/Server.hs
+3 −3		booster/unit-tests/Test/Booster/SMT/LowLevel.hs
+7 −5		dev-tools/booster-dev/Server.hs
+41 −0		dev-tools/count-aborts/Main.hs
+39 −0		dev-tools/count-aborts/Types.hs
+94 −82		dev-tools/kore-rpc-dev/Server.hs
+14 −0		dev-tools/package.yaml
+4 −2		docs/logging.md
+2 −5		kore-rpc-types/src/Kore/JsonRpc/Error.hs
+23 −40		kore-rpc-types/src/Kore/JsonRpc/Server.hs
+0 −640		kore/CHANGELOG.md
+0 −3		kore/kore.cabal
+0 −17		scripts/Count.hs
+8 −13		scripts/booster-analysis.sh
+1 −1		scripts/booster-integration-tests.sh