Merge branch 'develop' into fix-intellij-errors

runtimeverification · Dec 13, 2023 · 881e8bd · 881e8bd
2 parents e636cfb + 8528219
commit 881e8bd
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 11 deletions.
diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release
@@ -1 +1 @@
-9469f18e3546aa4d7a77b661ed3025572b770bba
+83c33a579af27bb5183d733dd4adc85b1db304ec
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
   inputs = {
     haskell-backend.url = "github:runtimeverification/haskell-backend/a5847301404583e16d55cd4d051b8e605d704fbc";
     booster-backend = {
-      url = "github:runtimeverification/hs-backend-booster/9469f18e3546aa4d7a77b661ed3025572b770bba";
+      url = "github:runtimeverification/hs-backend-booster/83c33a579af27bb5183d733dd4adc85b1db304ec";
       inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
       inputs.haskell-backend.follows = "haskell-backend";
       inputs.stacklock2nix.follows = "haskell-backend/stacklock2nix";

diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster
diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9469f18e3546aa4d7a77b661ed3025572b770bba
		83c33a579af27bb5183d733dd4adc85b1db304ec
+1 −1		deps/k_release
+18 −13		dev-tools/booster-dev/Server.hs
+2 −0		dev-tools/package.yaml
+15 −12		dev-tools/parsetest/Parsetest.hs
+1 −2		library/Booster/Definition/Attributes/Base.hs
+32 −0		library/Booster/Definition/Base.hs
+210 −0		library/Booster/Definition/Ceil.hs
+25 −37		library/Booster/Definition/Util.hs
+6 −0		library/Booster/Pattern/ApplyEquations.hs
+5 −69		library/Booster/Pattern/Base.hs
+11 −3		library/Booster/Pattern/Binary.hs
+23 −1		library/Booster/Pattern/Bool.hs
+97 −2		library/Booster/Syntax/ParsedKore/Internalise.hs
+2 −0		test/internalisation/bool.kore.report
+3 −0		test/internalisation/does-not-preserve-definedness.kore.report
+3 −0		test/internalisation/existentials.kore.report
+8 −0		test/internalisation/imp.kore.report
+3 −0		test/internalisation/preserves-definedness-total-function.kore.report
+3 −0		test/internalisation/preserves-definedness.kore.report
+3 −0		test/internalisation/subsorts.kore.report
+13 −0		test/internalisation/test-totalSupply-definition.kore.report
+1 −0		test/llvm-integration/LLVM.hs
+52 −48		tools/booster/Server.hs
+1 −1		unit-tests/Test/Booster/Definition/Internalise.hs
+1 −0		unit-tests/Test/Booster/Fixture.hs
+23 −0		.github/workflows/clang-format-check.yml
+0 −50		.github/workflows/update.yml
+68 −0		default.nix
+51 −2		flake.lock
+7 −10		flake.nix
+27 −0		matching/.scalafmt.conf
+15 −0		matching/pom.xml
+99 −52		matching/src/main/scala/org/kframework/backend/llvm/matching/Constructor.scala
+185 −90		matching/src/main/scala/org/kframework/backend/llvm/matching/Generator.scala
+190 −82		matching/src/main/scala/org/kframework/backend/llvm/matching/Heuristics.scala
+53 −27		matching/src/main/scala/org/kframework/backend/llvm/matching/Matching.scala
+568 −272		matching/src/main/scala/org/kframework/backend/llvm/matching/Matrix.scala
+15 −16		matching/src/main/scala/org/kframework/backend/llvm/matching/Occurrence.scala
+302 −174		matching/src/main/scala/org/kframework/backend/llvm/matching/Parser.scala
+187 −94		matching/src/main/scala/org/kframework/backend/llvm/matching/dt/DecisionTree.scala
+674 −262		matching/src/main/scala/org/kframework/backend/llvm/matching/pattern/Pattern.scala
+395 −146		matching/src/main/scala/org/kframework/backend/llvm/matching/pattern/SortCategory.scala
+0 −74		nix/build-maven-package.nix
+7 −0		nix/devShell.nix
+5,784 −0		nix/llvm-backend-matching.mavenix.lock
+53 −12		nix/llvm-backend-matching.nix
+0 −44		nix/maven.nix
+3 −2		nix/overlay.nix
+50 −0		nix/sources.json
+205 −0		nix/sources.nix
+14 −0		shell.nix
+17 −0		test.nix