Merge remote-tracking branch 'origin/develop'

runtimeverification · May 21, 2024 · aedda42 · aedda42
2 parents 66bdb5c + e7adeff
commit aedda42
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-b27210141c06c5698201dc3f1fabc90bd09ffe59
+4c6a57a37dad6658c9e04728bbd9a1aac87274ef
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/b27210141c06c5698201dc3f1fabc90bd09ffe59";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/4c6a57a37dad6658c9e04728bbd9a1aac87274ef";
     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/src/tests/integration/kore/test_kore_client.py b/pyk/src/tests/integration/kore/test_kore_client.py
@@ -1012,8 +1012,7 @@ def test_add_module_with_hash_name_as_id_second_fails(self, kore_client: KoreCli
     {'interim_simplification': 3},
     {'no_post_exec_simpify': True},
     {'log_context': ['booster*']},
-    {'not_log_context': ['*detail']},
-    {'log_context': ['kore*', '*success*'], 'not_log_context': ['*constraint*', '*simplify*']},
+    {'log_context': ['kore*', '!detail']},
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b27210141c06c5698201dc3f1fabc90bd09ffe59
		4c6a57a37dad6658c9e04728bbd9a1aac87274ef
+3 −13		booster/library/Booster/CLOptions.hs
+5 −0		booster/library/Booster/Definition/Attributes/Base.hs
+6 −1		booster/library/Booster/Definition/Ceil.hs
+1 −1		booster/library/Booster/JsonRpc.hs
+81 −40		booster/library/Booster/Log.hs
+81 −0		booster/library/Booster/Log/Context.hs
+25 −11		booster/library/Booster/Pattern/ApplyEquations.hs
+22 −7		booster/library/Booster/Pattern/Rewrite.hs
+2 −0		booster/library/Booster/SMT/Interface.hs
+0 −1		booster/package.yaml
+0 −7		booster/test/rpc-integration/test-log-simplify-json/README.md
+0 −33,801		booster/test/rpc-integration/test-log-simplify-json/simplify-log.txt.golden
+0 −1		booster/test/rpc-integration/test-log-simplify-json/state-002.send
+0 −39		booster/test/rpc-integration/test-log-simplify-json/test.sh
+8 −5		booster/tools/booster/Proxy.hs
+107 −57		booster/tools/booster/Server.hs
+8 −6		booster/tools/rpc-client/RpcClient.hs
+1 −2		cabal.project
+1 −1		deps/k_release
+23 −18		dev-tools/booster-dev/Server.hs
+4 −4		dev-tools/package.yaml
+52 −16		docs/logging.md
+4 −0		kore-rpc-types/src/Kore/JsonRpc/Types.hs
+0 −14		kore-rpc-types/src/Kore/Util.hs
+130 −49		kore/src/Kore/Equation/DebugEquation.hs
+21 −16		kore/src/Kore/JsonRpc.hs
+36 −19		kore/src/Kore/Log/BoosterAdaptor.hs
+4 −5		kore/src/Kore/Log/DebugAttemptedRewriteRules.hs
+4 −1		kore/src/Kore/Log/DebugContext.hs
+23 −2		kore/src/Kore/Log/DecidePredicateUnknown.hs
+2 −0		kore/src/Kore/Log/Registry.hs
+2 −1		kore/src/Kore/Rewrite/Function/Evaluator.hs
+7 −5		kore/src/Kore/Rewrite/SMT/Evaluator.hs
+7 −3		kore/src/Log.hs
+7 −3		kore/src/Log/Entry.hs
+0 −3		scripts/booster-integration-tests.sh
+7 −3		scripts/performance-tests-kontrol.sh