runtimeverification · geo2a · May 16, 2024 · May 7, 2024 · May 7, 2024 · May 7, 2024
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-88ef647ec106b3ba1612ea848a61ba3c2fd3f786
+b27210141c06c5698201dc3f1fabc90bd09ffe59
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/88ef647ec106b3ba1612ea848a61ba3c2fd3f786";
+    haskell-backend.url = "github:runtimeverification/haskell-backend/b27210141c06c5698201dc3f1fabc90bd09ffe59";
     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/pyk/kore/rpc.py b/pyk/src/pyk/kore/rpc.py
@@ -872,7 +872,7 @@ def from_dict(dct: Mapping[str, Any]) -> ImpliesResult:
         predicate = dct.get('condition', {}).get('predicate')
         logs = tuple(LogEntry.from_dict(l) for l in dct['logs']) if 'logs' in dct else ()
         return ImpliesResult(
-            valid=dct['satisfiable'],
+            valid=dct['valid'],
             implication=kore_term(dct['implication']),
             substitution=kore_term(substitution) if substitution is not None else None,
             predicate=kore_term(predicate) if predicate is not None else None,

diff --git a/pyk/src/tests/unit/kore/test_client.py b/pyk/src/tests/unit/kore/test_client.py
@@ -178,7 +178,7 @@ def test_execute(
         int_bottom,
         int_top,
         {'antecedent': kore(int_bottom), 'consequent': kore(int_top)},
-        {'satisfiable': True, 'implication': kore(int_top)},
+        {'valid': True, 'implication': kore(int_top)},
         ImpliesResult(True, int_top, None, None, ()),
     ),
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		88ef647ec106b3ba1612ea848a61ba3c2fd3f786
		b27210141c06c5698201dc3f1fabc90bd09ffe59
+29 −0		booster/library/Booster/CLOptions.hs
+126 −7		booster/library/Booster/JsonRpc.hs
+12 −10		booster/library/Booster/JsonRpc/Utils.hs
+1 −6		booster/library/Booster/Log.hs
+72 −32		booster/library/Booster/Pattern/ApplyEquations.hs
+41 −33		booster/library/Booster/Pattern/Match.hs
+7 −14		booster/library/Booster/Pattern/Rewrite.hs
+8 −6		booster/library/Booster/Syntax/ParsedKore/Internalise.hs
+3 −0		booster/package.yaml
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-006.json
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-008.json
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-010.json
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-012.json
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-014.json
+1 −1		booster/test/rpc-integration/test-foundry-bug-report/response-016.json
+277 −270		booster/test/rpc-integration/test-log-simplify-json/simplify-log.txt.golden
+19 −3		booster/tools/booster/Proxy.hs
+47 −30		booster/tools/booster/Server.hs
+61 −21		booster/tools/rpc-client/RpcClient.hs
+513 −0		booster/unit-tests/Test/Booster/Pattern/MatchImplies.hs
+84 −68		dev-tools/kore-rpc-dev/Server.hs
+1 −0		dev-tools/package.yaml
+5 −2		docs/2022-07-18-JSON-RPC-Server-API.md
+1 −0		flake.nix
+2 −0		kore-rpc-types/kore-rpc-types.cabal
+4 −3		kore-rpc-types/src/Kore/JsonRpc/Types.hs
+30 −0		kore-rpc-types/src/Kore/Util.hs
+2 −2		kore/app/rpc/Main.hs
+2 −0		kore/kore.cabal
+48 −16		kore/src/Kore/Equation/DebugEquation.hs
+21 −15		kore/src/Kore/JsonRpc.hs
+59 −159		kore/src/Kore/Log.hs
+159 −0		kore/src/Kore/Log/BoosterAdaptor.hs
+2 −3		kore/src/Kore/Log/DebugAppliedRewriteRules.hs
+1 −0		kore/src/Kore/Log/DebugAttemptUnification.hs
+46 −3		kore/src/Kore/Log/DebugAttemptedRewriteRules.hs
+26 −0		kore/src/Kore/Log/DebugContext.hs
+5 −15		kore/src/Kore/Log/KoreLogOptions.hs
+2 −0		kore/src/Kore/Log/Registry.hs
+1 −1		kore/src/Kore/Repl/State.hs
+30 −24		kore/src/Kore/Rewrite/Step.hs
+4 −0		kore/src/Log/Entry.hs
+4 −0		kore/test/Test/Kore/Rewrite/RewriteStep.hs
+1 −1		scripts/booster-integration-tests.sh
+34 −10		scripts/performance-tests-kevm.sh
+24 −5		scripts/performance-tests-kontrol.sh
+1 −1		test/rpc-server/implies/implied-substitution/response.golden
+1 −1		test/rpc-server/implies/implied-trivial/response.golden
+1 −1		test/rpc-server/implies/not-implied-stuck/response.golden
+1 −1		test/rpc-server/implies/not-implied/response.golden