Skip to content

Commit 1c6ee86

Browse files
committed
Merge branch 'master' into stable for 1.5
2 parents e5250fa + 1a4c787 commit 1c6ee86

264 files changed

Lines changed: 2403 additions & 19754 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.git
2+
examples
3+
_build

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ setup.*
3838
examples
3939
benchs
4040
*.exe
41+
*.install
42+
.merlin

.merlin

Lines changed: 0 additions & 30 deletions
This file was deleted.

.ocamlinit

Lines changed: 0 additions & 114 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,75 @@
11
# Changelog
22

3+
## 1.5
4+
5+
- be compatible with sequence >= 1.0
6+
- cli option to switch off maximal number of variables per clause
7+
- Dockerfile and instructions to build a docker image
8+
- add eta-reduction to `LLTerm`
9+
- update phases API + params so it's easier to use from utop
10+
- move to jbuilder
11+
12+
- fail early when unifying a variable and a polymorphic constant
13+
- More realistic test to expose a bug in unification of polymorphic terms
14+
- upper bound on msat and deps on logtk
15+
- fix for llprover (use congruence correctly for poly equalities)
16+
- printer for congruence
17+
- cache llproof checking result, display it in llproof-printing
18+
- refactor proof checker to look more like a tableaux prover + dot printing
19+
- llprover: hack to allow checking of rewriting steps that occur under binders
20+
- split proof checker into its own module `LLProver`
21+
- add linear expressions and arith predicates in `LLTerm`
22+
- make demodulation more robust
23+
- bugfix in `Type.apply` for polymorphic type arguments
24+
- stop positive extensionality rule from removing type arguments
25+
- moved detection for "distinct object" syntax into TypeInference
26+
- omit type declarations for distinct objects in TPTP output
27+
- bugfix restrict_to_scope: recursive call when variable already in scope
28+
- bugfix: type of polymorphic application in app_encode tool
29+
- bugfix: app_encode extensionality axiom needs type arguments
30+
- `fo_detector` tool to count problems with applied variables
31+
- clean up Subst module
32+
- bugfix: wrong polymorphic types in returned unifier
33+
- remove hornet from makefile, improve logitest targets
34+
- remove hornet
35+
- better type error messages
36+
- make `Subst.apply` tailrec
37+
- "int" mode for variable purification
38+
- bugfix: unquote identifiers in TPTP parser
39+
40+
## 1.4
41+
42+
- remove inlining on parsers
43+
- cli option for ext-neg rule
44+
- add `--check-types` for checking types deeply in new clauses
45+
- Add ExistsConst (??) and ForallConst (!!) to TPTP parser
46+
- TPTP parser: allow function types as THF terms
47+
- add cli option `-bt` (alias to `--backtraces`)
48+
- completion of equalities with λ-abstractions as RHS in type inference
49+
- THF parser: allow for `@` applications in types
50+
- cli flag for ext_pos
51+
- App encode: binary for app-encoding HO applications into FO
52+
53+
- bugfix in ho unification
54+
- in unification, fix order in which bound variables are added to env
55+
- bugfix in unification (would produce wrong type)
56+
- do not simplify in demodulation
57+
- Add StarExec instructions to readme
58+
- bugfixes `app_encode`
59+
- β-normalize rewrite rules that are eq-completed
60+
- uniform output of “SZS status” instead of “SZS Status”
61+
- auto flattening of applications in STerm
62+
- fix `examples/ho/extensionality1.zf` by forbidding some HO demodulations
63+
- fix tag managing (and therefore proof checking) for `Lit.is_absurd`
64+
- bugfix in proof checking related to instantiation
65+
- bugfix in NPDtree
66+
- more elegant and robust sup-at-var condition
67+
- sup-at-var condition with polymorphism
68+
- remove literal comparison by constraint
69+
- no selection of literals containing ho variables
70+
- Stricter sup-at-vars condition
71+
- purify naked variables
72+
373
## 1.3
474

575
- experimental proof checking with `--check` (and `--dot-llproof <file>`)

Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM ocaml/opam:alpine as build
2+
# init and set perms
3+
WORKDIR /zipper/build
4+
RUN sudo chown opam: /zipper/build
5+
# deps
6+
RUN eval `opam config env` && \
7+
opam update && \
8+
opam depext -i zarith && \
9+
opam install jbuilder zarith containers sequence msat menhir
10+
# main build
11+
COPY --chown=opam:nogroup src *.opam Makefile ./
12+
RUN eval `opam config env` && \
13+
make build && \
14+
cp _build/default/main/zipperposition.exe ./zipperposition
15+
16+
# prepare lightweight production image
17+
FROM alpine:latest as prod
18+
WORKDIR /root
19+
RUN apk update && apk add gmp-dev
20+
COPY --from=build /zipper/build/zipperposition .
21+
ENTRYPOINT ["./zipperposition"]

0 commit comments

Comments
 (0)