Fixed problems after merge.
This commit is contained in:
parent
6203ffc992
commit
1867023b20
2 changed files with 5 additions and 5 deletions
|
@ -321,7 +321,7 @@ As a concrete example of how induction corresponds to recursion, here
|
||||||
is the computation that occurs when instantiating `m` to `2` in the
|
is the computation that occurs when instantiating `m` to `2` in the
|
||||||
proof of associativity.
|
proof of associativity.
|
||||||
|
|
||||||
\begin{code}
|
```
|
||||||
+-assoc-2 : ∀ (n p : ℕ) → (2 + n) + p ≡ 2 + (n + p)
|
+-assoc-2 : ∀ (n p : ℕ) → (2 + n) + p ≡ 2 + (n + p)
|
||||||
+-assoc-2 n p =
|
+-assoc-2 n p =
|
||||||
begin
|
begin
|
||||||
|
@ -359,7 +359,7 @@ proof of associativity.
|
||||||
≡⟨⟩
|
≡⟨⟩
|
||||||
0 + (n + p)
|
0 + (n + p)
|
||||||
∎
|
∎
|
||||||
\end{code}
|
```
|
||||||
|
|
||||||
|
|
||||||
## Terminology and notation
|
## Terminology and notation
|
||||||
|
|
|
@ -250,7 +250,7 @@ We are now ready to begin the formal development.
|
||||||
import Relation.Binary.PropositionalEquality as Eq
|
import Relation.Binary.PropositionalEquality as Eq
|
||||||
open Eq using (_≡_; refl; sym; trans; cong; cong₂; _≢_)
|
open Eq using (_≡_; refl; sym; trans; cong; cong₂; _≢_)
|
||||||
open import Data.Empty using (⊥; ⊥-elim)
|
open import Data.Empty using (⊥; ⊥-elim)
|
||||||
open import Data.Nat using (ℕ; zero; suc; _+_)
|
open import Data.Nat using (ℕ; zero; suc; _+_; _*_)
|
||||||
open import Data.String using (String; _≟_)
|
open import Data.String using (String; _≟_)
|
||||||
open import Data.Product using (_×_; ∃; ∃-syntax) renaming (_,_ to ⟨_,_⟩)
|
open import Data.Product using (_×_; ∃; ∃-syntax) renaming (_,_ to ⟨_,_⟩)
|
||||||
open import Relation.Nullary using (¬_; Dec; yes; no)
|
open import Relation.Nullary using (¬_; Dec; yes; no)
|
||||||
|
@ -1118,9 +1118,9 @@ by inheritance, which is why Agda requires a type declaration for
|
||||||
those definitions. A definition with a right-hand side that is a term
|
those definitions. A definition with a right-hand side that is a term
|
||||||
typed by synthesis, such as an application, does not require a type
|
typed by synthesis, such as an application, does not require a type
|
||||||
declaration.
|
declaration.
|
||||||
\begin{code}
|
```
|
||||||
answer = 6 * 7
|
answer = 6 * 7
|
||||||
\end{code}
|
```
|
||||||
|
|
||||||
|
|
||||||
## Unicode
|
## Unicode
|
||||||
|
|
Loading…
Reference in a new issue