Merge branch 'develop' into syntactic

runtimeverification · Aug 22, 2024 · 461c8ad · 461c8ad
2 parents 5f94ebe + 16b1b15
commit 461c8ad
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-v0.1.67
+v0.1.76
diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release
@@ -1 +1 @@
-0.1.77
+0.1.81
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "K Framework";
   inputs = {
-    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.77";
+    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.81";
     haskell-backend = {
-      url = "github:runtimeverification/haskell-backend/v0.1.67";
+      url = "github:runtimeverification/haskell-backend/v0.1.76";
       inputs.rv-utils.follows = "llvm-backend/rv-utils";
       inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
     };

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
+1 −14		booster/library/Booster/Definition/Base.hs
+2 −2		booster/library/Booster/Definition/Ceil.hs
+13 −128		booster/library/Booster/JsonRpc.hs
+9 −3		booster/library/Booster/JsonRpc/Utils.hs
+105 −78		booster/library/Booster/Pattern/ApplyEquations.hs
+261 −0		booster/library/Booster/Pattern/Implies.hs
+2 −1		booster/library/Booster/Pattern/Match.hs
+75 −52		booster/library/Booster/Pattern/Rewrite.hs
+5 −1		booster/library/Booster/Pattern/Util.hs
+55 −16		booster/library/Booster/SMT/Interface.hs
+4 −4		booster/library/Booster/SMT/Translate.hs
+15 −0		booster/library/Booster/Syntax/Json/Externalise.hs
+83 −14		booster/library/Booster/Syntax/Json/Internalise.hs
+106 −269		booster/library/Booster/Syntax/ParsedKore/Internalise.hs
+1 −1		booster/package.yaml
+5 −5		booster/test/internalisation/imp.k
+1,031 −1,266		booster/test/internalisation/imp.kore
+123 −115		booster/test/internalisation/imp.kore.report
+29,696 −19,988		booster/test/internalisation/test-totalSupply-definition.kore
+2,772 −2,216		booster/test/internalisation/test-totalSupply-definition.kore.report
+0 −2		booster/test/llvm-integration/LLVM.hs
+0 −0		booster/test/rpc-integration/resources/implies-issue-3941.haskell.kore
+1 −0		booster/test/rpc-integration/resources/implies-issue-3941.kompile
+69,195 −0		booster/test/rpc-integration/resources/implies-issue-3941.llvm.kore
+2 −1		booster/test/rpc-integration/resources/kompile-from-double-definition.sh
+263 −257		booster/test/rpc-integration/resources/module-addition.kore
+4 −0		booster/test/rpc-integration/test-implies-issue-3941/README.md
+3,969 −5		booster/test/rpc-integration/test-implies-issue-3941/response-001.booster-dev
+62 −0		booster/test/rpc-integration/test-implies/response-0->B.json
+0 −25		booster/test/rpc-integration/test-implies/response-0->T.booster-dev
+62 −0		booster/test/rpc-integration/test-implies/response-B->0.json
+11 −0		booster/test/rpc-integration/test-implies/response-T->0.booster-dev
+14 −0		booster/test/rpc-integration/test-implies/response-T->0.json
+32 −6		booster/test/rpc-integration/test-implies/response-X->0.booster-dev
+0 −25		booster/test/rpc-integration/test-implies/response-X->T.booster-dev
+8 −90		booster/test/rpc-integration/test-implies/response-fail-X->Y.booster-dev
+16 −1		booster/test/rpc-integration/test-implies/response-fail-X->Y.json
+1 −0		booster/test/rpc-integration/test-implies/state-0->B.send
+32 −0		booster/test/rpc-integration/test-implies/state-B->0.send
+32 −0		booster/test/rpc-integration/test-implies/state-T->0.send
+34 −39		booster/test/rpc-integration/test-implies2/README.md
+0 −530		booster/test/rpc-integration/test-implies2/response-antecedent-bottom.booster-dev
+0 −416		booster/test/rpc-integration/test-implies2/response-constant-subst.booster-dev
+0 −380		booster/test/rpc-integration/test-implies2/response-variable-subst.booster-dev
+9 −2		booster/tools/booster/Proxy.hs
+4 −1		booster/tools/booster/Server.hs
+0 −1		booster/unit-tests/Test/Booster/Fixture.hs
+15 −35		booster/unit-tests/Test/Booster/Pattern/Rewrite.hs
+3 −6		booster/unit-tests/Test/Booster/Syntax/Json/Internalise.hs
+1 −1		deps/k_release
+2 −0		dev-tools/kore-rpc-dev/Server.hs
+1 −1		dev-tools/package.yaml
+5 −1		dev-tools/pretty/Pretty.hs
+25 −17		docs/2022-07-18-JSON-RPC-Server-API.md
+1 −1		kore-rpc-types/kore-rpc-types.cabal
+3 −1		kore/app/share/GlobalMain.hs
+2 −1		kore/kore.cabal
+23 −10		kore/src/Kore/Rewrite/SMT/Evaluator.hs
+10 −0		kore/src/Options/SMT.hs
+30 −0		kore/src/SMT/Utils.hs
+2 −1		kore/test/Test/Kore/Rewrite/SMT/Evaluator.hs
+1 −1		package/debian/changelog
+1 −1		package/version
+2 −2		scripts/performance-tests-kevm.sh
+2 −2		scripts/performance-tests-kontrol.sh
+1 −0		bin/llvm-kompile-clang
+0 −2		include/kllvm/binary/ProofTraceParser.h
+0 −255		include/kllvm/binary/deserializer.h
+0 −69		include/kllvm/binary/ringbuffer.h
+0 −36		include/kllvm/binary/serializer.h
+2 −0		include/kllvm/codegen/CreateTerm.h
+25 −0		include/runtime/timer.h
+0 −1		lib/binary/CMakeLists.txt
+0 −19		lib/binary/ProofTraceParser.cpp
+0 −75		lib/binary/ringbuffer.cpp
+0 −49		lib/binary/serializer.cpp
+15 −1		lib/codegen/CreateTerm.cpp
+3 −1		lib/codegen/Decision.cpp
+1 −1		package/debian/changelog
+1 −1		package/version
+1 −0		runtime/CMakeLists.txt
+33 −0		runtime/collections/hash.cpp
+22 −0		runtime/collections/kelemle.cpp
+1 −11		runtime/main/main.ll
+8 −0		runtime/timer/CMakeLists.txt
+25 −0		runtime/timer/timer.cpp
+2 −53		runtime/util/finish_rewriting.cpp
+2,674 −0		test/defn/hash-mint.kore
+0 −1		test/defn/imp-sum-slow.kore
+0 −1		test/defn/imp-sum.kore
+0 −1		test/defn/imp.kore
+17 −0		test/defn/k-files/hash-mint.k
+6 −0		test/defn/k-files/sret-demotion.k
+0 −1		test/defn/kool-static.kore
+2,417 −0		test/defn/sret-demotion.kore
+1 −0		test/input/hash-mint.in
+0 −37		test/lit.cfg.py
+1 −0		test/output/hash-mint.out.diff
+0 −1		test/proof/add-rewrite.kore
+0 −1		test/proof/arith.kore
+0 −1		test/proof/assoc-function.kore
+0 −1		test/proof/builtin-functions.kore
+0 −1		test/proof/builtin-hook-events.kore
+0 −1		test/proof/builtin-int.kore
+0 −1		test/proof/builtin-io.kore
+0 −1		test/proof/builtin-json.kore
+0 −1		test/proof/cast.kore
+0 −1		test/proof/cell-collection.kore
+0 −1		test/proof/cell-value.kore
+0 −1		test/proof/concurrent-counters.kore
+0 −1		test/proof/conditional-function.kore
+0 −1		test/proof/custom-klabel-fun.kore
+0 −1		test/proof/decrement-int.kore
+0 −1		test/proof/decrement.kore
+0 −1		test/proof/double-rewrite.kore
+0 −1		test/proof/dv.kore
+0 −1		test/proof/exit-cell.kore
+0 −1		test/proof/fresh-gen.kore
+0 −1		test/proof/fun-context.kore
+0 −1		test/proof/imp.kore
+0 −1		test/proof/imp5-rw-literal.kore
+0 −1		test/proof/imp5-rw-succ.kore
+0 −1		test/proof/imp5.kore
+0 −1		test/proof/injections.kore
+0 −1		test/proof/is-zero.kore
+0 −1		test/proof/lambda-explicit-subst.kore
+0 −1		test/proof/let.kore
+0 −1		test/proof/list-assoc.kore
+0 −1		test/proof/list-cons.kore
+0 −1		test/proof/list-factory.kore
+0 −1		test/proof/list-semantic.kore
+0 −1		test/proof/macro.kore
+0 −1		test/proof/map-fun.kore
+0 −1		test/proof/memo-function.kore
+0 −1		test/proof/modular-config.kore
+0 −1		test/proof/nested-cells.kore
+0 −1		test/proof/non-rec-function.kore
+0 −1		test/proof/pcf.kore
+0 −1		test/proof/peano.kore
+0 −1		test/proof/prioritized-rule.kore
+0 −1		test/proof/projection.kore
+0 −1		test/proof/reg.kore
+0 −1		test/proof/set-fun.kore
+0 −1		test/proof/simple.kore
+0 −1		test/proof/single-rewrite.kore
+0 −1		test/proof/sum-cell.kore
+0 −1		test/proof/tree-reverse-int.kore
+0 −1		test/proof/tree-reverse.kore
+0 −1		test/proof/two-counters.kore
+0 −1		test/proof/type-cast.kore
+0 −1		tools/CMakeLists.txt
+0 −7		tools/kore-proof-trace-shm-writer/CMakeLists.txt
+0 −92		tools/kore-proof-trace-shm-writer/main.cpp
+0 −93		tools/kore-proof-trace/main.cpp
+0 −1		unittests/compiler/CMakeLists.txt
+0 −79		unittests/compiler/ringbuffer.cpp