From 4165cce72347466fbaa565247ae040a873b46694 Mon Sep 17 00:00:00 2001 From: Gaëtan Gilbert Date: Fri, 14 Feb 2020 10:53:10 +0100 Subject: Revert "Add #[uniform] and #[nonuniform] (for Uniform Inductive Parameters)" This reverts commit bc2c1836ba4c878903288060bcb66a0ef1aaced6. --- doc/sphinx/language/gallina-specification-language.rst | 3 --- 1 file changed, 3 deletions(-) (limited to 'doc') diff --git a/doc/sphinx/language/gallina-specification-language.rst b/doc/sphinx/language/gallina-specification-language.rst index 721c7a7a51..09090ce89a 100644 --- a/doc/sphinx/language/gallina-specification-language.rst +++ b/doc/sphinx/language/gallina-specification-language.rst @@ -1063,9 +1063,6 @@ Parameterized inductive types | cons3 : A -> list3 -> list3. End list3. - Attributes ``uniform`` and ``nonuniform`` respectively enable and - disable uniform parameters for a single inductive declaration block. - .. seealso:: Section :ref:`inductive-definitions` and the :tacn:`induction` tactic. -- cgit v1.2.3 From 509d958342764e4a676e735a3896f6ff77c07ff9 Mon Sep 17 00:00:00 2001 From: Gaëtan Gilbert Date: Fri, 14 Feb 2020 11:38:15 +0100 Subject: New syntax [Inductive Acc A R | x : Prop := ...] to control uniform parameters. This replaces the attribute. --- .../02-specification-language/11600-uniform-syntax.rst | 4 ++++ doc/sphinx/language/gallina-specification-language.rst | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 doc/changelog/02-specification-language/11600-uniform-syntax.rst (limited to 'doc') diff --git a/doc/changelog/02-specification-language/11600-uniform-syntax.rst b/doc/changelog/02-specification-language/11600-uniform-syntax.rst new file mode 100644 index 0000000000..3fa3f80301 --- /dev/null +++ b/doc/changelog/02-specification-language/11600-uniform-syntax.rst @@ -0,0 +1,4 @@ +- **Added:** + New syntax :g:`Inductive Acc A R | x : Prop := ...` to specify which + parameters of an inductive are uniform. + (`#11600 `_, by Gaëtan Gilbert). diff --git a/doc/sphinx/language/gallina-specification-language.rst b/doc/sphinx/language/gallina-specification-language.rst index 09090ce89a..7ce4538a4d 100644 --- a/doc/sphinx/language/gallina-specification-language.rst +++ b/doc/sphinx/language/gallina-specification-language.rst @@ -1063,6 +1063,18 @@ Parameterized inductive types | cons3 : A -> list3 -> list3. End list3. + For finer control, you can use a ``|`` between the uniform and + the non-uniform parameters: + + .. coqtop:: in reset + + Inductive Acc {A:Type} (R:A->A->Prop) | (x:A) : Prop + := Acc_in : (forall y, R y x -> Acc y) -> Acc x. + + The flag can then be seen as deciding whether the ``|`` is at the + beginning (when the flag is unset) or at the end (when it is set) + of the parameters when not explicitly given. + .. seealso:: Section :ref:`inductive-definitions` and the :tacn:`induction` tactic. -- cgit v1.2.3