Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency: haskell-backend/src/main/native/haskell-backend #3187

Merged
merged 27 commits into from
Mar 3, 2023
Merged

Update dependency: haskell-backend/src/main/native/haskell-backend #3187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bb1704c
haskell-backend/src/main/native/haskell-backend: 2c1ff15bd - Export z…
rv-jenkins Feb 24, 2023
af98147
Sync flake inputs to submodules
Feb 24, 2023
bf3540f
Merge remote-tracking branch 'origin/develop' into _update-deps_runti…
rv-jenkins Feb 27, 2023
abb3f42
haskell-backend/src/main/native/haskell-backend: 93a705112 - [#3493] …
rv-jenkins Feb 27, 2023
2b2573a
Sync flake inputs to submodules
Feb 27, 2023
3bdc695
Merge remote-tracking branch 'origin/develop' into _update-deps_runti…
rv-jenkins Feb 28, 2023
308d822
haskell-backend/src/main/native/haskell-backend: bd61a0565 - kore-rpc…
rv-jenkins Feb 28, 2023
cf2f392
Sync flake inputs to submodules
Feb 28, 2023
2da108a
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 1, 2023
f2aa87c
haskell-backend/src/main/native/haskell-backend: 2020ceb1b - Fixing n…
rv-jenkins Mar 1, 2023
55356bd
Sync flake inputs to submodules
Mar 1, 2023
89c7378
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 2, 2023
d822270
haskell-backend/src/main/native/haskell-backend: 37f122964 - [#3493] …
rv-jenkins Mar 2, 2023
20e6c02
Sync flake inputs to submodules
Mar 2, 2023
cc7a236
haskell-backend/src/main/native/haskell-backend: 1c184832b - [#3523] …
rv-jenkins Mar 2, 2023
0f88cf1
Sync flake inputs to submodules
Mar 2, 2023
007ac01
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 2, 2023
df0e2be
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 2, 2023
f77a8e5
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 2, 2023
16464da
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
tothtamas28 Mar 3, 2023
a1eda4b
haskell-backend/src/main/native/haskell-backend: 559424aa4 - InfoAtte…
rv-jenkins Mar 3, 2023
41e49da
Sync flake inputs to submodules
Mar 3, 2023
321910c
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
rv-jenkins Mar 3, 2023
6c5ea0b
Fix `Dockerfile`
tothtamas28 Mar 3, 2023
1a77ccf
Fix another `Dockerfile`
tothtamas28 Mar 3, 2023
45fc349
Merge branch 'develop' into _update-deps_runtimeverification_haskell-…
rv-jenkins Mar 3, 2023
79126be
Update result for failing test
radumereuta Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/Dockerfile.stack-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RUN groupadd -g $GROUP_ID $GROUP && useradd -m -u $USER_ID -s /bin/sh -g $GROUP
USER $USER:$GROUP

ENV LC_ALL=C.UTF-8
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/$USER/.tmp-haskell/kore-rpc-types/
RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib
ENV PATH=/home/user/hub-linux-amd64-2.14.0/bin:$PATH

ENV LC_ALL=C.UTF-8
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml .tmp-haskell/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal .tmp-haskell/kore/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml .tmp-haskell/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal .tmp-haskell/kore/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal .tmp-haskell/kore-rpc-types/
RUN cd .tmp-haskell && stack build --only-snapshot

ADD pom.xml .tmp-maven/
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion haskell-backend/src/main/native/haskell-backend
Open in desktop
Submodule haskell-backend updated 83 files
+9 −8 .github/workflows/release.yml
+13 −16 .github/workflows/test.yml
+8 −7 .github/workflows/update.yml
+1 −0 cabal.project
+1 −2 default.nix
+2 −0 flake.nix
+76 −0 kore-rpc-types/kore-rpc-types.cabal
+9 −13 kore-rpc-types/src/Kore/JsonRpc/Types.hs
+352 −0 kore-rpc-types/src/Kore/Syntax/Json/Types.hs
+6 −1 kore/app/exec/Main.hs
+7 −7 kore/kore.cabal
+5 −5 kore/src/Kore/Attribute/Axiom.hs
+0 −58 kore/src/Kore/Attribute/Functional.hs
+1 −1 kore/src/Kore/Attribute/Pattern/Defined.hs
+0 −145 kore/src/Kore/Attribute/Pattern/Functional.hs
+143 −0 kore/src/Kore/Attribute/Pattern/Total.hs
+27 −27 kore/src/Kore/Attribute/Symbol.hs
+66 −0 kore/src/Kore/Attribute/Total.hs
+3 −3 kore/src/Kore/Builtin/Endianness/Endianness.hs
+3 −3 kore/src/Kore/Builtin/Signedness/Signedness.hs
+3 −3 kore/src/Kore/Equation/Equation.hs
+7 −7 kore/src/Kore/Equation/Sentence.hs
+1 −1 kore/src/Kore/Equation/Validate.hs
+3 −3 kore/src/Kore/Internal/InternalBool.hs
+3 −3 kore/src/Kore/Internal/InternalBytes.hs
+3 −3 kore/src/Kore/Internal/InternalInt.hs
+2 −2 kore/src/Kore/Internal/InternalList.hs
+3 −3 kore/src/Kore/Internal/InternalMap.hs
+4 −4 kore/src/Kore/Internal/InternalSet.hs
+3 −3 kore/src/Kore/Internal/InternalString.hs
+1 −1 kore/src/Kore/Internal/Key.hs
+7 −7 kore/src/Kore/Internal/NormalizedAc.hs
+8 −8 kore/src/Kore/Internal/SideCondition.hs
+11 −11 kore/src/Kore/Internal/Symbol.hs
+6 −6 kore/src/Kore/Internal/TermLike.hs
+11 −11 kore/src/Kore/Internal/TermLike/TermLike.hs
+30 −20 kore/src/Kore/JsonRpc.hs
+1 −0 kore/src/Kore/Log.hs
+12 −12 kore/src/Kore/Log/DebugAttemptUnification.hs
+13 −1 kore/src/Kore/Log/KoreLogOptions.hs
+4 −4 kore/src/Kore/Log/Registry.hs
+1 −0 kore/src/Kore/Repl/State.hs
+1 −1 kore/src/Kore/Rewrite/Function/Evaluator.hs
+4 −4 kore/src/Kore/Rewrite/Rule.hs
+6 −6 kore/src/Kore/Rewrite/SMT/Representation/Symbols.hs
+5 −5 kore/src/Kore/Rewrite/SMT/Translate.hs
+1 −1 kore/src/Kore/Simplify/And.hs
+2 −2 kore/src/Kore/Simplify/Ceil.hs
+2 −2 kore/src/Kore/Simplify/Equals.hs
+3 −332 kore/src/Kore/Syntax/Json/Internal.hs
+5 −5 kore/src/Kore/Unification/Procedure.hs
+0 −64 kore/test/Test/Kore/Attribute/Functional.hs
+2 −2 kore/test/Test/Kore/Attribute/Overload.hs
+30 −30 kore/test/Test/Kore/Attribute/Pattern/Total.hs
+7 −7 kore/test/Test/Kore/Attribute/Symbol.hs
+71 −0 kore/test/Test/Kore/Attribute/Total.hs
+30 −30 kore/test/Test/Kore/Builtin/Definition.hs
+1 −1 kore/test/Test/Kore/Builtin/InternalBytes.hs
+11 −11 kore/test/Test/Kore/Exec.hs
+7 −8 kore/test/Test/Kore/IndexedModule/MockMetadataTools.hs
+3 −3 kore/test/Test/Kore/Internal/Symbol.hs
+2 −2 kore/test/Test/Kore/Rewrite/Axiom/Registry.hs
+2 −2 kore/test/Test/Kore/Rewrite/Function/Integration.hs
+50 −50 kore/test/Test/Kore/Rewrite/MockSymbols.hs
+4 −4 kore/test/Test/Kore/Rewrite/Rule/Expand.hs
+2 −2 kore/test/Test/Kore/Rewrite/SMT/Builders.hs
+1 −1 kore/test/Test/Kore/Rewrite/SMT/Helpers.hs
+2 −24 kore/test/Test/Kore/Syntax/Json.hs
+4 −4 kore/test/Test/Kore/Unification/Unifier.hs
+1 −0 nix/kore-ghc925.nix.d/default.nix
+48 −0 nix/kore-ghc925.nix.d/kore-rpc-types.nix
+9 −6 nix/kore-ghc925.nix.d/kore.nix
+1 −0 stack.yaml
+73 −74 test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden
+1,418 −1,429 test/regression-c/test-smoke100.sh.out.golden
+51 −51 test/rpc-server/execute/zero-steps/state.kore
+1 −1 test/rpc-server/implies/invalid-free-vars-rhs/response.golden
+1 −1 test/rpc-server/implies/invalid-name-capture/response.golden
+1 −1 test/rpc-server/implies/invalid-non-singleton-lhs/response.golden
+1 −1 test/rpc-server/implies/invalid-non-singleton-rhs/response.golden
+16 −16 test/save-proofs/test-1-spec.k.save-proofs.kore.golden
+1,994 −0 test/simplification/a-spec.k.out.golden
+2 −2 test/tiny/test-save-partial-proof.sh.out.golden
16 changes: 8 additions & 8 deletions k-distribution/tests/regression-new/issue-1682-korePrettyPrint/1.test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/* Fl Fn D Sfa */
/* T Fn D Sfa */
Lbl'-LT-'generatedTop'-GT-'{}(
/* Fl Fn D Sfa */
/* T Fn D Sfa */
Lbl'-LT-'k'-GT-'{}(
/* Fl Fn D Sfa */
/* T Fn D Sfa */
kseq{}(
/* Fl Fn D Sfa */
/* T Fn D Sfa */
/* Inj: */ inj{SortInt{}, SortKItem{}}(
/* Fl Fn D Sfa */ Var'QuesUnds'Gen0:SortInt{}
/* T Fn D Sfa */ Var'QuesUnds'Gen0:SortInt{}
),
/* Fl Fn D Sfa Cl */ dotk{}()
/* T Fn D Sfa Cl */ dotk{}()
)
),
/* Fl Fn D Sfa Cl */
Lbl'-LT-'generatedCounter'-GT-'{}(/* Fl Fn D Sfa Cl */ \dv{SortInt{}}("0"))
/* T Fn D Sfa Cl */
Lbl'-LT-'generatedCounter'-GT-'{}(/* T Fn D Sfa Cl */ \dv{SortInt{}}("0"))
)
5 changes: 3 additions & 2 deletions package/arch/Dockerfile.stack-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN groupadd -g $GROUP_ID $GROUP && useradd -m -u $USER_ID -s /bin/sh -g $GROUP
USER $USER:$GROUP

ENV LC_ALL=C.UTF-8
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/stack.yaml /home/$USER/.tmp-haskell/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/$USER/.tmp-haskell/kore/
ADD --chown=$USER:$GROUP haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/$USER/.tmp-haskell/kore-rpc-types/
RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot
5 changes: 3 additions & 2 deletions package/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ RUN groupadd -g $GROUP_ID user \
USER $USER_ID:$GROUP_ID

ENV LC_ALL=C.UTF-8
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml /home/user/.tmp-haskell/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/user/.tmp-haskell/kore/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/stack.yaml /home/user/.tmp-haskell/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore/kore.cabal /home/user/.tmp-haskell/kore/
ADD --chown=user:user haskell-backend/src/main/native/haskell-backend/kore-rpc-types/kore-rpc-types.cabal /home/user/.tmp-haskell/kore-rpc-types/
RUN cd /home/user/.tmp-haskell \
&& stack build --only-snapshot

Expand Down