diff options
| -rw-r--r-- | Makefile.dune | 6 | ||||
| -rw-r--r-- | dev/dune-workspace.all | 11 | ||||
| -rw-r--r-- | doc/sphinx/language/gallina-extensions.rst | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.dune b/Makefile.dune index 1e401a57b9..ac5f584b90 100644 --- a/Makefile.dune +++ b/Makefile.dune @@ -1,7 +1,7 @@ # -*- mode: makefile -*- # Dune Makefile for Coq -.PHONY: help voboot states world apidoc +.PHONY: help voboot states world watch release apidoc clean # use DUNEOPT=--display=short for a more verbose build # DUNEOPT=--display=short @@ -15,6 +15,7 @@ help: @echo " - watch: build all binaries and libraries [continuous build]" @echo " - release: build Coq in release mode" @echo " - apidoc: build ML API documentation" + @echo " - ocheck: build for all supported OCaml versions [requires OPAM]" @echo " - clean: remove build directory and autogenerated files" @echo " - help: show this message" @@ -28,6 +29,9 @@ states: voboot world: voboot dune build $(DUNEOPT) @install +ocheck: voboot + dune build $(DUNEOPT) @install --workspace=dev/dune-workspace.all + watch: voboot dune build $(DUNEOPT) @install -w diff --git a/dev/dune-workspace.all b/dev/dune-workspace.all new file mode 100644 index 0000000000..44857ed050 --- /dev/null +++ b/dev/dune-workspace.all @@ -0,0 +1,11 @@ +(lang dune 1.2) + +; Add custom flags here. Default developer profile is `dev` +(env + (dev (flags :standard -rectypes -w -9-27-50)) + (release (flags :standard -rectypes))) + +(context (opam (switch 4.05.0))) +(context (opam (switch 4.05.0+32bit))) +(context (opam (switch 4.07.0))) +(context (opam (switch 4.07.0+flambda))) diff --git a/doc/sphinx/language/gallina-extensions.rst b/doc/sphinx/language/gallina-extensions.rst index 636144e0c8..9dae7fd102 100644 --- a/doc/sphinx/language/gallina-extensions.rst +++ b/doc/sphinx/language/gallina-extensions.rst @@ -606,7 +606,7 @@ for several ways of defining a function *and other useful related objects*, namely: an induction principle that reflects the recursive structure of the function (see :tacn:`function induction`) and its fixpoint equality. The meaning of this declaration is to define a function ident, -similarly to ``Fixpoint`. Like in ``Fixpoint``, the decreasing argument must +similarly to ``Fixpoint``. Like in ``Fixpoint``, the decreasing argument must be given (unless the function is not recursive), but it might not necessarily be *structurally* decreasing. The point of the {} annotation is to name the decreasing argument *and* to describe which kind of |