Skip to content

Commit c56056c

Browse files
committed
small corrections
1 parent b5753c3 commit c56056c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

doc/chapter-primrec.tex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,7 @@ \section{Proofs by induction over all primitive recursive functions}
624624

625625
\subsection{Ackermann function}
626626

627+
627628
Ackermann function is traditionally defined as a function from
628629
$\mathbb{N}\times \mathbb{N}$ into $\mathbb{N}$, through
629630
three equations:
@@ -738,7 +739,9 @@ \subsubsection{First properties of the Ackermann function}
738739

739740
\input{movies/snippets/AckNotPR/AckNIsPR}
740741

742+
\section{Ackermann function is not primitive recursive}
741743

744+
\label{sect:ack-not-PR}
742745

743746
In order to prove that \texttt{Ack} (considered as a function of two arguments) is not primitive recursive, the usual method consists in two steps:
744747

@@ -879,7 +882,7 @@ \subsection{Looking for a contradiction}
879882
Thus, our impossibility proof is just a sequence of easy small steps.
880883

881884
\begin{remark}
882-
In the following snippet, some versions \emph{Alectryon}'s \texttt{Latex} generator print the \emph{local definition} of $x$ (as the maximum of $2$ and $m$) as a simple \emph{declaration} \texttt{x: nat}.
885+
In the following snippet, some versions of \emph{Alectryon}'s \texttt{Latex} generator print the \emph{local definition} of $x$ (as the maximum of $2$ and $m$) as a simple \emph{declaration} \texttt{x: nat}.
883886
Thus the proof script is correct, but the three last sub-goals are not correctly displayed, since
884887
they do not show how the inequalities $2\leq x$ and $m \leq x$ could be inferred by \texttt{lia}.
885888

doc/schutte-chapter.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,6 @@ \section{Cantor normal form}
689689
\end{Coqsrc}
690690

691691
Is it true ?
692-
693692
\emph{You may start this exercise with the file
694693
\href{https://github.com/coq-community/hydra-battles/tree/master/exercises/ordinals/schutte_cnf_counter_example.v}{exercises/ordinals/schutte\_cnf\_counter\_example.v}.}
695694
\end{exercise}
@@ -706,7 +705,7 @@ \section{Cantor normal form}
706705

707706
\begin{remark}
708707
The sub-directory
709-
\href{https://github.com/coq-community/hydra-battles/tree/master/theories/ordinals/Gamma0}{theories/oridinals/Gamma0} contains an (incomplete, still undocumented) implementation of the set of ordinals below $\Gamma_0$, represented in Veblen normal form.
708+
\href{https://github.com/coq-community/hydra-battles/tree/master/theories/ordinals/Gamma0}{theories/ordinals/Gamma0} contains an (incomplete, still undocumented) implementation of the set of ordinals below $\Gamma_0$, represented in Veblen normal form.
710709
\end{remark}
711710

712711
\section{An embedding of \texttt{T1} into \texttt{Ord}}

theories/ordinals/Schutte/CNF.v

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ From Coq Require Import Arith List Sorting.Sorted
99
From hydras Require Export Schutte_basics Ordering_Functions
1010
PartialFun Countable Schutte.Addition AP.
1111
From Coq Require Export Classical.
12+
Import ListNotations.
1213

1314
Set Implicit Arguments.
1415

@@ -312,8 +313,7 @@ Qed.
312313

313314
Lemma cnf_unicity l alpha:
314315
is_cnf_of alpha l ->
315-
forall l', is_cnf_of alpha l' ->
316-
l = l'. (* .no-out *)
316+
forall l', is_cnf_of alpha l' -> l = l'. (* .no-out *)
317317
(*| .. coq:: none |*)
318318
Proof.
319319
revert alpha; induction l.
@@ -407,12 +407,10 @@ Qed.
407407

408408
(*| .. coq:: no-out |*)
409409

410-
Lemma cnf_of_epsilon0 : is_cnf_of epsilon0 (epsilon0 :: nil).
411-
Proof.
412-
split.
413-
- constructor.
414-
- simpl; now rewrite alpha_plus_zero, epsilon0_fxp.
410+
Lemma cnf_of_epsilon0 : is_cnf_of epsilon0 [epsilon0].
411+
Proof. (*||*)
412+
split; [constructor | cbn].
413+
now rewrite alpha_plus_zero, epsilon0_fxp.
415414
Qed.
416-
(*||*)
417415

418416
(* end snippet cnfOfEpsilon0 *)

0 commit comments

Comments
 (0)